diff --git a/Doxyfile b/Doxyfile index bd398a2b2..670cb97b1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,11 +1,11 @@ -# Doxyfile 1.5.7.1-KDevelop +# Doxyfile #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Entropia Engine++" -PROJECT_NUMBER = 0.7 +PROJECT_NUMBER = 0.8 OUTPUT_DIRECTORY = ./docs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -95,7 +95,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ./src +INPUT = ./src/eepp INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ @@ -147,18 +147,15 @@ FILE_PATTERNS = *.c \ *.xpm \ *.dox RECURSIVE = YES -EXCLUDE = ./src/helper/glew \ - ./src/helper/chipmunk \ - ./src/helper/glm \ - ./src/helper/libzip \ - ./src/helper/SOIL \ - ./src/helper/stb_vorbis \ - ./src/helper/zlib \ - ./src/helper/PlusCallback \ - ./src/helper/sophist \ - ./src/fluid \ - ./src/test \ - ./src/eeiv +EXCLUDE = ./src/eepp/helper/glew \ + ./src/eepp/helper/chipmunk \ + ./src/eepp/helper/glm \ + ./src/eepp/helper/libzip \ + ./src/eepp/helper/SOIL \ + ./src/eepp/helper/stb_vorbis \ + ./src/eepp/helper/zlib \ + ./src/eepp/helper/PlusCallback \ + ./src/eepp/helper/sophist EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = diff --git a/Makefile b/Makefile index 37cfd5f5c..662d84e71 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ ifeq ($(BACKEND_SDL),yes) SDL_BACKEND_LINK = -lSDL $(SDL_ADD_LINK) - SDL_BACKEND_SRC = $(wildcard ./src/window/backend/SDL/*.cpp) + SDL_BACKEND_SRC = $(wildcard ./src/eepp/window/backend/SDL/*.cpp) EE_SDL_VERSION = -DEE_SDL_VERSION_1_2 else @@ -250,7 +250,7 @@ ifeq ($(BACKEND_SDL),yes) STATIC_LIBS += $(SDL_BACKEND_LINK) endif - SDL_BACKEND_SRC = $(wildcard ./src/window/backend/SDL2/*.cpp) + SDL_BACKEND_SRC = $(wildcard ./src/eepp/window/backend/SDL2/*.cpp) endif SDL_DEFINE = -DEE_BACKEND_SDL_ACTIVE $(EE_SDL_VERSION) @@ -271,7 +271,7 @@ ifeq ($(BACKEND_ALLEGRO), yes) ALLEGRO_BACKEND_LINK = libs/$(BUILD_OS)/liballegro$(ARCHEXT).a libs/$(BUILD_OS)/liballegro_main$(ARCHEXT).a endif - ALLEGRO_BACKEND_SRC = $(wildcard ./src/window/backend/allegro5/*.cpp) + ALLEGRO_BACKEND_SRC = $(wildcard ./src/eepp/window/backend/allegro5/*.cpp) ALLEGRO_DEFINE = -DEE_BACKEND_ALLEGRO_ACTIVE else ALLEGRO_BACKEND_LINK = @@ -301,12 +301,12 @@ endif ifeq ($(STATIC_FT2),yes) LIBFREETYPE2 = - INCFREETYPE2 = -I./src/helper/freetype2/include + INCFREETYPE2 = -I./src/eepp/helper/freetype2/include else LIBFREETYPE2 = -lfreetype ifneq (,$(findstring cygwin,$(BUILD_OS))) - INCFREETYPE2 = -I./src/helper/freetype2/include + INCFREETYPE2 = -I./src/eepp/helper/freetype2/include else INCFREETYPE2 = -I$(DESTINCDIR)/freetype2 endif @@ -315,9 +315,9 @@ endif ifeq ($(BUILD_OS), ios) ifeq ($(BACKEND_SDL),yes) - BACKENDINCLUDE = -I./src/helper/android/SDL2/include + BACKENDINCLUDE = -I./src/eepp/helper/SDL2/include else - BACKENDINCLUDE = -I./src/helper/allegro5/include + BACKENDINCLUDE = -I./src/eepp/helper/allegro5/include endif PLATFORMFLAGS += $(BACKENDINCLUDE) @@ -345,45 +345,48 @@ else endif endif +BASEINC = -I./include/ -I./src/ +OTHERINC = $(BASEINC) +BININC = -I./include/ ##################### OS BUILD OPTIONS ##################### ifeq ($(BUILD_OS), linux) LIBS = -lrt -lpthread -lX11 -lopenal -lGL -lXcursor $(LIBSNDFILE) $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = $(INCFREETYPE2) -PLATFORMSRC = $(wildcard ./src/window/platform/x11/*.cpp) $(wildcard ./src/system/platform/posix/*.cpp) +OTHERINC += $(INCFREETYPE2) +PLATFORMSRC = $(wildcard ./src/eepp/window/platform/x11/*.cpp) $(wildcard ./src/eepp/system/platform/posix/*.cpp) else ifeq ($(BUILD_OS), darwin) LIBS = -framework OpenGL -framework OpenAL -framework CoreFoundation -framework AGL $(LIBSNDFILE) $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = $(INCFREETYPE2) -I/usr/local/include/freetype2 -PLATFORMSRC = $(wildcard ./src/window/platform/osx/*.cpp) $(wildcard ./src/system/platform/posix/*.cpp) +OTHERINC += $(INCFREETYPE2) -I/usr/local/include/freetype2 +PLATFORMSRC = $(wildcard ./src/eepp/window/platform/osx/*.cpp) $(wildcard ./src/eepp/system/platform/posix/*.cpp) else ifeq ($(BUILD_OS), haiku) LIBS = -lopenal -lGL $(SDL_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = $(INCFREETYPE2) -PLATFORMSRC = $(wildcard ./src/system/platform/posix/*.cpp) +OTHERINC += $(INCFREETYPE2) +PLATFORMSRC = $(wildcard ./src/eepp/system/platform/posix/*.cpp) else ifeq ($(BUILD_OS), freebsd) LIBS = -lrt -lpthread -lX11 -lopenal -lGL -lXcursor $(LIBSNDFILE) $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = $(INCFREETYPE2) -PLATFORMSRC = $(wildcard ./src/window/platform/x11/*.cpp) $(wildcard ./src/system/platform/posix/*.cpp) +OTHERINC += $(INCFREETYPE2) +PLATFORMSRC = $(wildcard ./src/eepp/window/platform/x11/*.cpp) $(wildcard ./src/eepp/system/platform/posix/*.cpp) else ifeq ($(BUILD_OS), mingw32) LIBS = -lOpenAL32 -lopengl32 -lmingw32 -lglu32 -lgdi32 -static-libgcc -static-libstdc++ $(LIBSNDFILE) $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = $(INCFREETYPE2) -PLATFORMSRC = $(wildcard ./src/window/platform/win/*.cpp) $(wildcard ./src/system/platform/win/*.cpp) +OTHERINC += $(INCFREETYPE2) +PLATFORMSRC = $(wildcard ./src/eepp/window/platform/win/*.cpp) $(wildcard ./src/eepp/system/platform/win/*.cpp) else @@ -391,21 +394,21 @@ else ifneq (,$(findstring cygwin,$(BUILD_OS))) LIBS = -lOpenAL32 -lmingw32 -lopengl32 -lglu32 -lgdi32 -static-libgcc -mwindows $(LIBSNDFILE) $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) $(LIBFREETYPE2) -OTHERINC = -I./src/helper/zlib $(INCFREETYPE2) -PLATFORMSRC = $(wildcard ./src/window/platform/win/*.cpp) $(wildcard ./src/system/platform/win/*.cpp) +OTHERINC += -I./src/eepp/helper/zlib $(INCFREETYPE2) +PLATFORMSRC = $(wildcard ./src/eepp/window/platform/win/*.cpp) $(wildcard ./src/eepp/system/platform/win/*.cpp) else ifeq ($(BUILD_OS), ios) LIBS = -static-libgcc -static-libstdc++ -framework OpenGLES -framework OpenAL -framework AudioToolbox -framework CoreAudio -framework Foundation -framework CoreFoundation -framework UIKit -framework QuartzCore -framework CoreGraphics $(SDL_BACKEND_LINK) $(ALLEGRO_BACKEND_LINK) -OTHERINC = $(INCFREETYPE2) +OTHERINC += $(INCFREETYPE2) ifeq ($(ARCH),armv7) OTHERINC += -DU_HAVE_GCC_ATOMICS=0 endif -PLATFORMSRC = $(wildcard ./src/system/platform/posix/*.cpp) +PLATFORMSRC = $(wildcard ./src/eepp/system/platform/posix/*.cpp) endif #endif ios @@ -433,7 +436,7 @@ export CFLAGS = $(ARCHFLAGS) -Wall -Wno-unknown-pragmas $(FINALFLAGS) $(BUI export CFLAGSEXT = $(ARCHFLAGS) $(FINALFLAGS) $(BUILDFLAGS) $(PLATFORMFLAGS) export LDFLAGS = $(ARCHFLAGS) $(LINKFLAGS) $(FRAMEWORKFLAGS) HELPERSFLAGS = -DSTBI_FAILURE_USERMSG -DFT2_BUILD_LIBRARY -HELPERSINC = -I./src/helper/chipmunk -I./src/helper/zlib -I./src/helper/freetype2/include +HELPERSINC = -I./include/eepp/helper/chipmunk -I./src/eepp/helper/zlib -I./src/eepp/helper/freetype2/include -I./include/eepp/helper/SOIL -I./include/eepp/helper/glew ifeq ($(BUILD_OS), mingw32) OSEXTENSION = .exe @@ -447,18 +450,18 @@ else ifeq ($(BUILD_OS), ios) SRCGLEW = else - SRCGLEW = $(wildcard ./src/helper/glew/*.c) + SRCGLEW = $(wildcard ./src/eepp/helper/glew/*.c) endif endif ifeq ($(STATIC_FT2), yes) - SRCFREETYPE = $(wildcard ./src/helper/freetype2/src/*/*.c) + SRCFREETYPE = $(wildcard ./src/eepp/helper/freetype2/src/*/*.c) else SRCFREETYPE = endif -SRCHELPERS = $(SRCFREETYPE) $(SRCGLEW) $(wildcard ./src/helper/SOIL/*.c) $(wildcard ./src/helper/stb_vorbis/*.c) $(wildcard ./src/helper/zlib/*.c) $(wildcard ./src/helper/libzip/*.c) $(wildcard ./src/helper/chipmunk/*.c) $(wildcard ./src/helper/chipmunk/constraints/*.c) -SRCMODULES = $(wildcard ./src/helper/haikuttf/*.cpp) $(wildcard ./src/base/*.cpp) $(wildcard ./src/audio/*.cpp) $(wildcard ./src/gaming/*.cpp) $(wildcard ./src/gaming/mapeditor/*.cpp) $(wildcard ./src/graphics/*.cpp) $(wildcard ./src/graphics/renderer/*.cpp) $(wildcard ./src/math/*.cpp) $(wildcard ./src/system/*.cpp) $(wildcard ./src/ui/*.cpp) $(wildcard ./src/ui/tools/*.cpp) $(wildcard ./src/utils/*.cpp) $(wildcard ./src/window/*.cpp) $(wildcard ./src/window/backend/null/*.cpp) $(wildcard ./src/window/platform/null/*.cpp) $(SDL_BACKEND_SRC) $(ALLEGRO_BACKEND_SRC) $(PLATFORMSRC) $(wildcard ./src/physics/*.cpp) $(wildcard ./src/physics/constraints/*.cpp) +SRCHELPERS = $(SRCFREETYPE) $(SRCGLEW) $(wildcard ./src/eepp/helper/SOIL/*.c) $(wildcard ./src/eepp/helper/stb_vorbis/*.c) $(wildcard ./src/eepp/helper/zlib/*.c) $(wildcard ./src/eepp/helper/libzip/*.c) $(wildcard ./src/eepp/helper/chipmunk/*.c) $(wildcard ./src/eepp/helper/chipmunk/constraints/*.c) +SRCMODULES = $(wildcard ./src/eepp/helper/haikuttf/*.cpp) $(wildcard ./src/eepp/base/*.cpp) $(wildcard ./src/eepp/audio/*.cpp) $(wildcard ./src/eepp/gaming/*.cpp) $(wildcard ./src/eepp/gaming/mapeditor/*.cpp) $(wildcard ./src/eepp/graphics/*.cpp) $(wildcard ./src/eepp/graphics/renderer/*.cpp) $(wildcard ./src/eepp/math/*.cpp) $(wildcard ./src/eepp/system/*.cpp) $(wildcard ./src/eepp/ui/*.cpp) $(wildcard ./src/eepp/ui/tools/*.cpp) $(wildcard ./src/eepp/utils/*.cpp) $(wildcard ./src/eepp/window/*.cpp) $(wildcard ./src/eepp/window/backend/null/*.cpp) $(wildcard ./src/eepp/window/platform/null/*.cpp) $(SDL_BACKEND_SRC) $(ALLEGRO_BACKEND_SRC) $(PLATFORMSRC) $(wildcard ./src/eepp/physics/*.cpp) $(wildcard ./src/eepp/physics/constraints/*.cpp) OBJHELPERS = $(SRCHELPERS:.c=.o) OBJMODULES = $(SRCMODULES:.cpp=.o) @@ -480,9 +483,9 @@ FOBJMODULES = $(patsubst ./%, $(OBJDIR)%, $(OBJMODULES) ) SRCTEST = $(wildcard ./src/test/*.cpp) SRCEEIV = $(wildcard ./src/eeiv/*.cpp) SRCFLUID = $(wildcard ./src/fluid/*.cpp) -SRCPARTICLES = $(wildcard ./src/particles/*.cpp) $(wildcard ./src/particles/objects/*.cpp) $(wildcard ./src/particles/gameobjects/*.cpp) +SRCPARTICLES = $(wildcard ./src/particles/*.cpp) $(wildcard ./src/eepp/particles/objects/*.cpp) $(wildcard ./src/eepp/particles/gameobjects/*.cpp) SRCBNB = $(wildcard ./src/bnb/*.cpp) -SRCEMPTYWINDOW = $(wildcard ./src/test/empty_window/*.cpp) +SRCEMPTYWINDOW = $(wildcard ./src/examples/empty_window/*.cpp) SRCRHYTHM = $(wildcard ./src/rhythm/*.cpp) OBJTEST = $(SRCTEST:.cpp=.o) @@ -519,64 +522,64 @@ DEPSALL = $(FOBJALL:.o=.d) all: lib dirs: - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/psaux - @$(MKDIR) $(OBJDIR)/src/helper/SOIL - @$(MKDIR) $(OBJDIR)/src/helper/zlib - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/autofit - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/base - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/bdf - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/bzip2 - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/cache - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/cff - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/cid - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/gxvalid - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/gzip - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/lzw - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/otvalid - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/pcf - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/pfr - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/pshinter - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/psnames - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/raster - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/sfnt - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/smooth - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/truetype - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/type1 - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/type42 - @$(MKDIR) $(OBJDIR)/src/helper/freetype2/src/winfonts - @$(MKDIR) $(OBJDIR)/src/helper/glew - @$(MKDIR) $(OBJDIR)/src/helper/stb_vorbis - @$(MKDIR) $(OBJDIR)/src/helper/libzip - @$(MKDIR) $(OBJDIR)/src/helper/chipmunk - @$(MKDIR) $(OBJDIR)/src/helper/chipmunk/constraints - @$(MKDIR) $(OBJDIR)/src/helper/haikuttf + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/psaux + @$(MKDIR) $(OBJDIR)/src/eepp/helper/SOIL + @$(MKDIR) $(OBJDIR)/src/eepp/helper/zlib + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/autofit + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/base + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/bdf + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/bzip2 + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/cache + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/cff + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/cid + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/gxvalid + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/gzip + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/lzw + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/otvalid + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/pcf + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/pfr + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/pshinter + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/psnames + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/raster + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/sfnt + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/smooth + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/truetype + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/type1 + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/type42 + @$(MKDIR) $(OBJDIR)/src/eepp/helper/freetype2/src/winfonts + @$(MKDIR) $(OBJDIR)/src/eepp/helper/glew + @$(MKDIR) $(OBJDIR)/src/eepp/helper/stb_vorbis + @$(MKDIR) $(OBJDIR)/src/eepp/helper/libzip + @$(MKDIR) $(OBJDIR)/src/eepp/helper/chipmunk + @$(MKDIR) $(OBJDIR)/src/eepp/helper/chipmunk/constraints + @$(MKDIR) $(OBJDIR)/src/eepp/helper/haikuttf @$(MKDIR) $(LIBPATH) - @$(MKDIR) $(OBJDIR)/src/base - @$(MKDIR) $(OBJDIR)/src/audio - @$(MKDIR) $(OBJDIR)/src/gaming - @$(MKDIR) $(OBJDIR)/src/gaming/mapeditor - @$(MKDIR) $(OBJDIR)/src/graphics - @$(MKDIR) $(OBJDIR)/src/graphics/renderer - @$(MKDIR) $(OBJDIR)/src/math - @$(MKDIR) $(OBJDIR)/src/system - @$(MKDIR) $(OBJDIR)/src/system/platform/posix - @$(MKDIR) $(OBJDIR)/src/system/platform/win - @$(MKDIR) $(OBJDIR)/src/ui - @$(MKDIR) $(OBJDIR)/src/ui/tools - @$(MKDIR) $(OBJDIR)/src/utils - @$(MKDIR) $(OBJDIR)/src/window - @$(MKDIR) $(OBJDIR)/src/window/backend/SDL - @$(MKDIR) $(OBJDIR)/src/window/backend/SDL2 - @$(MKDIR) $(OBJDIR)/src/window/backend/null - @$(MKDIR) $(OBJDIR)/src/window/backend/allegro5 - @$(MKDIR) $(OBJDIR)/src/window/platform/x11 - @$(MKDIR) $(OBJDIR)/src/window/platform/win - @$(MKDIR) $(OBJDIR)/src/window/platform/osx - @$(MKDIR) $(OBJDIR)/src/window/platform/null - @$(MKDIR) $(OBJDIR)/src/physics - @$(MKDIR) $(OBJDIR)/src/physics/constraints + @$(MKDIR) $(OBJDIR)/src/eepp/base + @$(MKDIR) $(OBJDIR)/src/eepp/audio + @$(MKDIR) $(OBJDIR)/src/eepp/gaming + @$(MKDIR) $(OBJDIR)/src/eepp/gaming/mapeditor + @$(MKDIR) $(OBJDIR)/src/eepp/graphics + @$(MKDIR) $(OBJDIR)/src/eepp/graphics/renderer + @$(MKDIR) $(OBJDIR)/src/eepp/math + @$(MKDIR) $(OBJDIR)/src/eepp/system + @$(MKDIR) $(OBJDIR)/src/eepp/system/platform/posix + @$(MKDIR) $(OBJDIR)/src/eepp/system/platform/win + @$(MKDIR) $(OBJDIR)/src/eepp/ui + @$(MKDIR) $(OBJDIR)/src/eepp/ui/tools + @$(MKDIR) $(OBJDIR)/src/eepp/utils + @$(MKDIR) $(OBJDIR)/src/eepp/window + @$(MKDIR) $(OBJDIR)/src/eepp/window/backend/SDL + @$(MKDIR) $(OBJDIR)/src/eepp/window/backend/SDL2 + @$(MKDIR) $(OBJDIR)/src/eepp/window/backend/null + @$(MKDIR) $(OBJDIR)/src/eepp/window/backend/allegro5 + @$(MKDIR) $(OBJDIR)/src/eepp/window/platform/x11 + @$(MKDIR) $(OBJDIR)/src/eepp/window/platform/win + @$(MKDIR) $(OBJDIR)/src/eepp/window/platform/osx + @$(MKDIR) $(OBJDIR)/src/eepp/window/platform/null + @$(MKDIR) $(OBJDIR)/src/eepp/physics + @$(MKDIR) $(OBJDIR)/src/eepp/physics/constraints @$(MKDIR) $(OBJDIR)/src/test - @$(MKDIR) $(OBJDIR)/src/test/empty_window + @$(MKDIR) $(OBJDIR)/src/examples/empty_window @$(MKDIR) $(OBJDIR)/src/eeiv @$(MKDIR) $(OBJDIR)/src/fluid @$(MKDIR) $(OBJDIR)/src/bnb @@ -596,31 +599,31 @@ $(FOBJHELPERS): @$(CC) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.c,$@) $(HELPERSFLAGS) > $(patsubst %.o,%.d,$@) $(HELPERSINC) $(FOBJTEST): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) - @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) + @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(BININC) > $(patsubst %.o,%.d,$@) $(FOBJEEIV): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(FOBJFLUID): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(FOBJPARTICLES): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(FOBJBNB): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(FOBJEMTPYWINDOW): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(FOBJRHYTHM): - $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(OTHERINC) + $(CPP) -o $@ -c $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(CFLAGS) $(BININC) @$(CPP) -MT $@ -MM $(patsubst $(OBJDIR)%.o,%.cpp,$@) $(OTHERINC) > $(patsubst %.o,%.d,$@) $(EXE): $(FOBJHELPERS) $(FOBJMODULES) $(FOBJTEST) diff --git a/android-project/README b/android-project/README deleted file mode 100644 index 1ab4e2f5f..000000000 --- a/android-project/README +++ /dev/null @@ -1,3 +0,0 @@ -inside jni folder add symbolic link to src ( from the parent parent folder, the engine src folder, not the folder with the java file ) -then -inside src/helper/android/sdl-1.3/include/ add a symbolic link to the same folder in a subfolder called SDL ( ln -s . SDL ) diff --git a/android-project/jni/src b/android-project/jni/src deleted file mode 120000 index a8d2a6755..000000000 --- a/android-project/jni/src +++ /dev/null @@ -1 +0,0 @@ -../../src/ \ No newline at end of file diff --git a/ee.files b/ee.files deleted file mode 100644 index 812e9dec6..000000000 --- a/ee.files +++ /dev/null @@ -1,969 +0,0 @@ -src/audio/base.hpp -src/audio/caudiodevice.cpp -src/audio/caudiodevice.hpp -src/audio/caudiolistener.cpp -src/audio/caudiolistener.hpp -src/audio/caudioresource.cpp -src/audio/caudioresource.hpp -src/audio/cmusic.cpp -src/audio/cmusic.hpp -src/audio/csound.cpp -src/audio/csound.hpp -src/audio/csoundbuffer.cpp -src/audio/csoundbuffer.hpp -src/audio/csoundfile.cpp -src/audio/csoundfile.hpp -src/audio/csoundfiledefault.cpp -src/audio/csoundfiledefault.hpp -src/audio/csoundfileogg.cpp -src/audio/csoundfileogg.hpp -src/audio/csoundstream.cpp -src/audio/csoundstream.hpp -src/audio/openal.hpp -src/audio/tsoundloader.hpp -src/audio/tsoundmanager.hpp -src/base/allocator.hpp -src/base/base.hpp -src/base/debug.cpp -src/base/debug.hpp -src/base/memorymanager.cpp -src/base/memorymanager.hpp -src/base/stlcontainers.hpp -src/base.hpp -src/ee.h -src/eeiv/capp.cpp -src/eeiv/capp.hpp -src/eeiv/eeiv.cpp -src/gaming/base.hpp -src/gaming/cisomap.cpp -src/gaming/cisomap.hpp -src/gaming/clight.cpp -src/gaming/clight.hpp -src/graphics/base.hpp -src/graphics/cbatchrenderer.cpp -src/graphics/cbatchrenderer.hpp -src/graphics/cconsole.cpp -src/graphics/cconsole.hpp -src/graphics/cfont.cpp -src/graphics/cfont.hpp -src/graphics/cfontmanager.cpp -src/graphics/cfontmanager.hpp -src/graphics/cframebuffer.cpp -src/graphics/cframebuffer.hpp -src/graphics/cframebufferfbo.cpp -src/graphics/cframebufferfbo.hpp -src/graphics/cframebuffermanager.cpp -src/graphics/cframebuffermanager.hpp -src/graphics/cframebufferpbuffer.cpp -src/graphics/cframebufferpbuffer.hpp -src/graphics/cglobalbatchrenderer.cpp -src/graphics/cglobalbatchrenderer.hpp -src/graphics/cglobalshapegroup.cpp -src/graphics/cglobalshapegroup.hpp -src/graphics/cimage.cpp -src/graphics/cimage.hpp -src/graphics/cparticle.cpp -src/graphics/cparticle.hpp -src/graphics/cparticlesystem.cpp -src/graphics/cparticlesystem.hpp -src/graphics/cprimitives.cpp -src/graphics/cprimitives.hpp -src/graphics/cscrollparallax.cpp -src/graphics/cscrollparallax.hpp -src/graphics/cshader.cpp -src/graphics/cshader.hpp -src/graphics/cshaderprogram.cpp -src/graphics/cshaderprogram.hpp -src/graphics/cshaderprogrammanager.cpp -src/graphics/cshaderprogrammanager.hpp -src/graphics/cshape.cpp -src/graphics/cshape.hpp -src/graphics/cshapegroup.cpp -src/graphics/cshapegroup.hpp -src/graphics/cshapegroupmanager.cpp -src/graphics/cshapegroupmanager.hpp -src/graphics/csprite.cpp -src/graphics/csprite.hpp -src/graphics/ctextcache.cpp -src/graphics/ctextcache.hpp -src/graphics/ctexture.cpp -src/graphics/ctexture.hpp -src/graphics/ctexturefactory.cpp -src/graphics/ctexturefactory.hpp -src/graphics/ctexturefont.cpp -src/graphics/ctexturefont.hpp -src/graphics/ctexturefontloader.cpp -src/graphics/ctexturefontloader.hpp -src/graphics/ctexturegrouploader.cpp -src/graphics/ctexturegrouploader.hpp -src/graphics/ctextureloader.cpp -src/graphics/ctextureloader.hpp -src/graphics/ctexturepacker.cpp -src/graphics/ctexturepacker.hpp -src/graphics/ctexturepackernode.cpp -src/graphics/ctexturepackernode.hpp -src/graphics/ctexturepackertex.cpp -src/graphics/ctexturepackertex.hpp -src/graphics/cttffont.cpp -src/graphics/cttffont.hpp -src/graphics/cttffontloader.cpp -src/graphics/cttffontloader.hpp -src/graphics/cvertexbuffer.cpp -src/graphics/cvertexbuffer.hpp -src/graphics/cvertexbuffermanager.cpp -src/graphics/cvertexbuffermanager.hpp -src/graphics/cvertexbufferogl.cpp -src/graphics/cvertexbufferogl.hpp -src/graphics/cvertexbuffervbo.cpp -src/graphics/cvertexbuffervbo.hpp -src/graphics/fonthelper.hpp -src/graphics/glhelper.cpp -src/graphics/glhelper.hpp -src/graphics/packerhelper.hpp -src/graphics/pixelperfect.cpp -src/graphics/pixelperfect.hpp -src/graphics/renders.hpp -src/graphics/vbohelper.hpp -src/helper/glew/glew.c -src/helper/glew/glew.h -src/helper/glew/glxew.h -src/helper/glew/wglew.h -src/helper/haikuttf/haikuttf.hpp -src/helper/haikuttf/hkbase.hpp -src/helper/haikuttf/hkfont.cpp -src/helper/haikuttf/hkfont.hpp -src/helper/haikuttf/hkfontmanager.cpp -src/helper/haikuttf/hkfontmanager.hpp -src/helper/haikuttf/hkglyph.cpp -src/helper/haikuttf/hkglyph.hpp -src/helper/haikuttf/hkmutex.cpp -src/helper/haikuttf/hkmutex.hpp -src/helper/haikuttf/sophist.h -src/helper/libzip/config.h -src/helper/libzip/inttypes.h -src/helper/libzip/mkstemp.c -src/helper/libzip/stdint.h -src/helper/libzip/zip.h -src/helper/libzip/zip_add.c -src/helper/libzip/zip_add_dir.c -src/helper/libzip/zip_close.c -src/helper/libzip/zip_delete.c -src/helper/libzip/zip_dirent.c -src/helper/libzip/zip_entry_free.c -src/helper/libzip/zip_entry_new.c -src/helper/libzip/zip_err_str.c -src/helper/libzip/zip_error.c -src/helper/libzip/zip_error_clear.c -src/helper/libzip/zip_error_get.c -src/helper/libzip/zip_error_get_sys_type.c -src/helper/libzip/zip_error_strerror.c -src/helper/libzip/zip_error_to_str.c -src/helper/libzip/zip_fclose.c -src/helper/libzip/zip_fdopen.c -src/helper/libzip/zip_file_error_clear.c -src/helper/libzip/zip_file_error_get.c -src/helper/libzip/zip_file_get_offset.c -src/helper/libzip/zip_file_strerror.c -src/helper/libzip/zip_filerange_crc.c -src/helper/libzip/zip_fopen.c -src/helper/libzip/zip_fopen_encrypted.c -src/helper/libzip/zip_fopen_index.c -src/helper/libzip/zip_fopen_index_encrypted.c -src/helper/libzip/zip_fread.c -src/helper/libzip/zip_free.c -src/helper/libzip/zip_get_archive_comment.c -src/helper/libzip/zip_get_archive_flag.c -src/helper/libzip/zip_get_compression_implementation.c -src/helper/libzip/zip_get_encryption_implementation.c -src/helper/libzip/zip_get_file_comment.c -src/helper/libzip/zip_get_name.c -src/helper/libzip/zip_get_num_files.c -src/helper/libzip/zip_memdup.c -src/helper/libzip/zip_name_locate.c -src/helper/libzip/zip_new.c -src/helper/libzip/zip_open.c -src/helper/libzip/zip_rename.c -src/helper/libzip/zip_replace.c -src/helper/libzip/zip_set_archive_comment.c -src/helper/libzip/zip_set_archive_flag.c -src/helper/libzip/zip_set_default_password.c -src/helper/libzip/zip_set_file_comment.c -src/helper/libzip/zip_set_name.c -src/helper/libzip/zip_source_buffer.c -src/helper/libzip/zip_source_close.c -src/helper/libzip/zip_source_crc.c -src/helper/libzip/zip_source_deflate.c -src/helper/libzip/zip_source_error.c -src/helper/libzip/zip_source_file.c -src/helper/libzip/zip_source_filep.c -src/helper/libzip/zip_source_free.c -src/helper/libzip/zip_source_function.c -src/helper/libzip/zip_source_layered.c -src/helper/libzip/zip_source_open.c -src/helper/libzip/zip_source_pkware.c -src/helper/libzip/zip_source_pop.c -src/helper/libzip/zip_source_read.c -src/helper/libzip/zip_source_stat.c -src/helper/libzip/zip_source_zip.c -src/helper/libzip/zip_stat.c -src/helper/libzip/zip_stat_index.c -src/helper/libzip/zip_stat_init.c -src/helper/libzip/zip_strerror.c -src/helper/libzip/zip_unchange.c -src/helper/libzip/zip_unchange_all.c -src/helper/libzip/zip_unchange_archive.c -src/helper/libzip/zip_unchange_data.c -src/helper/libzip/zipconf.h -src/helper/libzip/zipint.h -src/helper/PlusCallback/callback.hpp -src/helper/SOIL/image_DXT.c -src/helper/SOIL/image_DXT.h -src/helper/SOIL/image_helper.c -src/helper/SOIL/image_helper.h -src/helper/SOIL/SOIL.c -src/helper/SOIL/SOIL.h -src/helper/SOIL/stb_image.c -src/helper/SOIL/stb_image.h -src/helper/SOIL/stb_image_write.c -src/helper/SOIL/stb_image_write.h -src/helper/SOIL/stbi_DDS.h -src/helper/SOIL/stbi_DDS_c.h -src/helper/stb_vorbis/stb_vorbis.c -src/helper/stb_vorbis/stb_vorbis.h -src/helper/zlib/adler32.c -src/helper/zlib/compress.c -src/helper/zlib/crc32.c -src/helper/zlib/crc32.h -src/helper/zlib/deflate.c -src/helper/zlib/deflate.h -src/helper/zlib/infback.c -src/helper/zlib/inffast.c -src/helper/zlib/inffast.h -src/helper/zlib/inffixed.h -src/helper/zlib/inflate.c -src/helper/zlib/inflate.h -src/helper/zlib/inftrees.c -src/helper/zlib/inftrees.h -src/helper/zlib/trees.c -src/helper/zlib/trees.h -src/helper/zlib/uncompr.c -src/helper/zlib/zconf.h -src/helper/zlib/zlib.h -src/helper/zlib/zutil.c -src/helper/zlib/zutil.h -src/math/base.hpp -src/math/cmtrand.cpp -src/math/cmtrand.hpp -src/math/math.cpp -src/math/math.hpp -src/system/base.hpp -src/system/cinifile.cpp -src/system/cinifile.hpp -src/system/clog.cpp -src/system/clog.hpp -src/system/cmutex.cpp -src/system/cmutex.hpp -src/system/cobjectloader.cpp -src/system/cobjectloader.hpp -src/system/cpack.cpp -src/system/cpack.hpp -src/system/cpak.cpp -src/system/cpak.hpp -src/system/crc4.cpp -src/system/crc4.hpp -src/system/cresourceloader.cpp -src/system/cresourceloader.hpp -src/system/cthread.cpp -src/system/cthread.hpp -src/system/ctimeelapsed.cpp -src/system/ctimeelapsed.hpp -src/system/ctimer.cpp -src/system/ctimer.hpp -src/system/czip.cpp -src/system/czip.hpp -src/system/tsingleton.hpp -src/system/tcontainer.hpp -src/system/tresourcemanager.hpp -src/ui/base.hpp -src/ui/cuibackground.cpp -src/ui/cuibackground.hpp -src/ui/cuiborder.cpp -src/ui/cuiborder.hpp -src/ui/cuicheckbox.cpp -src/ui/cuicheckbox.hpp -src/ui/cuicombobox.cpp -src/ui/cuicombobox.hpp -src/ui/cuicontrol.cpp -src/ui/cuicontrol.hpp -src/ui/cuicontrolanim.cpp -src/ui/cuicontrolanim.hpp -src/ui/cuidragable.cpp -src/ui/cuidragable.hpp -src/ui/cuidropdownlist.cpp -src/ui/cuidropdownlist.hpp -src/ui/cuievent.cpp -src/ui/cuievent.hpp -src/ui/cuieventkey.cpp -src/ui/cuieventkey.hpp -src/ui/cuieventmouse.cpp -src/ui/cuieventmouse.hpp -src/ui/cuigfx.cpp -src/ui/cuigfx.hpp -src/ui/cuilistbox.cpp -src/ui/cuilistbox.hpp -src/ui/cuilistboxitem.cpp -src/ui/cuilistboxitem.hpp -src/ui/cuimanager.cpp -src/ui/cuimanager.hpp -src/ui/cuimenu.cpp -src/ui/cuimenu.hpp -src/ui/cuimenuitem.cpp -src/ui/cuimenuitem.hpp -src/ui/cuimessage.cpp -src/ui/cuimessage.hpp -src/ui/cuipopupmenu.cpp -src/ui/cuipopupmenu.hpp -src/ui/cuiprogressbar.cpp -src/ui/cuiprogressbar.hpp -src/ui/cuipushbutton.cpp -src/ui/cuipushbutton.hpp -src/ui/cuiradiobutton.cpp -src/ui/cuiradiobutton.hpp -src/ui/cuiscrollbar.cpp -src/ui/cuiscrollbar.hpp -src/ui/cuiseparator.cpp -src/ui/cuiseparator.hpp -src/ui/cuiskin.cpp -src/ui/cuiskin.hpp -src/ui/cuiskincomplex.cpp -src/ui/cuiskincomplex.hpp -src/ui/cuiskinsimple.cpp -src/ui/cuiskinsimple.hpp -src/ui/cuiskinstate.cpp -src/ui/cuiskinstate.hpp -src/ui/cuislider.cpp -src/ui/cuislider.hpp -src/ui/cuisliderbutton.cpp -src/ui/cuisliderbutton.hpp -src/ui/cuispinbox.cpp -src/ui/cuispinbox.hpp -src/ui/cuitextbox.cpp -src/ui/cuitextbox.hpp -src/ui/cuitextinput.cpp -src/ui/cuitextinput.hpp -src/ui/cuitheme.cpp -src/ui/cuitheme.hpp -src/ui/cuithememanager.cpp -src/ui/cuithememanager.hpp -src/ui/uihelper.cpp -src/ui/uihelper.hpp -src/utils/base.hpp -src/utils/cinterpolation.cpp -src/utils/cinterpolation.hpp -src/utils/colors.hpp -src/utils/cperlinnoise.cpp -src/utils/cperlinnoise.hpp -src/utils/cwaypoints.cpp -src/utils/cwaypoints.hpp -src/utils/easing.cpp -src/utils/easing.hpp -src/utils/helper.hpp -src/utils/line2.hpp -src/utils/polygon2.hpp -src/utils/quad2.hpp -src/utils/rect.hpp -src/utils/size.hpp -src/utils/string.cpp -src/utils/string.hpp -src/utils/triangle2.hpp -src/utils/utils.cpp -src/utils/utils.hpp -src/utils/vector2.hpp -src/utils/vector3.hpp -src/window/base.hpp -src/window/cengine.cpp -src/window/cengine.hpp -src/window/cinput.cpp -src/window/cinput.hpp -src/window/cinputtextbuffer.cpp -src/window/cinputtextbuffer.hpp -src/window/cjoystick.cpp -src/window/cjoystick.hpp -src/window/cjoystickmanager.cpp -src/window/cjoystickmanager.hpp -src/window/cview.cpp -src/window/cview.hpp -src/ui/cuimenucheckbox.hpp -src/ui/cuimenucheckbox.cpp -src/ui/cuimenusubmenu.hpp -src/ui/cuimenusubmenu.cpp -src/ui/cuisprite.hpp -src/ui/cuisprite.cpp -src/fluid/cfluidparticle.hpp -src/fluid/cfluidnode.hpp -src/fluid/cfluidmaterial.hpp -src/fluid/cfluid.hpp -src/fluid/cfluid.cpp -src/fluid/cfluidmaterial.cpp -src/fluid/cfluidparticle.cpp -src/fluid/cfluidnode.cpp -src/fluid/cfluidupdater.hpp -src/fluid/cfluidupdater.cpp -src/fluid/cfluidapp.cpp -src/fluid/cfluidapp.hpp -src/fluid/fluid.cpp -src/ui/cuitextedit.hpp -src/ui/cuitextedit.cpp -src/ui/cuitooltip.hpp -src/ui/cuitooltip.cpp -src/ui/cuicomplexcontrol.hpp -src/ui/cuicomplexcontrol.cpp -src/ui/cuigenericgrid.hpp -src/ui/cuigenericgrid.cpp -src/ui/cuigridcell.hpp -src/ui/cuigridcell.cpp -src/ui/tuiitemcontainer.hpp -src/ui/cuiwindow.hpp -src/ui/cuiwindow.cpp -src/physics/cphysicsmanager.hpp -src/physics/cphysicsmanager.cpp -src/helper/chipmunk/prime.h -src/helper/chipmunk/cpVect.h -src/helper/chipmunk/cpSpatialIndex.h -src/helper/chipmunk/cpSpace.h -src/helper/chipmunk/cpShape.h -src/helper/chipmunk/cpPolyShape.h -src/helper/chipmunk/cpBody.h -src/helper/chipmunk/cpBB.h -src/helper/chipmunk/cpArbiter.h -src/helper/chipmunk/chipmunk_unsafe.h -src/helper/chipmunk/chipmunk_types.h -src/helper/chipmunk/chipmunk_private.h -src/helper/chipmunk/chipmunk_ffi.h -src/helper/chipmunk/chipmunk.h -src/helper/chipmunk/cpVect.c -src/helper/chipmunk/cpSpatialIndex.c -src/helper/chipmunk/cpSpaceStep.c -src/helper/chipmunk/cpSpaceQuery.c -src/helper/chipmunk/cpSpaceHash.c -src/helper/chipmunk/cpSpaceComponent.c -src/helper/chipmunk/cpSpace.c -src/helper/chipmunk/cpShape.c -src/helper/chipmunk/cpPolyShape.c -src/helper/chipmunk/cpHashSet.c -src/helper/chipmunk/cpCollision.c -src/helper/chipmunk/cpBody.c -src/helper/chipmunk/cpBBTree.c -src/helper/chipmunk/cpBB.c -src/helper/chipmunk/cpArray.c -src/helper/chipmunk/cpArbiter.c -src/helper/chipmunk/chipmunk.c -src/helper/chipmunk/constraints/util.h -src/helper/chipmunk/constraints/cpSlideJoint.h -src/helper/chipmunk/constraints/cpSimpleMotor.h -src/helper/chipmunk/constraints/cpRotaryLimitJoint.h -src/helper/chipmunk/constraints/cpRatchetJoint.h -src/helper/chipmunk/constraints/cpPivotJoint.h -src/helper/chipmunk/constraints/cpPinJoint.h -src/helper/chipmunk/constraints/cpGrooveJoint.h -src/helper/chipmunk/constraints/cpGearJoint.h -src/helper/chipmunk/constraints/cpDampedSpring.h -src/helper/chipmunk/constraints/cpDampedRotarySpring.h -src/helper/chipmunk/constraints/cpConstraint.h -src/helper/chipmunk/constraints/cpSlideJoint.c -src/helper/chipmunk/constraints/cpSimpleMotor.c -src/helper/chipmunk/constraints/cpRotaryLimitJoint.c -src/helper/chipmunk/constraints/cpRatchetJoint.c -src/helper/chipmunk/constraints/cpPivotJoint.c -src/helper/chipmunk/constraints/cpPinJoint.c -src/helper/chipmunk/constraints/cpGrooveJoint.c -src/helper/chipmunk/constraints/cpGearJoint.c -src/helper/chipmunk/constraints/cpDampedSpring.c -src/helper/chipmunk/constraints/cpDampedRotarySpring.c -src/helper/chipmunk/constraints/cpConstraint.c -src/physics/base.hpp -src/physics/cspace.hpp -src/physics/cspace.cpp -src/physics/cshape.hpp -src/physics/cshape.cpp -src/physics/cbody.hpp -src/physics/cbody.cpp -src/physics/cshapepoly.hpp -src/physics/cshapepoly.cpp -src/physics/cshapesegment.hpp -src/physics/cshapesegment.cpp -src/physics/cshapecircle.hpp -src/physics/cshapecircle.cpp -src/physics/constraints/cconstraint.hpp -src/physics/constraints/cconstraint.cpp -src/physics/constraints/cpinjoint.hpp -src/physics/constraints/cpinjoint.cpp -src/physics/constraints/cslidejoint.hpp -src/physics/constraints/cslidejoint.cpp -src/physics/constraints/cpivotjoint.hpp -src/physics/constraints/cpivotjoint.cpp -src/physics/constraints/cgroovejoint.hpp -src/physics/constraints/cgroovejoint.cpp -src/physics/constraints/cdampedspring.hpp -src/physics/constraints/cdampedspring.cpp -src/physics/constraints/cdampedrotaryspring.hpp -src/physics/constraints/cdampedrotaryspring.cpp -src/physics/constraints/crotarylimitjoint.hpp -src/physics/constraints/crotarylimitjoint.cpp -src/physics/constraints/cratchetjoint.hpp -src/physics/constraints/cratchetjoint.cpp -src/physics/constraints/cgearjoint.hpp -src/physics/constraints/cgearjoint.cpp -src/physics/constraints/csimplemotor.hpp -src/physics/constraints/csimplemotor.cpp -src/physics/physicshelper.hpp -src/physics/carbiter.hpp -src/physics/carbiter.cpp -src/physics/moment.hpp -src/physics/area.hpp -src/physics/settings.hpp -src/graphics/renderer/crenderergl.hpp -src/graphics/renderer/crenderergl.cpp -src/graphics/renderer/cgl.hpp -src/graphics/renderer/cgl.cpp -src/graphics/renderer/crenderergl3.hpp -src/graphics/renderer/crenderergl3.cpp -src/graphics/renderer/base.hpp -src/window/inputhelper.hpp -src/physics/cshapepolysprite.hpp -src/physics/cshapepolysprite.cpp -src/physics/cshapecirclesprite.hpp -src/physics/cshapecirclesprite.cpp -src/window/inputhelper.cpp -src/window/cwindow.hpp -src/window/cwindow.cpp -src/window/cclipboard.hpp -src/window/cclipboard.cpp -src/window/backend/SDL/cwindowsdl.hpp -src/window/backend/SDL/cclipboardsdl.hpp -src/window/backend/SDL/cwindowsdl.cpp -src/window/backend/SDL/cclipboardsdl.cpp -src/window/inputevent.hpp -src/window/keycodes.hpp -src/window/joycodes.hpp -src/window/inputhelper.hpp -src/window/inputevent.hpp -src/window/cwindow.hpp -src/window/cview.hpp -src/window/cjoystickmanager.hpp -src/window/cjoystick.hpp -src/window/cinputtextbuffer.hpp -src/window/cinput.hpp -src/window/cengine.hpp -src/window/cclipboard.hpp -src/window/base.hpp -src/window/inputhelper.cpp -src/window/cwindow.cpp -src/window/cview.cpp -src/window/cjoystickmanager.cpp -src/window/cjoystick.cpp -src/window/cinputtextbuffer.cpp -src/window/cinput.cpp -src/window/cengine.cpp -src/window/cclipboard.cpp -src/window/backend/SDL/cwindowsdl.hpp -src/window/backend/SDL/cjoysticksdl.hpp -src/window/backend/SDL/cjoystickmanagersdl.hpp -src/window/backend/SDL/cinputsdl.hpp -src/window/backend/SDL/cclipboardsdl.hpp -src/window/backend/SDL/cwindowsdl.cpp -src/window/backend/SDL/cjoysticksdl.cpp -src/window/backend/SDL/cjoystickmanagersdl.cpp -src/window/backend/SDL/cinputsdl.cpp -src/window/backend/SDL/cclipboardsdl.cpp -src/window/cbackend.hpp -src/window/backend/SDL/cbackendsdl.hpp -src/helper/sophist/sophist.h -src/window/backend/null/cwindownull.hpp -src/window/backend/null/cjoysticknull.hpp -src/window/backend/null/cjoystickmanagernull.hpp -src/window/backend/null/cinputnull.hpp -src/window/backend/null/cclipboardnull.hpp -src/window/backend/null/cbackendnull.hpp -src/window/backend/null/cwindownull.cpp -src/window/backend/null/cjoysticknull.cpp -src/window/backend/null/cjoystickmanagernull.cpp -src/window/backend/null/cinputnull.cpp -src/window/backend/null/cclipboardnull.cpp -src/window/backend/allegro5/cwindowal.hpp -src/window/backend/allegro5/cjoystickmanageral.hpp -src/window/backend/allegro5/cjoystickal.hpp -src/window/backend/allegro5/cinputal.hpp -src/window/backend/allegro5/cclipboardal.hpp -src/window/backend/allegro5/cbackendal.hpp -src/window/backend/allegro5/cwindowal.cpp -src/window/backend/allegro5/cjoystickmanageral.cpp -src/window/backend/allegro5/cjoystickal.cpp -src/window/backend/allegro5/cinputal.cpp -src/window/backend/allegro5/cclipboardal.cpp -src/window/platform/win/cwinimpl.hpp -src/window/platform/win/cwinimpl.cpp -src/window/platform/osx/cosximpl.hpp -src/window/platform/osx/cosximpl.cpp -src/window/platform/x11/cx11impl.hpp -src/window/platform/x11/cx11impl.cpp -src/window/cplatformimpl.hpp -src/window/platform/null/cnullimpl.cpp -src/window/platform/null/cnullimpl.hpp -src/window/cplatformimpl.cpp -src/window/platform/platformimpl.hpp -src/window/cursorhelper.hpp -src/window/ccursormanager.hpp -src/window/ccursor.hpp -src/window/ccursormanager.cpp -src/window/ccursor.cpp -src/window/backend/null/ccursornull.hpp -src/window/backend/null/ccursormanagernull.hpp -src/window/backend/null/ccursornull.cpp -src/window/backend/null/ccursormanagernull.cpp -src/window/backend/allegro5/ccursormanageral.hpp -src/window/backend/allegro5/ccursoral.hpp -src/window/backend/allegro5/ccursormanageral.cpp -src/window/backend/allegro5/ccursoral.cpp -src/window/backend/SDL/ccursormanagersdl.hpp -src/window/backend/SDL/ccursorsdl.hpp -src/window/backend/SDL/ccursormanagersdl.cpp -src/window/backend/SDL/ccursorsdl.cpp -src/window/platform/x11/ccursorx11.hpp -src/window/platform/x11/ccursorx11.cpp -src/test/eetest.hpp -src/test/eetest.cpp -src/base/utf.hpp -src/base/string.hpp -src/base/utf.inl -src/base/string.cpp -src/ui/cuiwinmenu.hpp -src/ui/cuiwinmenu.cpp -src/ui/cuiselectbutton.hpp -src/ui/cuiselectbutton.cpp -src/helper/chipmunk/prime.h -src/helper/chipmunk/cpVect.h -src/helper/chipmunk/cpSpatialIndex.h -src/helper/chipmunk/cpSpace.h -src/helper/chipmunk/cpShape.h -src/helper/chipmunk/cpPolyShape.h -src/helper/chipmunk/cpBody.h -src/helper/chipmunk/cpBB.h -src/helper/chipmunk/cpArbiter.h -src/helper/chipmunk/chipmunk_unsafe.h -src/helper/chipmunk/chipmunk_types.h -src/helper/chipmunk/chipmunk_private.h -src/helper/chipmunk/chipmunk_ffi.h -src/helper/chipmunk/chipmunk.h -src/helper/chipmunk/cpVect.c -src/helper/chipmunk/cpSweep1D.c -src/helper/chipmunk/cpSpatialIndex.c -src/helper/chipmunk/cpSpaceStep.c -src/helper/chipmunk/cpSpaceQuery.c -src/helper/chipmunk/cpSpaceHash.c -src/helper/chipmunk/cpSpaceComponent.c -src/helper/chipmunk/cpSpace.c -src/helper/chipmunk/cpShape.c -src/helper/chipmunk/cpPolyShape.c -src/helper/chipmunk/cpHashSet.c -src/helper/chipmunk/cpCollision.c -src/helper/chipmunk/cpBody.c -src/helper/chipmunk/cpBBTree.c -src/helper/chipmunk/cpBB.c -src/helper/chipmunk/cpArray.c -src/helper/chipmunk/cpArbiter.c -src/helper/chipmunk/chipmunk.c -src/window/backend/SDL2/cwindowsdl.hpp -src/window/backend/SDL2/cjoysticksdl.hpp -src/window/backend/SDL2/cjoystickmanagersdl.hpp -src/window/backend/SDL2/cinputsdl.hpp -src/window/backend/SDL2/ccursorsdl.hpp -src/window/backend/SDL2/ccursormanagersdl.hpp -src/window/backend/SDL2/cclipboardsdl.hpp -src/window/backend/SDL2/cbackendsdl.hpp -src/window/backend/SDL2/cwindowsdl.cpp -src/window/backend/SDL2/cjoysticksdl.cpp -src/window/backend/SDL2/cjoystickmanagersdl.cpp -src/window/backend/SDL2/cinputsdl.cpp -src/window/backend/SDL2/ccursorsdl.cpp -src/window/backend/SDL2/ccursormanagersdl.cpp -src/window/backend/SDL2/cclipboardsdl.cpp -src/window/backend/SDL2/base.hpp -src/ui/cuicommondialog.hpp -src/ui/cuicommondialog.cpp -src/gaming/cmap.hpp -src/gaming/cmap.cpp -src/gaming/cgameobject.hpp -src/gaming/cgameobject.cpp -src/gaming/cgameobjectshape.hpp -src/gaming/cgameobjectshape.cpp -src/gaming/cgameobjectsprite.hpp -src/gaming/cgameobjectsprite.cpp -src/gaming/maphelper.hpp -src/gaming/cgameobjectshapeex.hpp -src/gaming/cgameobjectshapeex.cpp -src/gaming/clayer.hpp -src/gaming/clayer.cpp -src/gaming/ctilelayer.hpp -src/gaming/ctilelayer.cpp -src/gaming/cobjectlayer.hpp -src/gaming/cobjectlayer.cpp -src/gaming/mapeditor/base.hpp -src/gaming/mapeditor/cmapeditor.hpp -src/gaming/mapeditor/cmapeditor.cpp -src/ui/cuiaquatheme.hpp -src/ui/cuiaquatheme.cpp -src/gaming/mapeditor/cuimap.hpp -src/gaming/mapeditor/cuimap.cpp -src/gaming/mapeditor/cuimapnew.hpp -src/gaming/mapeditor/cuimapnew.cpp -src/gaming/mapeditor/cuilayernew.hpp -src/gaming/mapeditor/cuilayernew.cpp -src/gaming/mapeditor/cuigotypenew.hpp -src/gaming/mapeditor/cuigotypenew.cpp -src/gaming/cgameobjectvirtual.hpp -src/gaming/cgameobjectvirtual.cpp -src/utils/safedatapointer.hpp -src/utils/safedatapointer.cpp -src/system/ciostream.hpp -src/system/ciostreamfile.hpp -src/system/ciostreamfile.cpp -src/system/ciostreammemory.hpp -src/system/ciostreammemory.cpp -src/gaming/mapeditor/cmapproperties.hpp -src/gaming/mapeditor/cmapproperties.cpp -src/gaming/mapeditor/clayerproperties.hpp -src/gaming/mapeditor/clayerproperties.cpp -src/helper/chipmunk/prime.h -src/helper/chipmunk/cpVect.h -src/helper/chipmunk/cpSpatialIndex.h -src/helper/chipmunk/cpSpace.h -src/helper/chipmunk/cpShape.h -src/helper/chipmunk/cpPolyShape.h -src/helper/chipmunk/cpBody.h -src/helper/chipmunk/cpBB.h -src/helper/chipmunk/cpArbiter.h -src/helper/chipmunk/chipmunk_unsafe.h -src/helper/chipmunk/chipmunk_types.h -src/helper/chipmunk/chipmunk_private.h -src/helper/chipmunk/chipmunk_ffi.h -src/helper/chipmunk/chipmunk.h -src/helper/chipmunk/cpVect.c -src/helper/chipmunk/cpSweep1D.c -src/helper/chipmunk/cpSpatialIndex.c -src/helper/chipmunk/cpSpaceStep.c -src/helper/chipmunk/cpSpaceQuery.c -src/helper/chipmunk/cpSpaceHash.c -src/helper/chipmunk/cpSpaceComponent.c -src/helper/chipmunk/cpSpace.c -src/helper/chipmunk/cpShape.c -src/helper/chipmunk/cpPolyShape.c -src/helper/chipmunk/cpHashSet.c -src/helper/chipmunk/cpCollision.c -src/helper/chipmunk/cpBody.c -src/helper/chipmunk/cpBBTree.c -src/helper/chipmunk/cpBB.c -src/helper/chipmunk/cpArray.c -src/helper/chipmunk/cpArbiter.c -src/helper/chipmunk/chipmunk.c -src/helper/chipmunk/constraints/util.h -src/helper/chipmunk/constraints/cpSlideJoint.h -src/helper/chipmunk/constraints/cpSimpleMotor.h -src/helper/chipmunk/constraints/cpRotaryLimitJoint.h -src/helper/chipmunk/constraints/cpRatchetJoint.h -src/helper/chipmunk/constraints/cpPivotJoint.h -src/helper/chipmunk/constraints/cpPinJoint.h -src/helper/chipmunk/constraints/cpGrooveJoint.h -src/helper/chipmunk/constraints/cpGearJoint.h -src/helper/chipmunk/constraints/cpDampedSpring.h -src/helper/chipmunk/constraints/cpDampedRotarySpring.h -src/helper/chipmunk/constraints/cpConstraint.h -src/helper/chipmunk/constraints/cpSlideJoint.c -src/helper/chipmunk/constraints/cpSimpleMotor.c -src/helper/chipmunk/constraints/cpRotaryLimitJoint.c -src/helper/chipmunk/constraints/cpRatchetJoint.c -src/helper/chipmunk/constraints/cpPivotJoint.c -src/helper/chipmunk/constraints/cpPinJoint.c -src/helper/chipmunk/constraints/cpGrooveJoint.c -src/helper/chipmunk/constraints/cpGearJoint.c -src/helper/chipmunk/constraints/cpDampedSpring.c -src/helper/chipmunk/constraints/cpDampedRotarySpring.c -src/helper/chipmunk/constraints/cpConstraint.c -src/ui/cuimessagebox.hpp -src/ui/cuimessagebox.cpp -src/ui/tools/ctexturegroupeditor.hpp -src/ui/tools/ctexturegroupeditor.cpp -src/ui/tools/ctexturegroupnew.hpp -src/ui/tools/ctexturegroupnew.cpp -src/ui/tools/ctexturegroupshapeeditor.hpp -src/ui/tools/ctexturegroupshapeeditor.cpp -src/window/backend/SDL/base.hpp -src/system/cpackmanager.hpp -src/system/cpackmanager.cpp -src/gaming/clightmanager.hpp -src/gaming/clightmanager.cpp -src/bnb/bnb.hpp -src/bnb/bnb.cpp -src/bnb/cgame.hpp -src/bnb/cgame.cpp -src/bnb/cgameobjectblindy.hpp -src/bnb/cgameobjectblindy.cpp -src/bnb/cgamemap.hpp -src/bnb/cgamemap.cpp -src/bnb/cgamedata.hpp -src/bnb/cgamedata.cpp -src/bnb/cgameobjectdoor.hpp -src/bnb/cgameobjectdoor.cpp -src/audio/openal.cpp -src/test/empty_window/empty_window.cpp -src/helper/android/sdl-1.3/src/main/android/SDL_android_main.cpp -src/helper/android/sdl-1.3/src/video/android/SDL_androidwindow.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidvideo.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidtouch.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidkeyboard.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidevents.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidwindow.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidvideo.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidtouch.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidkeyboard.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidgl.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidevents.c -src/helper/android/sdl-1.3/src/core/android/SDL_android.h -src/helper/android/sdl-1.3/src/core/android/SDL_android.cpp -android-project/jni/Application.mk -android-project/jni/Android.mk -android-project/src/org/libsdl/app/SDLActivity.java -android-project/build.xml -android-project/AndroidManifest.xml -android-project/local.properties -android-project/default.properties -android-project/build.properties -Makefile -src/helper/android/sdl-1.3/src/video/android/SDL_androidwindow.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidvideo.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidtouch.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidkeyboard.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidevents.h -src/helper/android/sdl-1.3/src/video/android/SDL_androidwindow.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidvideo.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidtouch.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidkeyboard.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidgl.c -src/helper/android/sdl-1.3/src/video/android/SDL_androidevents.c -src/helper/android/sdl-1.3/include/close_code.h -src/helper/android/sdl-1.3/include/begin_code.h -src/helper/android/sdl-1.3/include/SDL_video.h -src/helper/android/sdl-1.3/include/SDL_version.h -src/helper/android/sdl-1.3/include/SDL_types.h -src/helper/android/sdl-1.3/include/SDL_touch.h -src/helper/android/sdl-1.3/include/SDL_timer.h -src/helper/android/sdl-1.3/include/SDL_thread.h -src/helper/android/sdl-1.3/include/SDL_syswm.h -src/helper/android/sdl-1.3/include/SDL_surface.h -src/helper/android/sdl-1.3/include/SDL_stdinc.h -src/helper/android/sdl-1.3/include/SDL_shape.h -src/helper/android/sdl-1.3/include/SDL_scancode.h -src/helper/android/sdl-1.3/include/SDL_rwops.h -src/helper/android/sdl-1.3/include/SDL_revision.h -src/helper/android/sdl-1.3/include/SDL_render.h -src/helper/android/sdl-1.3/include/SDL_rect.h -src/helper/android/sdl-1.3/include/SDL_quit.h -src/helper/android/sdl-1.3/include/SDL_power.h -src/helper/android/sdl-1.3/include/SDL_platform.h -src/helper/android/sdl-1.3/include/SDL_pixels.h -src/helper/android/sdl-1.3/include/SDL_opengles2.h -src/helper/android/sdl-1.3/include/SDL_opengles.h -src/helper/android/sdl-1.3/include/SDL_opengl.h -src/helper/android/sdl-1.3/include/SDL_name.h -src/helper/android/sdl-1.3/include/SDL_mutex.h -src/helper/android/sdl-1.3/include/SDL_mouse.h -src/helper/android/sdl-1.3/include/SDL_main.h -src/helper/android/sdl-1.3/include/SDL_log.h -src/helper/android/sdl-1.3/include/SDL_loadso.h -src/helper/android/sdl-1.3/include/SDL_keycode.h -src/helper/android/sdl-1.3/include/SDL_keyboard.h -src/helper/android/sdl-1.3/include/SDL_joystick.h -src/helper/android/sdl-1.3/include/SDL_input.h -src/helper/android/sdl-1.3/include/SDL_hints.h -src/helper/android/sdl-1.3/include/SDL_haptic.h -src/helper/android/sdl-1.3/include/SDL_gesture.h -src/helper/android/sdl-1.3/include/SDL_events.h -src/helper/android/sdl-1.3/include/SDL_error.h -src/helper/android/sdl-1.3/include/SDL_endian.h -src/helper/android/sdl-1.3/include/SDL_cpuinfo.h -src/helper/android/sdl-1.3/include/SDL_copying.h -src/helper/android/sdl-1.3/include/SDL_config_wiz.h -src/helper/android/sdl-1.3/include/SDL_config_windows.h -src/helper/android/sdl-1.3/include/SDL_config_pandora.h -src/helper/android/sdl-1.3/include/SDL_config_nintendods.h -src/helper/android/sdl-1.3/include/SDL_config_minimal.h -src/helper/android/sdl-1.3/include/SDL_config_macosx.h -src/helper/android/sdl-1.3/include/SDL_config_iphoneos.h -src/helper/android/sdl-1.3/include/SDL_config_android.h -src/helper/android/sdl-1.3/include/SDL_config.h.in -src/helper/android/sdl-1.3/include/SDL_config.h -src/helper/android/sdl-1.3/include/SDL_compat.h -src/helper/android/sdl-1.3/include/SDL_clipboard.h -src/helper/android/sdl-1.3/include/SDL_blendmode.h -src/helper/android/sdl-1.3/include/SDL_audio.h -src/helper/android/sdl-1.3/include/SDL_atomic.h -src/helper/android/sdl-1.3/include/SDL_assert.h -src/helper/android/sdl-1.3/include/SDL.h -src/helper/android/sdl-1.3/src/render/opengles2/SDL_shaders_gles2.h -src/helper/android/sdl-1.3/src/render/opengles2/SDL_shaders_gles2.c -src/helper/android/sdl-1.3/src/render/opengles2/SDL_render_gles2.c -src/helper/android/sdl-1.3/src/render/SDL_render.c -src/helper/android/sdl-1.3/src/render/opengles/SDL_render_gles.c -src/helper/android/sdl-1.3/src/render/SDL_sysrender.h -src/helper/android/sdl-1.3/src/joystick/android/SDL_sysjoystick.c -src/particles/particles.hpp -src/particles/particles.cpp -src/particles/objects/objects.hpp -src/particles/objects/cworldstaticobject.hpp -src/particles/objects/cworldobject.hpp -src/particles/objects/cworld.hpp -src/particles/objects/cworldstaticobject.cpp -src/particles/objects/cworldobject.cpp -src/particles/objects/cworld.cpp -src/particles/gameobjects/cparticle.hpp -src/particles/gameobjects/cemitter.hpp -src/particles/gameobjects/cattractor.hpp -src/particles/gameobjects/cparticle.cpp -src/particles/gameobjects/cemitter.cpp -src/particles/gameobjects/cattractor.cpp -src/particles/particles.hpp -src/particles/cgameworld.hpp -src/particles/particles.cpp -src/particles/cgameworld.cpp -src/rhythm/rhythm.cpp -src/rhythm/cuigfxcolor.hpp -src/rhythm/crhythm.hpp -src/rhythm/rhythm.cpp -src/rhythm/cuigfxcolor.cpp -src/rhythm/crhythm.cpp -src/rhythm/cuinote.hpp -src/rhythm/cuinote.cpp -src/rhythm/cuiinstrument.hpp -src/rhythm/cuiinstrument.cpp -src/declares.hpp -src/ui/cuitabwidget.hpp -src/ui/cuitabwidget.cpp -src/ui/cuitabwidget.hpp -src/ui/cuitab.hpp -src/ui/cuitabwidget.cpp -src/ui/cuitab.cpp -src/system/platform/platformimpl.hpp -src/system/platform/posix/cthreadimpl.hpp -src/system/platform/posix/cthreadimpl.cpp -src/system/platform/win/cthreadimpl.hpp -src/system/platform/win/cthreadimpl.cpp -src/system/platform/posix/cmuteximpl.hpp -src/system/platform/posix/cmuteximpl.cpp -src/system/platform/win/cmuteximpl.hpp -src/system/platform/win/cmuteximpl.cpp -src/system/platform/win/ctimerimpl.hpp -src/system/platform/win/ctimerimpl.cpp -src/system/platform/posix/ctimerimpl.hpp -src/system/platform/posix/ctimerimpl.cpp -src/window/cinputfinger.hpp -src/window/cinputfinger.cpp diff --git a/ee.includes b/ee.includes deleted file mode 100644 index 7626af356..000000000 --- a/ee.includes +++ /dev/null @@ -1,7 +0,0 @@ -src/helper/glew -src/helper/haikuttf -src/helper/libzip -src/helper/SOIL -src/helper/stb_vorbis -src/helper/zlib -src diff --git a/ee.osx.creator.user b/ee.osx.creator.user deleted file mode 100644 index 33966ccce..000000000 --- a/ee.osx.creator.user +++ /dev/null @@ -1,142 +0,0 @@ - - - - GenericProjectManager.GenericProject.Toolchain - ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit. - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - false - false - System - false - false - 4 - true - 2 - true - false - false - 0 - 4 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.Target.0 - - Desktop - - GenericProjectManager.GenericTarget - 0 - 0 - 0 - - /home/programming/projects/EE - INVALID - - - - all - - - - Make - - GenericProjectManager.GenericMakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - 0 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - all - GenericProjectManager.GenericBuildConfiguration - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - No deployment - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - true - 25 - - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 2 - - false - - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - true - false - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.EnvironmentId - {bbaeda53-a008-4abc-a769-1c41d79116d2} - - - ProjectExplorer.Project.Updater.FileVersion - 9 - - diff --git a/ee.osx.files b/ee.osx.files deleted file mode 100644 index b6201ffe1..000000000 --- a/ee.osx.files +++ /dev/null @@ -1,727 +0,0 @@ -src/audio/base.hpp -src/audio/caudiodevice.cpp -src/audio/caudiodevice.hpp -src/audio/caudiolistener.cpp -src/audio/caudiolistener.hpp -src/audio/caudioresource.cpp -src/audio/caudioresource.hpp -src/audio/cmusic.cpp -src/audio/cmusic.hpp -src/audio/csound.cpp -src/audio/csound.hpp -src/audio/csoundbuffer.cpp -src/audio/csoundbuffer.hpp -src/audio/csoundfile.cpp -src/audio/csoundfile.hpp -src/audio/csoundfiledefault.cpp -src/audio/csoundfiledefault.hpp -src/audio/csoundfileogg.cpp -src/audio/csoundfileogg.hpp -src/audio/csoundstream.cpp -src/audio/csoundstream.hpp -src/audio/openal.hpp -src/audio/tsoundloader.hpp -src/audio/tsoundmanager.hpp -src/base/allocator.hpp -src/base/base.hpp -src/base/debug.cpp -src/base/debug.hpp -src/base/memorymanager.cpp -src/base/memorymanager.hpp -src/base/stlcontainers.hpp -src/base.hpp -src/ee.h -src/eeiv/capp.cpp -src/eeiv/capp.hpp -src/eeiv/eeiv.cpp -src/gaming/base.hpp -src/gaming/cisomap.cpp -src/gaming/cisomap.hpp -src/gaming/clight.cpp -src/gaming/clight.hpp -src/graphics/base.hpp -src/graphics/cbatchrenderer.cpp -src/graphics/cbatchrenderer.hpp -src/graphics/cconsole.cpp -src/graphics/cconsole.hpp -src/graphics/cfont.cpp -src/graphics/cfont.hpp -src/graphics/cfontmanager.cpp -src/graphics/cfontmanager.hpp -src/graphics/cframebuffer.cpp -src/graphics/cframebuffer.hpp -src/graphics/cframebufferfbo.cpp -src/graphics/cframebufferfbo.hpp -src/graphics/cframebuffermanager.cpp -src/graphics/cframebuffermanager.hpp -src/graphics/cframebufferpbuffer.cpp -src/graphics/cframebufferpbuffer.hpp -src/graphics/cglobalbatchrenderer.cpp -src/graphics/cglobalbatchrenderer.hpp -src/graphics/cglobalshapegroup.cpp -src/graphics/cglobalshapegroup.hpp -src/graphics/cimage.cpp -src/graphics/cimage.hpp -src/graphics/cparticle.cpp -src/graphics/cparticle.hpp -src/graphics/cparticlesystem.cpp -src/graphics/cparticlesystem.hpp -src/graphics/cprimitives.cpp -src/graphics/cprimitives.hpp -src/graphics/cscrollparallax.cpp -src/graphics/cscrollparallax.hpp -src/graphics/cshader.cpp -src/graphics/cshader.hpp -src/graphics/cshaderprogram.cpp -src/graphics/cshaderprogram.hpp -src/graphics/cshaderprogrammanager.cpp -src/graphics/cshaderprogrammanager.hpp -src/graphics/cshape.cpp -src/graphics/cshape.hpp -src/graphics/cshapegroup.cpp -src/graphics/cshapegroup.hpp -src/graphics/cshapegroupmanager.cpp -src/graphics/cshapegroupmanager.hpp -src/graphics/csprite.cpp -src/graphics/csprite.hpp -src/graphics/ctextcache.cpp -src/graphics/ctextcache.hpp -src/graphics/ctexture.cpp -src/graphics/ctexture.hpp -src/graphics/ctexturefactory.cpp -src/graphics/ctexturefactory.hpp -src/graphics/ctexturefont.cpp -src/graphics/ctexturefont.hpp -src/graphics/ctexturefontloader.cpp -src/graphics/ctexturefontloader.hpp -src/graphics/ctexturegrouploader.cpp -src/graphics/ctexturegrouploader.hpp -src/graphics/ctextureloader.cpp -src/graphics/ctextureloader.hpp -src/graphics/ctexturepacker.cpp -src/graphics/ctexturepacker.hpp -src/graphics/ctexturepackernode.cpp -src/graphics/ctexturepackernode.hpp -src/graphics/ctexturepackertex.cpp -src/graphics/ctexturepackertex.hpp -src/graphics/cttffont.cpp -src/graphics/cttffont.hpp -src/graphics/cttffontloader.cpp -src/graphics/cttffontloader.hpp -src/graphics/cvertexbuffer.cpp -src/graphics/cvertexbuffer.hpp -src/graphics/cvertexbuffermanager.cpp -src/graphics/cvertexbuffermanager.hpp -src/graphics/cvertexbufferogl.cpp -src/graphics/cvertexbufferogl.hpp -src/graphics/cvertexbuffervbo.cpp -src/graphics/cvertexbuffervbo.hpp -src/graphics/fonthelper.hpp -src/graphics/glhelper.cpp -src/graphics/glhelper.hpp -src/graphics/packerhelper.hpp -src/graphics/pixelperfect.cpp -src/graphics/pixelperfect.hpp -src/graphics/renders.hpp -src/graphics/vbohelper.hpp -src/helper/glew/glew.c -src/helper/glew/glew.h -src/helper/glew/glxew.h -src/helper/glew/wglew.h -src/helper/haikuttf/haikuttf.hpp -src/helper/haikuttf/hkbase.hpp -src/helper/haikuttf/hkfont.cpp -src/helper/haikuttf/hkfont.hpp -src/helper/haikuttf/hkfontmanager.cpp -src/helper/haikuttf/hkfontmanager.hpp -src/helper/haikuttf/hkglyph.cpp -src/helper/haikuttf/hkglyph.hpp -src/helper/haikuttf/hkmutex.cpp -src/helper/haikuttf/hkmutex.hpp -src/helper/haikuttf/sophist.h -src/helper/libzip/config.h -src/helper/libzip/inttypes.h -src/helper/libzip/mkstemp.c -src/helper/libzip/stdint.h -src/helper/libzip/zip.h -src/helper/libzip/zip_add.c -src/helper/libzip/zip_add_dir.c -src/helper/libzip/zip_close.c -src/helper/libzip/zip_delete.c -src/helper/libzip/zip_dirent.c -src/helper/libzip/zip_entry_free.c -src/helper/libzip/zip_entry_new.c -src/helper/libzip/zip_err_str.c -src/helper/libzip/zip_error.c -src/helper/libzip/zip_error_clear.c -src/helper/libzip/zip_error_get.c -src/helper/libzip/zip_error_get_sys_type.c -src/helper/libzip/zip_error_strerror.c -src/helper/libzip/zip_error_to_str.c -src/helper/libzip/zip_fclose.c -src/helper/libzip/zip_fdopen.c -src/helper/libzip/zip_file_error_clear.c -src/helper/libzip/zip_file_error_get.c -src/helper/libzip/zip_file_get_offset.c -src/helper/libzip/zip_file_strerror.c -src/helper/libzip/zip_filerange_crc.c -src/helper/libzip/zip_fopen.c -src/helper/libzip/zip_fopen_encrypted.c -src/helper/libzip/zip_fopen_index.c -src/helper/libzip/zip_fopen_index_encrypted.c -src/helper/libzip/zip_fread.c -src/helper/libzip/zip_free.c -src/helper/libzip/zip_get_archive_comment.c -src/helper/libzip/zip_get_archive_flag.c -src/helper/libzip/zip_get_compression_implementation.c -src/helper/libzip/zip_get_encryption_implementation.c -src/helper/libzip/zip_get_file_comment.c -src/helper/libzip/zip_get_name.c -src/helper/libzip/zip_get_num_files.c -src/helper/libzip/zip_memdup.c -src/helper/libzip/zip_name_locate.c -src/helper/libzip/zip_new.c -src/helper/libzip/zip_open.c -src/helper/libzip/zip_rename.c -src/helper/libzip/zip_replace.c -src/helper/libzip/zip_set_archive_comment.c -src/helper/libzip/zip_set_archive_flag.c -src/helper/libzip/zip_set_default_password.c -src/helper/libzip/zip_set_file_comment.c -src/helper/libzip/zip_set_name.c -src/helper/libzip/zip_source_buffer.c -src/helper/libzip/zip_source_close.c -src/helper/libzip/zip_source_crc.c -src/helper/libzip/zip_source_deflate.c -src/helper/libzip/zip_source_error.c -src/helper/libzip/zip_source_file.c -src/helper/libzip/zip_source_filep.c -src/helper/libzip/zip_source_free.c -src/helper/libzip/zip_source_function.c -src/helper/libzip/zip_source_layered.c -src/helper/libzip/zip_source_open.c -src/helper/libzip/zip_source_pkware.c -src/helper/libzip/zip_source_pop.c -src/helper/libzip/zip_source_read.c -src/helper/libzip/zip_source_stat.c -src/helper/libzip/zip_source_zip.c -src/helper/libzip/zip_stat.c -src/helper/libzip/zip_stat_index.c -src/helper/libzip/zip_stat_init.c -src/helper/libzip/zip_strerror.c -src/helper/libzip/zip_unchange.c -src/helper/libzip/zip_unchange_all.c -src/helper/libzip/zip_unchange_archive.c -src/helper/libzip/zip_unchange_data.c -src/helper/libzip/zipconf.h -src/helper/libzip/zipint.h -src/helper/PlusCallback/callback.hpp -src/helper/SOIL/image_DXT.c -src/helper/SOIL/image_DXT.h -src/helper/SOIL/image_helper.c -src/helper/SOIL/image_helper.h -src/helper/SOIL/SOIL.c -src/helper/SOIL/SOIL.h -src/helper/SOIL/stb_image.c -src/helper/SOIL/stb_image.h -src/helper/SOIL/stb_image_write.c -src/helper/SOIL/stb_image_write.h -src/helper/SOIL/stbi_DDS.h -src/helper/SOIL/stbi_DDS_c.h -src/helper/stb_vorbis/stb_vorbis.c -src/helper/stb_vorbis/stb_vorbis.h -src/helper/zlib/adler32.c -src/helper/zlib/compress.c -src/helper/zlib/crc32.c -src/helper/zlib/crc32.h -src/helper/zlib/deflate.c -src/helper/zlib/deflate.h -src/helper/zlib/infback.c -src/helper/zlib/inffast.c -src/helper/zlib/inffast.h -src/helper/zlib/inffixed.h -src/helper/zlib/inflate.c -src/helper/zlib/inflate.h -src/helper/zlib/inftrees.c -src/helper/zlib/inftrees.h -src/helper/zlib/trees.c -src/helper/zlib/trees.h -src/helper/zlib/uncompr.c -src/helper/zlib/zconf.h -src/helper/zlib/zlib.h -src/helper/zlib/zutil.c -src/helper/zlib/zutil.h -src/math/base.hpp -src/math/cmtrand.cpp -src/math/cmtrand.hpp -src/math/math.cpp -src/math/math.hpp -src/system/base.hpp -src/system/cinifile.cpp -src/system/cinifile.hpp -src/system/clog.cpp -src/system/clog.hpp -src/system/cmutex.cpp -src/system/cmutex.hpp -src/system/cobjectloader.cpp -src/system/cobjectloader.hpp -src/system/cpack.cpp -src/system/cpack.hpp -src/system/cpak.cpp -src/system/cpak.hpp -src/system/crc4.cpp -src/system/crc4.hpp -src/system/cresourceloader.cpp -src/system/cresourceloader.hpp -src/system/cthread.cpp -src/system/cthread.hpp -src/system/ctimeelapsed.cpp -src/system/ctimeelapsed.hpp -src/system/ctimer.cpp -src/system/ctimer.hpp -src/system/czip.cpp -src/system/czip.hpp -src/system/tsingleton.hpp -src/system/tcontainer.hpp -src/system/tresourcemanager.hpp -src/ui/base.hpp -src/ui/cuibackground.cpp -src/ui/cuibackground.hpp -src/ui/cuiborder.cpp -src/ui/cuiborder.hpp -src/ui/cuicheckbox.cpp -src/ui/cuicheckbox.hpp -src/ui/cuicombobox.cpp -src/ui/cuicombobox.hpp -src/ui/cuicontrol.cpp -src/ui/cuicontrol.hpp -src/ui/cuicontrolanim.cpp -src/ui/cuicontrolanim.hpp -src/ui/cuidragable.cpp -src/ui/cuidragable.hpp -src/ui/cuidropdownlist.cpp -src/ui/cuidropdownlist.hpp -src/ui/cuievent.cpp -src/ui/cuievent.hpp -src/ui/cuieventkey.cpp -src/ui/cuieventkey.hpp -src/ui/cuieventmouse.cpp -src/ui/cuieventmouse.hpp -src/ui/cuigfx.cpp -src/ui/cuigfx.hpp -src/ui/cuilistbox.cpp -src/ui/cuilistbox.hpp -src/ui/cuilistboxitem.cpp -src/ui/cuilistboxitem.hpp -src/ui/cuimanager.cpp -src/ui/cuimanager.hpp -src/ui/cuimenu.cpp -src/ui/cuimenu.hpp -src/ui/cuimenuitem.cpp -src/ui/cuimenuitem.hpp -src/ui/cuimessage.cpp -src/ui/cuimessage.hpp -src/ui/cuipopupmenu.cpp -src/ui/cuipopupmenu.hpp -src/ui/cuiprogressbar.cpp -src/ui/cuiprogressbar.hpp -src/ui/cuipushbutton.cpp -src/ui/cuipushbutton.hpp -src/ui/cuiradiobutton.cpp -src/ui/cuiradiobutton.hpp -src/ui/cuiscrollbar.cpp -src/ui/cuiscrollbar.hpp -src/ui/cuiseparator.cpp -src/ui/cuiseparator.hpp -src/ui/cuiskin.cpp -src/ui/cuiskin.hpp -src/ui/cuiskincomplex.cpp -src/ui/cuiskincomplex.hpp -src/ui/cuiskinsimple.cpp -src/ui/cuiskinsimple.hpp -src/ui/cuiskinstate.cpp -src/ui/cuiskinstate.hpp -src/ui/cuislider.cpp -src/ui/cuislider.hpp -src/ui/cuisliderbutton.cpp -src/ui/cuisliderbutton.hpp -src/ui/cuispinbox.cpp -src/ui/cuispinbox.hpp -src/ui/cuitextbox.cpp -src/ui/cuitextbox.hpp -src/ui/cuitextinput.cpp -src/ui/cuitextinput.hpp -src/ui/cuitheme.cpp -src/ui/cuitheme.hpp -src/ui/cuithememanager.cpp -src/ui/cuithememanager.hpp -src/ui/uihelper.cpp -src/ui/uihelper.hpp -src/utils/base.hpp -src/utils/cinterpolation.cpp -src/utils/cinterpolation.hpp -src/utils/colors.hpp -src/utils/cperlinnoise.cpp -src/utils/cperlinnoise.hpp -src/utils/cwaypoints.cpp -src/utils/cwaypoints.hpp -src/utils/easing.cpp -src/utils/easing.hpp -src/utils/helper.hpp -src/utils/line2.hpp -src/utils/polygon2.hpp -src/utils/quad2.hpp -src/utils/rect.hpp -src/utils/size.hpp -src/utils/string.cpp -src/utils/string.hpp -src/utils/triangle2.hpp -src/utils/utils.cpp -src/utils/utils.hpp -src/utils/vector2.hpp -src/utils/vector3.hpp -src/window/base.hpp -src/window/cengine.cpp -src/window/cengine.hpp -src/window/cinput.cpp -src/window/cinput.hpp -src/window/cinputtextbuffer.cpp -src/window/cinputtextbuffer.hpp -src/window/cjoystick.cpp -src/window/cjoystick.hpp -src/window/cjoystickmanager.cpp -src/window/cjoystickmanager.hpp -src/window/cview.cpp -src/window/cview.hpp -src/ui/cuimenucheckbox.hpp -src/ui/cuimenucheckbox.cpp -src/ui/cuimenusubmenu.hpp -src/ui/cuimenusubmenu.cpp -src/ui/cuisprite.hpp -src/ui/cuisprite.cpp -src/fluid/cfluidparticle.hpp -src/fluid/cfluidnode.hpp -src/fluid/cfluidmaterial.hpp -src/fluid/cfluid.hpp -src/fluid/cfluid.cpp -src/fluid/cfluidmaterial.cpp -src/fluid/cfluidparticle.cpp -src/fluid/cfluidnode.cpp -src/fluid/cfluidupdater.hpp -src/fluid/cfluidupdater.cpp -src/fluid/cfluidapp.cpp -src/fluid/cfluidapp.hpp -src/fluid/fluid.cpp -src/ui/cuitextedit.hpp -src/ui/cuitextedit.cpp -src/ui/cuitooltip.hpp -src/ui/cuitooltip.cpp -src/ui/cuicomplexcontrol.hpp -src/ui/cuicomplexcontrol.cpp -src/ui/cuigenericgrid.hpp -src/ui/cuigenericgrid.cpp -src/ui/cuigridcell.hpp -src/ui/cuigridcell.cpp -src/ui/tuiitemcontainer.hpp -src/ui/cuiwindow.hpp -src/ui/cuiwindow.cpp -src/physics/cphysicsmanager.hpp -src/physics/cphysicsmanager.cpp -src/helper/chipmunk/prime.h -src/helper/chipmunk/cpVect.h -src/helper/chipmunk/cpSpatialIndex.h -src/helper/chipmunk/cpSpace.h -src/helper/chipmunk/cpShape.h -src/helper/chipmunk/cpPolyShape.h -src/helper/chipmunk/cpBody.h -src/helper/chipmunk/cpBB.h -src/helper/chipmunk/cpArbiter.h -src/helper/chipmunk/chipmunk_unsafe.h -src/helper/chipmunk/chipmunk_types.h -src/helper/chipmunk/chipmunk_private.h -src/helper/chipmunk/chipmunk_ffi.h -src/helper/chipmunk/chipmunk.h -src/helper/chipmunk/cpVect.c -src/helper/chipmunk/cpSpatialIndex.c -src/helper/chipmunk/cpSpaceStep.c -src/helper/chipmunk/cpSpaceQuery.c -src/helper/chipmunk/cpSpaceHash.c -src/helper/chipmunk/cpSpaceComponent.c -src/helper/chipmunk/cpSpace.c -src/helper/chipmunk/cpShape.c -src/helper/chipmunk/cpPolyShape.c -src/helper/chipmunk/cpHashSet.c -src/helper/chipmunk/cpCollision.c -src/helper/chipmunk/cpBody.c -src/helper/chipmunk/cpBBTree.c -src/helper/chipmunk/cpBB.c -src/helper/chipmunk/cpArray.c -src/helper/chipmunk/cpArbiter.c -src/helper/chipmunk/chipmunk.c -src/helper/chipmunk/constraints/util.h -src/helper/chipmunk/constraints/cpSlideJoint.h -src/helper/chipmunk/constraints/cpSimpleMotor.h -src/helper/chipmunk/constraints/cpRotaryLimitJoint.h -src/helper/chipmunk/constraints/cpRatchetJoint.h -src/helper/chipmunk/constraints/cpPivotJoint.h -src/helper/chipmunk/constraints/cpPinJoint.h -src/helper/chipmunk/constraints/cpGrooveJoint.h -src/helper/chipmunk/constraints/cpGearJoint.h -src/helper/chipmunk/constraints/cpDampedSpring.h -src/helper/chipmunk/constraints/cpDampedRotarySpring.h -src/helper/chipmunk/constraints/cpConstraint.h -src/helper/chipmunk/constraints/cpSlideJoint.c -src/helper/chipmunk/constraints/cpSimpleMotor.c -src/helper/chipmunk/constraints/cpRotaryLimitJoint.c -src/helper/chipmunk/constraints/cpRatchetJoint.c -src/helper/chipmunk/constraints/cpPivotJoint.c -src/helper/chipmunk/constraints/cpPinJoint.c -src/helper/chipmunk/constraints/cpGrooveJoint.c -src/helper/chipmunk/constraints/cpGearJoint.c -src/helper/chipmunk/constraints/cpDampedSpring.c -src/helper/chipmunk/constraints/cpDampedRotarySpring.c -src/helper/chipmunk/constraints/cpConstraint.c -src/physics/base.hpp -src/physics/cspace.hpp -src/physics/cspace.cpp -src/physics/cshape.hpp -src/physics/cshape.cpp -src/physics/cbody.hpp -src/physics/cbody.cpp -src/physics/cshapepoly.hpp -src/physics/cshapepoly.cpp -src/physics/cshapesegment.hpp -src/physics/cshapesegment.cpp -src/physics/cshapecircle.hpp -src/physics/cshapecircle.cpp -src/physics/constraints/cconstraint.hpp -src/physics/constraints/cconstraint.cpp -src/physics/constraints/cpinjoint.hpp -src/physics/constraints/cpinjoint.cpp -src/physics/constraints/cslidejoint.hpp -src/physics/constraints/cslidejoint.cpp -src/physics/constraints/cpivotjoint.hpp -src/physics/constraints/cpivotjoint.cpp -src/physics/constraints/cgroovejoint.hpp -src/physics/constraints/cgroovejoint.cpp -src/physics/constraints/cdampedspring.hpp -src/physics/constraints/cdampedspring.cpp -src/physics/constraints/cdampedrotaryspring.hpp -src/physics/constraints/cdampedrotaryspring.cpp -src/physics/constraints/crotarylimitjoint.hpp -src/physics/constraints/crotarylimitjoint.cpp -src/physics/constraints/cratchetjoint.hpp -src/physics/constraints/cratchetjoint.cpp -src/physics/constraints/cgearjoint.hpp -src/physics/constraints/cgearjoint.cpp -src/physics/constraints/csimplemotor.hpp -src/physics/constraints/csimplemotor.cpp -src/physics/physicshelper.hpp -src/physics/carbiter.hpp -src/physics/carbiter.cpp -src/physics/moment.hpp -src/physics/area.hpp -src/physics/settings.hpp -src/graphics/renderer/crenderergl.hpp -src/graphics/renderer/crenderergl.cpp -src/graphics/renderer/cgl.hpp -src/graphics/renderer/cgl.cpp -src/graphics/renderer/crenderergl3.hpp -src/graphics/renderer/crenderergl3.cpp -src/graphics/renderer/base.hpp -src/window/inputhelper.hpp -src/physics/cshapepolysprite.hpp -src/physics/cshapepolysprite.cpp -src/physics/cshapecirclesprite.hpp -src/physics/cshapecirclesprite.cpp -src/window/inputhelper.cpp -src/window/cwindow.hpp -src/window/cwindow.cpp -src/window/cclipboard.hpp -src/window/cclipboard.cpp -src/window/backend/SDL/cwindowsdl.hpp -src/window/backend/SDL/cclipboardsdl.hpp -src/window/backend/SDL/cwindowsdl.cpp -src/window/backend/SDL/cclipboardsdl.cpp -src/window/inputevent.hpp -src/window/keycodes.hpp -src/window/joycodes.hpp -src/window/inputhelper.hpp -src/window/inputevent.hpp -src/window/cwindow.hpp -src/window/cview.hpp -src/window/cjoystickmanager.hpp -src/window/cjoystick.hpp -src/window/cinputtextbuffer.hpp -src/window/cinput.hpp -src/window/cengine.hpp -src/window/cclipboard.hpp -src/window/base.hpp -src/window/inputhelper.cpp -src/window/cwindow.cpp -src/window/cview.cpp -src/window/cjoystickmanager.cpp -src/window/cjoystick.cpp -src/window/cinputtextbuffer.cpp -src/window/cinput.cpp -src/window/cengine.cpp -src/window/cclipboard.cpp -src/window/backend/SDL/cwindowsdl.hpp -src/window/backend/SDL/cjoysticksdl.hpp -src/window/backend/SDL/cjoystickmanagersdl.hpp -src/window/backend/SDL/cinputsdl.hpp -src/window/backend/SDL/cclipboardsdl.hpp -src/window/backend/SDL/cwindowsdl.cpp -src/window/backend/SDL/cjoysticksdl.cpp -src/window/backend/SDL/cjoystickmanagersdl.cpp -src/window/backend/SDL/cinputsdl.cpp -src/window/backend/SDL/cclipboardsdl.cpp -src/window/cbackend.hpp -src/window/backend/SDL/cbackendsdl.hpp -src/helper/sophist/sophist.h -src/window/backend/null/cwindownull.hpp -src/window/backend/null/cjoysticknull.hpp -src/window/backend/null/cjoystickmanagernull.hpp -src/window/backend/null/cinputnull.hpp -src/window/backend/null/cclipboardnull.hpp -src/window/backend/null/cbackendnull.hpp -src/window/backend/null/cwindownull.cpp -src/window/backend/null/cjoysticknull.cpp -src/window/backend/null/cjoystickmanagernull.cpp -src/window/backend/null/cinputnull.cpp -src/window/backend/null/cclipboardnull.cpp -src/window/backend/allegro5/cwindowal.hpp -src/window/backend/allegro5/cjoystickmanageral.hpp -src/window/backend/allegro5/cjoystickal.hpp -src/window/backend/allegro5/cinputal.hpp -src/window/backend/allegro5/cclipboardal.hpp -src/window/backend/allegro5/cbackendal.hpp -src/window/backend/allegro5/cwindowal.cpp -src/window/backend/allegro5/cjoystickmanageral.cpp -src/window/backend/allegro5/cjoystickal.cpp -src/window/backend/allegro5/cinputal.cpp -src/window/backend/allegro5/cclipboardal.cpp -src/window/platform/win/cwinimpl.hpp -src/window/platform/win/cwinimpl.cpp -src/window/platform/osx/cosximpl.hpp -src/window/platform/osx/cosximpl.cpp -src/window/platform/x11/cx11impl.hpp -src/window/platform/x11/cx11impl.cpp -src/window/cplatformimpl.hpp -src/window/platform/null/cnullimpl.cpp -src/window/platform/null/cnullimpl.hpp -src/window/cplatformimpl.cpp -src/window/platform/platformimpl.hpp -src/window/cursorhelper.hpp -src/window/ccursormanager.hpp -src/window/ccursor.hpp -src/window/ccursormanager.cpp -src/window/ccursor.cpp -src/window/backend/null/ccursornull.hpp -src/window/backend/null/ccursormanagernull.hpp -src/window/backend/null/ccursornull.cpp -src/window/backend/null/ccursormanagernull.cpp -src/window/backend/allegro5/ccursormanageral.hpp -src/window/backend/allegro5/ccursoral.hpp -src/window/backend/allegro5/ccursormanageral.cpp -src/window/backend/allegro5/ccursoral.cpp -src/window/backend/SDL/ccursormanagersdl.hpp -src/window/backend/SDL/ccursorsdl.hpp -src/window/backend/SDL/ccursormanagersdl.cpp -src/window/backend/SDL/ccursorsdl.cpp -src/window/platform/x11/ccursorx11.hpp -src/window/platform/x11/ccursorx11.cpp -src/test/eetest.hpp -src/test/eetest.cpp -src/base/utf.hpp -src/base/string.hpp -src/base/utf.inl -src/base/string.cpp -src/ui/cuiwinmenu.hpp -src/ui/cuiwinmenu.cpp -src/ui/cuiselectbutton.hpp -src/ui/cuiselectbutton.cpp -src/helper/chipmunk/prime.h -src/helper/chipmunk/cpVect.h -src/helper/chipmunk/cpSpatialIndex.h -src/helper/chipmunk/cpSpace.h -src/helper/chipmunk/cpShape.h -src/helper/chipmunk/cpPolyShape.h -src/helper/chipmunk/cpBody.h -src/helper/chipmunk/cpBB.h -src/helper/chipmunk/cpArbiter.h -src/helper/chipmunk/chipmunk_unsafe.h -src/helper/chipmunk/chipmunk_types.h -src/helper/chipmunk/chipmunk_private.h -src/helper/chipmunk/chipmunk_ffi.h -src/helper/chipmunk/chipmunk.h -src/helper/chipmunk/cpVect.c -src/helper/chipmunk/cpSweep1D.c -src/helper/chipmunk/cpSpatialIndex.c -src/helper/chipmunk/cpSpaceStep.c -src/helper/chipmunk/cpSpaceQuery.c -src/helper/chipmunk/cpSpaceHash.c -src/helper/chipmunk/cpSpaceComponent.c -src/helper/chipmunk/cpSpace.c -src/helper/chipmunk/cpShape.c -src/helper/chipmunk/cpPolyShape.c -src/helper/chipmunk/cpHashSet.c -src/helper/chipmunk/cpCollision.c -src/helper/chipmunk/cpBody.c -src/helper/chipmunk/cpBBTree.c -src/helper/chipmunk/cpBB.c -src/helper/chipmunk/cpArray.c -src/helper/chipmunk/cpArbiter.c -src/helper/chipmunk/chipmunk.c -src/window/backend/SDL2/cwindowsdl.hpp -src/window/backend/SDL2/cjoysticksdl.hpp -src/window/backend/SDL2/cjoystickmanagersdl.hpp -src/window/backend/SDL2/cinputsdl.hpp -src/window/backend/SDL2/ccursorsdl.hpp -src/window/backend/SDL2/ccursormanagersdl.hpp -src/window/backend/SDL2/cclipboardsdl.hpp -src/window/backend/SDL2/cbackendsdl.hpp -src/window/backend/SDL2/cwindowsdl.cpp -src/window/backend/SDL2/cjoysticksdl.cpp -src/window/backend/SDL2/cjoystickmanagersdl.cpp -src/window/backend/SDL2/cinputsdl.cpp -src/window/backend/SDL2/ccursorsdl.cpp -src/window/backend/SDL2/ccursormanagersdl.cpp -src/window/backend/SDL2/cclipboardsdl.cpp -src/window/backend/SDL2/base.hpp -src/ui/cuicommondialog.hpp -src/ui/cuicommondialog.cpp -src/gaming/cmap.hpp -src/gaming/cmap.cpp -src/gaming/cgameobject.hpp -src/gaming/cgameobject.cpp -src/gaming/cgameobjectshape.hpp -src/gaming/cgameobjectshape.cpp -src/gaming/cgameobjectsprite.hpp -src/gaming/cgameobjectsprite.cpp -src/gaming/maphelper.hpp -src/gaming/cgameobjectshapeex.hpp -src/gaming/cgameobjectshapeex.cpp -src/gaming/clayer.hpp -src/gaming/clayer.cpp -src/gaming/ctilelayer.hpp -src/gaming/ctilelayer.cpp -src/gaming/cobjectlayer.hpp -src/gaming/cobjectlayer.cpp -src/gaming/mapeditor/base.hpp -src/gaming/mapeditor/cmapeditor.hpp -src/gaming/mapeditor/cmapeditor.cpp -src/ui/cuiaquatheme.hpp -src/ui/cuiaquatheme.cpp -src/gaming/mapeditor/cuimap.hpp -src/gaming/mapeditor/cuimap.cpp -src/gaming/mapeditor/cuimapnew.hpp -src/gaming/mapeditor/cuimapnew.cpp -src/gaming/mapeditor/cuilayernew.hpp -src/gaming/mapeditor/cuilayernew.cpp -src/gaming/mapeditor/cuigotypenew.hpp -src/gaming/mapeditor/cuigotypenew.cpp -src/gaming/cgameobjectvirtual.hpp -src/gaming/cgameobjectvirtual.cpp -src/utils/safedatapointer.hpp -src/utils/safedatapointer.cpp diff --git a/src/audio/base.hpp b/include/eepp/audio/base.hpp similarity index 81% rename from src/audio/base.hpp rename to include/eepp/audio/base.hpp index bd821810d..96a88475d 100644 --- a/src/audio/base.hpp +++ b/include/eepp/audio/base.hpp @@ -1,21 +1,17 @@ #ifndef EE_AUDIO_BASE #define EE_AUDIO_BASE -#include "../base.hpp" -#include "openal.hpp" +#include +#include -#include "../system/clog.hpp" -#include "../system/cpack.hpp" -#include "../system/cthread.hpp" +#include +#include +#include using namespace EE::System; -#include "../utils/vector3.hpp" +#include using namespace EE::Utils; -#if EE_PLATFORM == EE_PLATFORM_HAIKU -#define EE_NO_SNDFILE -#endif - /** This module is based on the sfml-audio module. diff --git a/src/audio/caudiodevice.hpp b/include/eepp/audio/caudiodevice.hpp similarity index 90% rename from src/audio/caudiodevice.hpp rename to include/eepp/audio/caudiodevice.hpp index 2225115d7..71f30d6d5 100755 --- a/src/audio/caudiodevice.hpp +++ b/include/eepp/audio/caudiodevice.hpp @@ -1,7 +1,7 @@ #ifndef EE_AUDIOCAUDIODEVICE_H #define EE_AUDIOCAUDIODEVICE_H -#include "caudiolistener.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/caudiolistener.hpp b/include/eepp/audio/caudiolistener.hpp similarity index 97% rename from src/audio/caudiolistener.hpp rename to include/eepp/audio/caudiolistener.hpp index 689375976..c01a98070 100755 --- a/src/audio/caudiolistener.hpp +++ b/include/eepp/audio/caudiolistener.hpp @@ -1,7 +1,7 @@ #ifndef EE_AUDIOCLISTENER_H #define EE_AUDIOCLISTENER_H -#include "base.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/caudioresource.hpp b/include/eepp/audio/caudioresource.hpp similarity index 86% rename from src/audio/caudioresource.hpp rename to include/eepp/audio/caudioresource.hpp index c2618eef5..b7c361a4c 100755 --- a/src/audio/caudioresource.hpp +++ b/include/eepp/audio/caudioresource.hpp @@ -1,7 +1,7 @@ #ifndef EE_AUDIOCAUDIORESOURCE_H #define EE_AUDIOCAUDIORESOURCE_H -#include "caudiodevice.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/cmusic.hpp b/include/eepp/audio/cmusic.hpp similarity index 89% rename from src/audio/cmusic.hpp rename to include/eepp/audio/cmusic.hpp index e4b46ef38..4ffc608cd 100755 --- a/src/audio/cmusic.hpp +++ b/include/eepp/audio/cmusic.hpp @@ -1,9 +1,10 @@ #ifndef EE_AUDIOCMUSIC_H #define EE_AUDIOCMUSIC_H -#include "base.hpp" -#include "csoundfile.hpp" -#include "csoundstream.hpp" +#include +#include +#include + namespace EE { namespace Audio { class EE_API cMusic : public cSoundStream { diff --git a/src/audio/csound.hpp b/include/eepp/audio/csound.hpp similarity index 96% rename from src/audio/csound.hpp rename to include/eepp/audio/csound.hpp index d65c6b450..58e7d8c52 100755 --- a/src/audio/csound.hpp +++ b/include/eepp/audio/csound.hpp @@ -1,9 +1,9 @@ #ifndef EE_AUDIOCSOUND_H #define EE_AUDIOCSOUND_H -#include "base.hpp" -#include "caudioresource.hpp" -#include "csoundbuffer.hpp" +#include +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundbuffer.hpp b/include/eepp/audio/csoundbuffer.hpp similarity index 94% rename from src/audio/csoundbuffer.hpp rename to include/eepp/audio/csoundbuffer.hpp index 5b2d051e4..f6db5a977 100755 --- a/src/audio/csoundbuffer.hpp +++ b/include/eepp/audio/csoundbuffer.hpp @@ -1,9 +1,9 @@ #ifndef EE_AUDIOCSOUNDBUFFER_H #define EE_AUDIOCSOUNDBUFFER_H -#include "base.hpp" -#include "caudioresource.hpp" -#include "csoundfile.hpp" +#include +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundfile.hpp b/include/eepp/audio/csoundfile.hpp similarity index 97% rename from src/audio/csoundfile.hpp rename to include/eepp/audio/csoundfile.hpp index aa662380d..3ced8ec99 100755 --- a/src/audio/csoundfile.hpp +++ b/include/eepp/audio/csoundfile.hpp @@ -1,7 +1,7 @@ #ifndef EE_AUDIOCSOUNDFILE_H #define EE_AUDIOCSOUNDFILE_H -#include "base.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundfiledefault.hpp b/include/eepp/audio/csoundfiledefault.hpp similarity index 95% rename from src/audio/csoundfiledefault.hpp rename to include/eepp/audio/csoundfiledefault.hpp index a59f57379..af6db6656 100755 --- a/src/audio/csoundfiledefault.hpp +++ b/include/eepp/audio/csoundfiledefault.hpp @@ -1,12 +1,12 @@ #ifndef EE_AUDIOCSOUNDFILEDEFAULT_H #define EE_AUDIOCSOUNDFILEDEFAULT_H -#include "base.hpp" +#include -#ifndef EE_NO_SNDFILE +#ifdef EE_LIBSNDFILE_ENABLED #include -#include "csoundfile.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundfileogg.hpp b/include/eepp/audio/csoundfileogg.hpp similarity index 91% rename from src/audio/csoundfileogg.hpp rename to include/eepp/audio/csoundfileogg.hpp index a60f74b8b..a41ceaf23 100755 --- a/src/audio/csoundfileogg.hpp +++ b/include/eepp/audio/csoundfileogg.hpp @@ -1,9 +1,10 @@ #ifndef EE_AUDIOCSOUNDFILEOGG_H #define EE_AUDIOCSOUNDFILEOGG_H -#include "base.hpp" -#include "../helper/stb_vorbis/stb_vorbis.h" -#include "csoundfile.hpp" +#include +#include + +struct stb_vorbis; namespace EE { namespace Audio { diff --git a/src/audio/csoundstream.hpp b/include/eepp/audio/csoundstream.hpp similarity index 97% rename from src/audio/csoundstream.hpp rename to include/eepp/audio/csoundstream.hpp index fe5af635d..ff044280c 100755 --- a/src/audio/csoundstream.hpp +++ b/include/eepp/audio/csoundstream.hpp @@ -1,8 +1,8 @@ #ifndef EE_AUDIOCSOUNDSTREAM_H #define EE_AUDIOCSOUNDSTREAM_H -#include "base.hpp" -#include "csound.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/openal.hpp b/include/eepp/audio/openal.hpp similarity index 89% rename from src/audio/openal.hpp rename to include/eepp/audio/openal.hpp index 8c4210905..1fce4e728 100755 --- a/src/audio/openal.hpp +++ b/include/eepp/audio/openal.hpp @@ -1,7 +1,7 @@ #ifndef EE_OPENAL_H #define EE_OPENAL_H -#include "base.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_MACOSX || EE_PLATFORM == EE_PLATFORM_IOS #include @@ -11,9 +11,6 @@ #include #endif -#include -#include - namespace EE { namespace Audio { #ifdef EE_DEBUG diff --git a/src/audio/tsoundloader.hpp b/include/eepp/audio/tsoundloader.hpp similarity index 97% rename from src/audio/tsoundloader.hpp rename to include/eepp/audio/tsoundloader.hpp index 64bdbd0d9..e0b81a018 100644 --- a/src/audio/tsoundloader.hpp +++ b/include/eepp/audio/tsoundloader.hpp @@ -1,9 +1,9 @@ #ifndef EE_AUDIOTSOUNDLOADER_HPP #define EE_AUDIOTSOUNDLOADER_HPP -#include "base.hpp" -#include "tsoundmanager.hpp" -#include "../system/cobjectloader.hpp" +#include +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/tsoundmanager.hpp b/include/eepp/audio/tsoundmanager.hpp similarity index 97% rename from src/audio/tsoundmanager.hpp rename to include/eepp/audio/tsoundmanager.hpp index 09eac6758..c07ac4c2d 100755 --- a/src/audio/tsoundmanager.hpp +++ b/include/eepp/audio/tsoundmanager.hpp @@ -1,9 +1,9 @@ #ifndef EE_AUDIOTSOUNDMANAGER_H #define EE_AUDIOTSOUNDMANAGER_H -#include "base.hpp" -#include "csound.hpp" -#include "csoundbuffer.hpp" +#include +#include +#include namespace EE { namespace Audio { diff --git a/src/base.hpp b/include/eepp/base.hpp similarity index 76% rename from src/base.hpp rename to include/eepp/base.hpp index b7552fef0..865645a90 100644 --- a/src/base.hpp +++ b/include/eepp/base.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -27,9 +28,9 @@ #include #include -#include "helper/PlusCallback/callback.hpp" +#include -#include "declares.hpp" -#include "base/base.hpp" +#include +#include #endif diff --git a/src/base/allocator.hpp b/include/eepp/base/allocator.hpp similarity index 97% rename from src/base/allocator.hpp rename to include/eepp/base/allocator.hpp index 857330d6c..679757c56 100644 --- a/src/base/allocator.hpp +++ b/include/eepp/base/allocator.hpp @@ -1,7 +1,7 @@ #ifndef EE_ALLOCATOR_HPP #define EE_ALLOCATOR_HPP -#include "memorymanager.hpp" +#include namespace EE { diff --git a/include/eepp/base/base.hpp b/include/eepp/base/base.hpp new file mode 100644 index 000000000..c8697c27a --- /dev/null +++ b/include/eepp/base/base.hpp @@ -0,0 +1,11 @@ +#ifndef EE_BASE_BASE_HPP +#define EE_BASE_BASE_HPP + +#include +#include +#include +#include +#include +#include + +#endif diff --git a/src/base/debug.hpp b/include/eepp/base/debug.hpp similarity index 96% rename from src/base/debug.hpp rename to include/eepp/base/debug.hpp index d9353396d..524a4618d 100644 --- a/src/base/debug.hpp +++ b/include/eepp/base/debug.hpp @@ -1,7 +1,7 @@ #ifndef EE_DEBUG_HPP #define EE_DEBUG_HPP -#include "../base.hpp" +#include namespace EE { diff --git a/src/base/memorymanager.hpp b/include/eepp/base/memorymanager.hpp similarity index 98% rename from src/base/memorymanager.hpp rename to include/eepp/base/memorymanager.hpp index 00ef68a21..be5554a1f 100644 --- a/src/base/memorymanager.hpp +++ b/include/eepp/base/memorymanager.hpp @@ -1,11 +1,11 @@ #ifndef EE_MEMORY_MANAGER_HPP #define EE_MEMORY_MANAGER_HPP -#include "../declares.hpp" -#include -#include +#include #include -#include +#include +#include +#include namespace EE { diff --git a/src/base/stlcontainers.hpp b/include/eepp/base/stlcontainers.hpp similarity index 97% rename from src/base/stlcontainers.hpp rename to include/eepp/base/stlcontainers.hpp index 99a4d84de..69b0e7005 100644 --- a/src/base/stlcontainers.hpp +++ b/include/eepp/base/stlcontainers.hpp @@ -1,6 +1,8 @@ #ifndef EE_STLCONTAINERS_HPP #define EE_STLCONTAINERS_HPP +#include + namespace EE { template > struct eeStack { diff --git a/src/base/string.hpp b/include/eepp/base/string.hpp similarity index 99% rename from src/base/string.hpp rename to include/eepp/base/string.hpp index 4788fba23..a1937723a 100644 --- a/src/base/string.hpp +++ b/include/eepp/base/string.hpp @@ -29,8 +29,11 @@ #ifndef EE_STRING_HPP #define EE_STRING_HPP -#include "../base.hpp" +#include #include +#include +#include +#include namespace EE { diff --git a/src/base/utf.hpp b/include/eepp/base/utf.hpp similarity index 97% rename from src/base/utf.hpp rename to include/eepp/base/utf.hpp index fbc7e807b..2db98c07c 100644 --- a/src/base/utf.hpp +++ b/include/eepp/base/utf.hpp @@ -31,8 +31,10 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include "../base.hpp" #include +#include +#include +#include namespace EE { diff --git a/src/base/utf.inl b/include/eepp/base/utf.inl similarity index 100% rename from src/base/utf.inl rename to include/eepp/base/utf.inl diff --git a/src/declares.hpp b/include/eepp/declares.hpp similarity index 99% rename from src/declares.hpp rename to include/eepp/declares.hpp index 6a38ff140..7e0e090af 100644 --- a/src/declares.hpp +++ b/include/eepp/declares.hpp @@ -1,7 +1,7 @@ #ifndef EE_DECLARES_HPP #define EE_DECLARES_HPP -#include "helper/sophist/sophist.h" +#include #define EE_PLATFORM_WIN 1 #define EE_PLATFORM_LINUX 2 diff --git a/src/ee.h b/include/eepp/ee.hpp similarity index 99% rename from src/ee.h rename to include/eepp/ee.hpp index 1589985fb..188e97e9c 100755 --- a/src/ee.h +++ b/include/eepp/ee.hpp @@ -1,5 +1,5 @@ -#ifndef EE_H -#define EE_H +#ifndef EE_HPP +#define EE_HPP /** @mainpage Entropia Engine++ diff --git a/include/eepp/gaming/base.hpp b/include/eepp/gaming/base.hpp new file mode 100644 index 000000000..2eb59ac1e --- /dev/null +++ b/include/eepp/gaming/base.hpp @@ -0,0 +1,20 @@ +#ifndef EE_GAMING_BASE +#define EE_GAMING_BASE + +#include + +#include +#include +#include +#include +using namespace EE::Utils; + +#include +using namespace EE::Math; + +#include +#include +#include +using namespace EE::System; + +#endif diff --git a/src/gaming/cgameobject.hpp b/include/eepp/gaming/cgameobject.hpp similarity index 89% rename from src/gaming/cgameobject.hpp rename to include/eepp/gaming/cgameobject.hpp index eb64b6d3f..27f107e5b 100644 --- a/src/gaming/cgameobject.hpp +++ b/include/eepp/gaming/cgameobject.hpp @@ -1,11 +1,11 @@ #ifndef EE_GAMINGCGAMEOBJECT_HPP #define EE_GAMINGCGAMEOBJECT_HPP -#include "base.hpp" -#include "maphelper.hpp" -#include "clayer.hpp" +#include +#include +#include -#include "../graphics/renders.hpp" +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectshape.hpp b/include/eepp/gaming/cgameobjectshape.hpp similarity index 88% rename from src/gaming/cgameobjectshape.hpp rename to include/eepp/gaming/cgameobjectshape.hpp index 0c03419e0..0ddb8f45b 100644 --- a/src/gaming/cgameobjectshape.hpp +++ b/include/eepp/gaming/cgameobjectshape.hpp @@ -1,10 +1,10 @@ #ifndef EE_GAMINGCGAMEOBJECTSHAPE_HPP #define EE_GAMINGCGAMEOBJECTSHAPE_HPP -#include "base.hpp" -#include "cgameobject.hpp" +#include +#include -#include "../graphics/cshape.hpp" +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectshapeex.hpp b/include/eepp/gaming/cgameobjectshapeex.hpp similarity index 91% rename from src/gaming/cgameobjectshapeex.hpp rename to include/eepp/gaming/cgameobjectshapeex.hpp index f5f9eb6d6..1676b5457 100644 --- a/src/gaming/cgameobjectshapeex.hpp +++ b/include/eepp/gaming/cgameobjectshapeex.hpp @@ -1,8 +1,8 @@ #ifndef CGAMEOBJECTSHAPEEX_HPP #define CGAMEOBJECTSHAPEEX_HPP -#include "base.hpp" -#include "cgameobjectshape.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectsprite.hpp b/include/eepp/gaming/cgameobjectsprite.hpp similarity index 88% rename from src/gaming/cgameobjectsprite.hpp rename to include/eepp/gaming/cgameobjectsprite.hpp index 9478cc3cd..282307521 100644 --- a/src/gaming/cgameobjectsprite.hpp +++ b/include/eepp/gaming/cgameobjectsprite.hpp @@ -1,10 +1,10 @@ #ifndef EE_GAMINGCGAMEOBJECTSPRITE_HPP #define EE_GAMINGCGAMEOBJECTSPRITE_HPP -#include "base.hpp" -#include "cgameobject.hpp" +#include +#include -#include "../graphics/csprite.hpp" +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectvirtual.hpp b/include/eepp/gaming/cgameobjectvirtual.hpp similarity index 91% rename from src/gaming/cgameobjectvirtual.hpp rename to include/eepp/gaming/cgameobjectvirtual.hpp index 70e5898e1..03d41522f 100644 --- a/src/gaming/cgameobjectvirtual.hpp +++ b/include/eepp/gaming/cgameobjectvirtual.hpp @@ -1,9 +1,9 @@ #ifndef EE_GAMINGCGAMEOBJECTVIRTUAL_HPP #define EE_GAMINGCGAMEOBJECTVIRTUAL_HPP -#include "base.hpp" -#include "cgameobject.hpp" -#include "../graphics/cshape.hpp" +#include +#include +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cisomap.hpp b/include/eepp/gaming/cisomap.hpp similarity index 86% rename from src/gaming/cisomap.hpp rename to include/eepp/gaming/cisomap.hpp index 7192fa6bc..8f28d81cb 100755 --- a/src/gaming/cisomap.hpp +++ b/include/eepp/gaming/cisomap.hpp @@ -1,22 +1,22 @@ #ifndef EE_GAMINGCISOMAP_H #define EE_GAMINGCISOMAP_H -#include "base.hpp" +#include -#include "../window/cinput.hpp" -#include "../window/cwindow.hpp" -#include "../window/cengine.hpp" +#include +#include +#include using namespace EE::Window; -#include "../graphics/ctexture.hpp" -#include "../graphics/ctexturefactory.hpp" -#include "../graphics/cshape.hpp" -#include "../graphics/cfont.hpp" -#include "../graphics/cprimitives.hpp" -#include "../graphics/glhelper.hpp" +#include +#include +#include +#include +#include +#include using namespace EE::Graphics; -#include "clight.hpp" +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clayer.hpp b/include/eepp/gaming/clayer.hpp similarity index 97% rename from src/gaming/clayer.hpp rename to include/eepp/gaming/clayer.hpp index 500b84229..bb48bd4d0 100644 --- a/src/gaming/clayer.hpp +++ b/include/eepp/gaming/clayer.hpp @@ -1,7 +1,7 @@ #ifndef EE_GAMINGCLAYER_HPP #define EE_GAMINGCLAYER_HPP -#include "base.hpp" +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clight.hpp b/include/eepp/gaming/clight.hpp similarity index 98% rename from src/gaming/clight.hpp rename to include/eepp/gaming/clight.hpp index 37cac8a2a..c0b91582c 100644 --- a/src/gaming/clight.hpp +++ b/include/eepp/gaming/clight.hpp @@ -1,7 +1,7 @@ #ifndef EE_GAMINGCLIGHT_H #define EE_GAMINGCLIGHT_H -#include "base.hpp" +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clightmanager.hpp b/include/eepp/gaming/clightmanager.hpp similarity index 94% rename from src/gaming/clightmanager.hpp rename to include/eepp/gaming/clightmanager.hpp index ea0506014..73a0d1f96 100644 --- a/src/gaming/clightmanager.hpp +++ b/include/eepp/gaming/clightmanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCLIGHTMANAGER_HPP #define EE_GAMINGCLIGHTMANAGER_HPP -#include "base.hpp" -#include "clight.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cmap.hpp b/include/eepp/gaming/cmap.hpp similarity index 95% rename from src/gaming/cmap.hpp rename to include/eepp/gaming/cmap.hpp index c948d0846..d094f6450 100644 --- a/src/gaming/cmap.hpp +++ b/include/eepp/gaming/cmap.hpp @@ -1,16 +1,16 @@ #ifndef EE_GAMINGCTILEMAP_HPP #define EE_GAMINGCTILEMAP_HPP -#include "base.hpp" +#include -#include "cgameobject.hpp" -#include "clight.hpp" -#include "clightmanager.hpp" -#include "clayer.hpp" +#include +#include +#include +#include -#include "../window/cinput.hpp" -#include "../window/cengine.hpp" -#include "../window/cwindow.hpp" +#include +#include +#include using namespace EE::Window; namespace EE { namespace Gaming { diff --git a/src/gaming/cobjectlayer.hpp b/include/eepp/gaming/cobjectlayer.hpp similarity index 92% rename from src/gaming/cobjectlayer.hpp rename to include/eepp/gaming/cobjectlayer.hpp index 22abf0046..bb63b0ac7 100644 --- a/src/gaming/cobjectlayer.hpp +++ b/include/eepp/gaming/cobjectlayer.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCOBJECTLAYER_HPP #define EE_GAMINGCOBJECTLAYER_HPP -#include "clayer.hpp" -#include "cgameobject.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/ctilelayer.hpp b/include/eepp/gaming/ctilelayer.hpp similarity index 93% rename from src/gaming/ctilelayer.hpp rename to include/eepp/gaming/ctilelayer.hpp index 91c5ff1da..ccac46889 100644 --- a/src/gaming/ctilelayer.hpp +++ b/include/eepp/gaming/ctilelayer.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCTILELAYER_HPP #define EE_GAMINGCTILELAYER_HPP -#include "clayer.hpp" -#include "cgameobject.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/mapeditor/base.hpp b/include/eepp/gaming/mapeditor/base.hpp similarity index 72% rename from src/gaming/mapeditor/base.hpp rename to include/eepp/gaming/mapeditor/base.hpp index 972fb9cf6..c20f84c59 100644 --- a/src/gaming/mapeditor/base.hpp +++ b/include/eepp/gaming/mapeditor/base.hpp @@ -1,6 +1,6 @@ #ifndef EE_GAMINGME_BASE_CPP #define EE_GAMINGME_BASE_CPP -#include "../base.hpp" +#include #endif diff --git a/src/gaming/mapeditor/clayerproperties.hpp b/include/eepp/gaming/mapeditor/clayerproperties.hpp similarity index 78% rename from src/gaming/mapeditor/clayerproperties.hpp rename to include/eepp/gaming/mapeditor/clayerproperties.hpp index ae094807c..4c1bbca30 100644 --- a/src/gaming/mapeditor/clayerproperties.hpp +++ b/include/eepp/gaming/mapeditor/clayerproperties.hpp @@ -1,12 +1,12 @@ #ifndef EE_GAMINGCLAYERPROPERTIES_HPP #define EE_GAMINGCLAYERPROPERTIES_HPP -#include "base.hpp" -#include "../maphelper.hpp" -#include "../clayer.hpp" -#include "../../ui/cuiwindow.hpp" -#include "../../ui/cuigenericgrid.hpp" -#include "../../ui/cuitextinput.hpp" +#include +#include +#include +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cmapeditor.hpp b/include/eepp/gaming/mapeditor/cmapeditor.hpp similarity index 96% rename from src/gaming/mapeditor/cmapeditor.hpp rename to include/eepp/gaming/mapeditor/cmapeditor.hpp index 5e554693e..886007d0d 100644 --- a/src/gaming/mapeditor/cmapeditor.hpp +++ b/include/eepp/gaming/mapeditor/cmapeditor.hpp @@ -1,10 +1,10 @@ #ifndef EE_GAMINGCMAPEDITOR_HPP #define EE_GAMINGCMAPEDITOR_HPP -#include "base.hpp" -#include "../../ui/cuiwindow.hpp" -#include "../../ui/cuimenucheckbox.hpp" -#include "cuimap.hpp" +#include +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cmapproperties.hpp b/include/eepp/gaming/mapeditor/cmapproperties.hpp similarity index 84% rename from src/gaming/mapeditor/cmapproperties.hpp rename to include/eepp/gaming/mapeditor/cmapproperties.hpp index c00ff3d7c..f23b9f6cc 100644 --- a/src/gaming/mapeditor/cmapproperties.hpp +++ b/include/eepp/gaming/mapeditor/cmapproperties.hpp @@ -1,12 +1,12 @@ #ifndef EE_GAMINGCMAPPROPERTIES_HPP #define EE_GAMINGCMAPPROPERTIES_HPP -#include "base.hpp" -#include "../cmap.hpp" -#include "../../ui/cuiwindow.hpp" -#include "../../ui/cuigenericgrid.hpp" -#include "../../ui/cuitextinput.hpp" -#include "../../ui/cuislider.hpp" +#include +#include +#include +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cuigotypenew.hpp b/include/eepp/gaming/mapeditor/cuigotypenew.hpp similarity index 89% rename from src/gaming/mapeditor/cuigotypenew.hpp rename to include/eepp/gaming/mapeditor/cuigotypenew.hpp index 1b346488a..750d26105 100644 --- a/src/gaming/mapeditor/cuigotypenew.hpp +++ b/include/eepp/gaming/mapeditor/cuigotypenew.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCUIGOTYPENEW_HPP #define EE_GAMINGCUIGOTYPENEW_HPP -#include "base.hpp" -#include "../../ui/cuiwindow.hpp" +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cuilayernew.hpp b/include/eepp/gaming/mapeditor/cuilayernew.hpp similarity index 88% rename from src/gaming/mapeditor/cuilayernew.hpp rename to include/eepp/gaming/mapeditor/cuilayernew.hpp index 07dd767f3..d2ef24135 100644 --- a/src/gaming/mapeditor/cuilayernew.hpp +++ b/include/eepp/gaming/mapeditor/cuilayernew.hpp @@ -1,9 +1,9 @@ #ifndef EE_GAMINGCUILAYERNEW_HPP #define EE_GAMINGCUILAYERNEW_HPP -#include "base.hpp" -#include "../../ui/cuiwindow.hpp" -#include "cuimap.hpp" +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cuimap.hpp b/include/eepp/gaming/mapeditor/cuimap.hpp similarity index 87% rename from src/gaming/mapeditor/cuimap.hpp rename to include/eepp/gaming/mapeditor/cuimap.hpp index 54b2e93c8..750ca13cd 100644 --- a/src/gaming/mapeditor/cuimap.hpp +++ b/include/eepp/gaming/mapeditor/cuimap.hpp @@ -1,11 +1,11 @@ #ifndef EE_GAMINGCUIMAP_HPP #define EE_GAMINGCUIMAP_HPP -#include "base.hpp" -#include "../../ui/cuicomplexcontrol.hpp" -#include "../cmap.hpp" -#include "../clightmanager.hpp" -#include "../clight.hpp" +#include +#include +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/mapeditor/cuimapnew.hpp b/include/eepp/gaming/mapeditor/cuimapnew.hpp similarity index 91% rename from src/gaming/mapeditor/cuimapnew.hpp rename to include/eepp/gaming/mapeditor/cuimapnew.hpp index 0976f1ed8..826a68aa0 100644 --- a/src/gaming/mapeditor/cuimapnew.hpp +++ b/include/eepp/gaming/mapeditor/cuimapnew.hpp @@ -1,9 +1,9 @@ #ifndef EE_GAMINGCUIMAPNEW_HPP #define EE_GAMINGCUIMAPNEW_HPP -#include "base.hpp" -#include "../../ui/cuiwindow.hpp" -#include "cuimap.hpp" +#include +#include +#include using namespace EE::UI; diff --git a/src/gaming/maphelper.hpp b/include/eepp/gaming/maphelper.hpp similarity index 100% rename from src/gaming/maphelper.hpp rename to include/eepp/gaming/maphelper.hpp diff --git a/src/graphics/base.hpp b/include/eepp/graphics/base.hpp similarity index 90% rename from src/graphics/base.hpp rename to include/eepp/graphics/base.hpp index 0bd2e8642..12bef8d9d 100644 --- a/src/graphics/base.hpp +++ b/include/eepp/graphics/base.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICS_BASE #define EE_GRAPHICS_BASE -#include "../base.hpp" +#include #ifdef EE_64BIT #define GL_FP GL_DOUBLE @@ -17,7 +17,7 @@ //! GL2 and GL3 ( PC platform ) #ifdef EE_GLEW_AVAILABLE - #include "../helper/glew/glew.h" + #include #else #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES @@ -211,29 +211,29 @@ #endif #define STBI_TYPE_SPECIFIC_FUNCTIONS -#include "../helper/SOIL/stb_image.h" -#include "../helper/SOIL/SOIL.h" +#include +#include -#include "../utils/colors.hpp" -#include "../utils/rect.hpp" -#include "../utils/vector2.hpp" -#include "../utils/string.hpp" -#include "../utils/utils.hpp" -#include "../utils/polygon2.hpp" +#include +#include +#include +#include +#include +#include using namespace EE::Utils; -#include "../math/math.hpp" +#include using namespace EE::Math; -#include "../system/ctimeelapsed.hpp" -#include "../system/tsingleton.hpp" -#include "../system/clog.hpp" -#include "../system/cpack.hpp" -#include "../system/tresourcemanager.hpp" -#include "../system/tcontainer.hpp" -#include "../system/cpackmanager.hpp" +#include +#include +#include +#include +#include +#include +#include using namespace EE::System; -#include "renders.hpp" +#include #endif diff --git a/src/graphics/cbatchrenderer.hpp b/include/eepp/graphics/cbatchrenderer.hpp similarity index 98% rename from src/graphics/cbatchrenderer.hpp rename to include/eepp/graphics/cbatchrenderer.hpp index 6fa26eb12..b458910e2 100755 --- a/src/graphics/cbatchrenderer.hpp +++ b/include/eepp/graphics/cbatchrenderer.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCBATCHRENDERER_H #define EE_GRAPHICSCBATCHRENDERER_H -#include "base.hpp" -#include "ctexture.hpp" -#include "glhelper.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cconsole.hpp b/include/eepp/graphics/cconsole.hpp similarity index 97% rename from src/graphics/cconsole.hpp rename to include/eepp/graphics/cconsole.hpp index 03aa70d4e..03b9e8d3a 100755 --- a/src/graphics/cconsole.hpp +++ b/include/eepp/graphics/cconsole.hpp @@ -1,11 +1,11 @@ #ifndef EE_GRAPHICSCCONSOLE_H #define EE_GRAPHICSCCONSOLE_H -#include "base.hpp" -#include "../window/cwindow.hpp" -#include "../window/cinputtextbuffer.hpp" -#include "cprimitives.hpp" -#include "cfont.hpp" +#include +#include +#include +#include +#include using namespace EE::Window; diff --git a/src/graphics/cfont.hpp b/include/eepp/graphics/cfont.hpp similarity index 97% rename from src/graphics/cfont.hpp rename to include/eepp/graphics/cfont.hpp index 51bed5e13..63476caab 100755 --- a/src/graphics/cfont.hpp +++ b/include/eepp/graphics/cfont.hpp @@ -1,10 +1,10 @@ #ifndef EE_GRAPHICSCFONT_H #define EE_GRAPHICSCFONT_H -#include "base.hpp" -#include "fonthelper.hpp" -#include "ctexturefactory.hpp" -#include "ctextcache.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cfontmanager.hpp b/include/eepp/graphics/cfontmanager.hpp similarity index 82% rename from src/graphics/cfontmanager.hpp rename to include/eepp/graphics/cfontmanager.hpp index 31badfb6f..0545de765 100644 --- a/src/graphics/cfontmanager.hpp +++ b/include/eepp/graphics/cfontmanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCFONTMANAGER_HPP #define EE_GRAPHICSCFONTMANAGER_HPP -#include "base.hpp" -#include "cfont.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cframebuffer.hpp b/include/eepp/graphics/cframebuffer.hpp similarity index 87% rename from src/graphics/cframebuffer.hpp rename to include/eepp/graphics/cframebuffer.hpp index 854600e02..cd2b282ed 100644 --- a/src/graphics/cframebuffer.hpp +++ b/include/eepp/graphics/cframebuffer.hpp @@ -1,10 +1,10 @@ #ifndef EE_GRAPHICSCFRAMEBUFFER_HPP #define EE_GRAPHICSCFRAMEBUFFER_HPP -#include "base.hpp" -#include "ctexture.hpp" -#include "../window/cview.hpp" -#include "../window/cwindow.hpp" +#include +#include +#include +#include using namespace EE::Window; diff --git a/src/graphics/cframebufferfbo.hpp b/include/eepp/graphics/cframebufferfbo.hpp similarity index 87% rename from src/graphics/cframebufferfbo.hpp rename to include/eepp/graphics/cframebufferfbo.hpp index 3c8da0c95..89b1b08a9 100644 --- a/src/graphics/cframebufferfbo.hpp +++ b/include/eepp/graphics/cframebufferfbo.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCFRAMEBUFFERFBO_HPP #define EE_GRAPHICSCFRAMEBUFFERFBO_HPP -#include "base.hpp" -#include "cframebuffer.hpp" -#include "ctexture.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cframebuffermanager.hpp b/include/eepp/graphics/cframebuffermanager.hpp similarity index 83% rename from src/graphics/cframebuffermanager.hpp rename to include/eepp/graphics/cframebuffermanager.hpp index f8110fa65..3d9cdebc4 100644 --- a/src/graphics/cframebuffermanager.hpp +++ b/include/eepp/graphics/cframebuffermanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCFRAMEBUFFERMANAGER_HPP #define EE_GRAPHICSCFRAMEBUFFERMANAGER_HPP -#include "base.hpp" -#include "cframebuffer.hpp" +#include +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cframebufferpbuffer.hpp b/include/eepp/graphics/cframebufferpbuffer.hpp similarity index 94% rename from src/graphics/cframebufferpbuffer.hpp rename to include/eepp/graphics/cframebufferpbuffer.hpp index 1d8479eb1..e946307e2 100644 --- a/src/graphics/cframebufferpbuffer.hpp +++ b/include/eepp/graphics/cframebufferpbuffer.hpp @@ -26,15 +26,15 @@ * NOTE by Martin Lucas Golini: This is not the original version, so differs from SFML implementation. */ -#include "base.hpp" -#include "cframebuffer.hpp" +#include +#include #ifdef EE_GLEW_AVAILABLE #if EE_PLATFORM == EE_PLATFORM_WIN -#include "../helper/glew/wglew.h" +#include #elif defined( EE_X11_PLATFORM ) -#include "../helper/glew/glxew.h" +#include #include #elif EE_PLATFORM == EE_PLATFORM_MACOSX //#include diff --git a/src/graphics/cglobalbatchrenderer.hpp b/include/eepp/graphics/cglobalbatchrenderer.hpp similarity index 84% rename from src/graphics/cglobalbatchrenderer.hpp rename to include/eepp/graphics/cglobalbatchrenderer.hpp index 24cc76148..b7ec22212 100755 --- a/src/graphics/cglobalbatchrenderer.hpp +++ b/include/eepp/graphics/cglobalbatchrenderer.hpp @@ -1,8 +1,8 @@ #ifndef EE_GAMINGCGLOBALBATCHRENDERER_H #define EE_GAMINGCGLOBALBATCHRENDERER_H -#include "base.hpp" -#include "cbatchrenderer.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cglobalshapegroup.hpp b/include/eepp/graphics/cglobalshapegroup.hpp similarity index 79% rename from src/graphics/cglobalshapegroup.hpp rename to include/eepp/graphics/cglobalshapegroup.hpp index ddc55ce36..5b496f03e 100644 --- a/src/graphics/cglobalshapegroup.hpp +++ b/include/eepp/graphics/cglobalshapegroup.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCGLOBALSHAPEGROUP_HPP #define EE_GRAPHICSCGLOBALSHAPEGROUP_HPP -#include "base.hpp" -#include "cshapegroup.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cimage.hpp b/include/eepp/graphics/cimage.hpp similarity index 99% rename from src/graphics/cimage.hpp rename to include/eepp/graphics/cimage.hpp index 8524d09f0..d89b82795 100644 --- a/src/graphics/cimage.hpp +++ b/include/eepp/graphics/cimage.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSCIMAGE_HPP #define EE_GRAPHICSCIMAGE_HPP -#include "base.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cparticle.hpp b/include/eepp/graphics/cparticle.hpp similarity index 98% rename from src/graphics/cparticle.hpp rename to include/eepp/graphics/cparticle.hpp index ec978a506..9197ecfac 100755 --- a/src/graphics/cparticle.hpp +++ b/include/eepp/graphics/cparticle.hpp @@ -1,7 +1,7 @@ #ifndef CPARTICLE_H #define CPARTICLE_H -#include "base.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cparticlesystem.hpp b/include/eepp/graphics/cparticlesystem.hpp similarity index 98% rename from src/graphics/cparticlesystem.hpp rename to include/eepp/graphics/cparticlesystem.hpp index 98e476090..940211ab1 100755 --- a/src/graphics/cparticlesystem.hpp +++ b/include/eepp/graphics/cparticlesystem.hpp @@ -1,8 +1,8 @@ #ifndef EECPARTICLESYSTEM_H #define EECPARTICLESYSTEM_H -#include "base.hpp" -#include "cparticle.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cprimitives.hpp b/include/eepp/graphics/cprimitives.hpp similarity index 99% rename from src/graphics/cprimitives.hpp rename to include/eepp/graphics/cprimitives.hpp index 47e214201..0c6c7ebb1 100755 --- a/src/graphics/cprimitives.hpp +++ b/include/eepp/graphics/cprimitives.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCPRIMITIVES_H #define EE_GRAPHICSCPRIMITIVES_H -#include "base.hpp" -#include "ctexturefactory.hpp" -#include "cbatchrenderer.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cscrollparallax.hpp b/include/eepp/graphics/cscrollparallax.hpp similarity index 96% rename from src/graphics/cscrollparallax.hpp rename to include/eepp/graphics/cscrollparallax.hpp index 1af09b361..a1961578b 100755 --- a/src/graphics/cscrollparallax.hpp +++ b/include/eepp/graphics/cscrollparallax.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCSCROLLPARALLAX_H #define EE_GRAPHICSCSCROLLPARALLAX_H -#include "base.hpp" -#include "ctexture.hpp" -#include "cshape.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshader.hpp b/include/eepp/graphics/cshader.hpp similarity index 98% rename from src/graphics/cshader.hpp rename to include/eepp/graphics/cshader.hpp index 21d5dbaff..0af283bf3 100644 --- a/src/graphics/cshader.hpp +++ b/include/eepp/graphics/cshader.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSCSHADER_H #define EE_GRAPHICSCSHADER_H -#include "base.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshaderprogram.hpp b/include/eepp/graphics/cshaderprogram.hpp similarity index 97% rename from src/graphics/cshaderprogram.hpp rename to include/eepp/graphics/cshaderprogram.hpp index f619f0779..56a89f3f5 100644 --- a/src/graphics/cshaderprogram.hpp +++ b/include/eepp/graphics/cshaderprogram.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCSHADERPROGRAM_H #define EE_GRAPHICSCSHADERPROGRAM_H -#include "base.hpp" -#include "../utils/vector3.hpp" -#include "cshader.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshaderprogrammanager.hpp b/include/eepp/graphics/cshaderprogrammanager.hpp similarity index 82% rename from src/graphics/cshaderprogrammanager.hpp rename to include/eepp/graphics/cshaderprogrammanager.hpp index d9672a50b..c8bb02f7f 100644 --- a/src/graphics/cshaderprogrammanager.hpp +++ b/include/eepp/graphics/cshaderprogrammanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSSHADERPROGRAMANAGER_HPP #define EE_GRAPHICSSHADERPROGRAMANAGER_HPP -#include "base.hpp" -#include "cshaderprogram.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshape.hpp b/include/eepp/graphics/cshape.hpp similarity index 97% rename from src/graphics/cshape.hpp rename to include/eepp/graphics/cshape.hpp index dc1f6300b..6570b77f1 100644 --- a/src/graphics/cshape.hpp +++ b/include/eepp/graphics/cshape.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCSHAPE_H #define EE_GRAPHICSCSHAPE_H -#include "base.hpp" -#include "ctexture.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshapegroup.hpp b/include/eepp/graphics/cshapegroup.hpp similarity index 94% rename from src/graphics/cshapegroup.hpp rename to include/eepp/graphics/cshapegroup.hpp index 46dfa256b..4007535d4 100644 --- a/src/graphics/cshapegroup.hpp +++ b/include/eepp/graphics/cshapegroup.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCSHAPEMANAGER_H #define EE_GRAPHICSCSHAPEMANAGER_H -#include "base.hpp" -#include "cshape.hpp" +#include +#include #define SHAPE_NONE 0xFFFFFFFF diff --git a/src/graphics/cshapegroupmanager.hpp b/include/eepp/graphics/cshapegroupmanager.hpp similarity index 92% rename from src/graphics/cshapegroupmanager.hpp rename to include/eepp/graphics/cshapegroupmanager.hpp index 42495078b..013d900fd 100644 --- a/src/graphics/cshapegroupmanager.hpp +++ b/include/eepp/graphics/cshapegroupmanager.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCSHAPEGROUPMANAGER_HPP #define EE_GRAPHICSCSHAPEGROUPMANAGER_HPP -#include "base.hpp" -#include "cshape.hpp" -#include "cshapegroup.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/csprite.hpp b/include/eepp/graphics/csprite.hpp similarity index 98% rename from src/graphics/csprite.hpp rename to include/eepp/graphics/csprite.hpp index 39bca8293..ebaf46b33 100755 --- a/src/graphics/csprite.hpp +++ b/include/eepp/graphics/csprite.hpp @@ -1,10 +1,10 @@ #ifndef EECSPRITE_H #define EECSPRITE_H -#include "base.hpp" -#include "ctexturefactory.hpp" -#include "cshape.hpp" -#include "cshapegroup.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctextcache.hpp b/include/eepp/graphics/ctextcache.hpp similarity index 94% rename from src/graphics/ctextcache.hpp rename to include/eepp/graphics/ctextcache.hpp index ce5330351..fda9390e6 100644 --- a/src/graphics/ctextcache.hpp +++ b/include/eepp/graphics/ctextcache.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCTEXTCACHE_H #define EE_GRAPHICSCTEXTCACHE_H -#include "base.hpp" -#include "fonthelper.hpp" -#include "glhelper.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexture.hpp b/include/eepp/graphics/ctexture.hpp similarity index 99% rename from src/graphics/ctexture.hpp rename to include/eepp/graphics/ctexture.hpp index 3576f99a2..a5fe5f40b 100755 --- a/src/graphics/ctexture.hpp +++ b/include/eepp/graphics/ctexture.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCTEXTURE_H #define EE_GRAPHICSCTEXTURE_H -#include "base.hpp" -#include "cimage.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefactory.hpp b/include/eepp/graphics/ctexturefactory.hpp similarity index 98% rename from src/graphics/ctexturefactory.hpp rename to include/eepp/graphics/ctexturefactory.hpp index 60be5fad8..24ab0a3d0 100755 --- a/src/graphics/ctexturefactory.hpp +++ b/include/eepp/graphics/ctexturefactory.hpp @@ -1,10 +1,10 @@ #ifndef EECTEXTUREFACTORY_H #define EECTEXTUREFACTORY_H -#include "base.hpp" -#include "ctexture.hpp" -#include "cglobalbatchrenderer.hpp" -#include "../system/cmutex.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefont.hpp b/include/eepp/graphics/ctexturefont.hpp similarity index 96% rename from src/graphics/ctexturefont.hpp rename to include/eepp/graphics/ctexturefont.hpp index 724f08006..34c9b5968 100755 --- a/src/graphics/ctexturefont.hpp +++ b/include/eepp/graphics/ctexturefont.hpp @@ -1,9 +1,9 @@ #ifndef EECTEXTUREFONT_H #define EECTEXTUREFONT_H -#include "base.hpp" -#include "ctexturefactory.hpp" -#include "cfont.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefontloader.hpp b/include/eepp/graphics/ctexturefontloader.hpp similarity index 90% rename from src/graphics/ctexturefontloader.hpp rename to include/eepp/graphics/ctexturefontloader.hpp index 76a66474c..94d060b65 100644 --- a/src/graphics/ctexturefontloader.hpp +++ b/include/eepp/graphics/ctexturefontloader.hpp @@ -1,11 +1,11 @@ #ifndef EE_GRAPHICSCTEXTUREFONTLOADER #define EE_GRAPHICSCTEXTUREFONTLOADER -#include "base.hpp" -#include "cfont.hpp" -#include "ctexturefont.hpp" -#include "../system/cobjectloader.hpp" -#include "ctextureloader.hpp" +#include +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturegrouploader.hpp b/include/eepp/graphics/ctexturegrouploader.hpp similarity index 90% rename from src/graphics/ctexturegrouploader.hpp rename to include/eepp/graphics/ctexturegrouploader.hpp index 748fdd580..8f5f490b1 100644 --- a/src/graphics/ctexturegrouploader.hpp +++ b/include/eepp/graphics/ctexturegrouploader.hpp @@ -1,12 +1,12 @@ #ifndef EE_GRAPHICSCTEXTUREGROUPLOADER_HPP #define EE_GRAPHICSCTEXTUREGROUPLOADER_HPP -#include "base.hpp" -#include "packerhelper.hpp" -#include "ctextureloader.hpp" -#include "ctexturefactory.hpp" -#include "../system/cresourceloader.hpp" -#include "../system/ciostream.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctextureloader.hpp b/include/eepp/graphics/ctextureloader.hpp similarity index 96% rename from src/graphics/ctextureloader.hpp rename to include/eepp/graphics/ctextureloader.hpp index 5ecac60db..ec510df68 100644 --- a/src/graphics/ctextureloader.hpp +++ b/include/eepp/graphics/ctextureloader.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCTEXTURELOADER #define EE_GRAPHICSCTEXTURELOADER -#include "base.hpp" -#include "../system/cobjectloader.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturepacker.hpp b/include/eepp/graphics/ctexturepacker.hpp similarity index 96% rename from src/graphics/ctexturepacker.hpp rename to include/eepp/graphics/ctexturepacker.hpp index 122fa549f..8ebae1ba7 100644 --- a/src/graphics/ctexturepacker.hpp +++ b/include/eepp/graphics/ctexturepacker.hpp @@ -31,10 +31,10 @@ ** Implementation differ from the original, but i use the base texture atlas algorithm. */ -#include "base.hpp" -#include "packerhelper.hpp" -#include "ctexturepackernode.hpp" -#include "ctexturepackertex.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturepackernode.hpp b/include/eepp/graphics/ctexturepackernode.hpp similarity index 97% rename from src/graphics/ctexturepackernode.hpp rename to include/eepp/graphics/ctexturepackernode.hpp index a6e393718..092be8031 100644 --- a/src/graphics/ctexturepackernode.hpp +++ b/include/eepp/graphics/ctexturepackernode.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSPRIVATECTEXTUREPACKERNODE #define EE_GRAPHICSPRIVATECTEXTUREPACKERNODE -#include "base.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/ctexturepackertex.hpp b/include/eepp/graphics/ctexturepackertex.hpp similarity index 98% rename from src/graphics/ctexturepackertex.hpp rename to include/eepp/graphics/ctexturepackertex.hpp index c72adc457..d009daae8 100644 --- a/src/graphics/ctexturepackertex.hpp +++ b/include/eepp/graphics/ctexturepackertex.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSPRIVATECTEXTUREPACKERTEX #define EE_GRAPHICSPRIVATECTEXTUREPACKERTEX -#include "base.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cttffont.hpp b/include/eepp/graphics/cttffont.hpp similarity index 97% rename from src/graphics/cttffont.hpp rename to include/eepp/graphics/cttffont.hpp index 3eefc9c52..5736618ef 100755 --- a/src/graphics/cttffont.hpp +++ b/include/eepp/graphics/cttffont.hpp @@ -1,9 +1,9 @@ #ifndef EE_GRAPHICSCTTFFONT_H #define EE_GRAPHICSCTTFFONT_H -#include "base.hpp" -#include "ctexturefactory.hpp" -#include "cfont.hpp" +#include +#include +#include namespace HaikuTTF { class hkFont; diff --git a/src/graphics/cttffontloader.hpp b/include/eepp/graphics/cttffontloader.hpp similarity index 93% rename from src/graphics/cttffontloader.hpp rename to include/eepp/graphics/cttffontloader.hpp index 65da2679b..9afd70dd7 100644 --- a/src/graphics/cttffontloader.hpp +++ b/include/eepp/graphics/cttffontloader.hpp @@ -1,10 +1,10 @@ #ifndef EE_GRAPHICSCTTFFONTLOADER #define EE_GRAPHICSCTTFFONTLOADER -#include "base.hpp" -#include "cfont.hpp" -#include "cttffont.hpp" -#include "../system/cobjectloader.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffer.hpp b/include/eepp/graphics/cvertexbuffer.hpp similarity index 96% rename from src/graphics/cvertexbuffer.hpp rename to include/eepp/graphics/cvertexbuffer.hpp index 5d6795f8b..d21c4bb67 100644 --- a/src/graphics/cvertexbuffer.hpp +++ b/include/eepp/graphics/cvertexbuffer.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCVERTEXBUFFER_HPP #define EE_GRAPHICSCVERTEXBUFFER_HPP -#include "base.hpp" -#include "vbohelper.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffermanager.hpp b/include/eepp/graphics/cvertexbuffermanager.hpp similarity index 83% rename from src/graphics/cvertexbuffermanager.hpp rename to include/eepp/graphics/cvertexbuffermanager.hpp index 34c2477bd..a20c89692 100644 --- a/src/graphics/cvertexbuffermanager.hpp +++ b/include/eepp/graphics/cvertexbuffermanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICSCVERTEXBUFFERMANAGER_HPP #define EE_GRAPHICSCVERTEXBUFFERMANAGER_HPP -#include "base.hpp" -#include "cvertexbuffer.hpp" +#include +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cvertexbufferogl.hpp b/include/eepp/graphics/cvertexbufferogl.hpp similarity index 93% rename from src/graphics/cvertexbufferogl.hpp rename to include/eepp/graphics/cvertexbufferogl.hpp index 6e1925aac..8435cc9ef 100644 --- a/src/graphics/cvertexbufferogl.hpp +++ b/include/eepp/graphics/cvertexbufferogl.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSCVERTEXBUFFEROGL_HPP #define EE_GRAPHICSCVERTEXBUFFEROGL_HPP -#include "cvertexbuffer.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffervbo.hpp b/include/eepp/graphics/cvertexbuffervbo.hpp similarity index 94% rename from src/graphics/cvertexbuffervbo.hpp rename to include/eepp/graphics/cvertexbuffervbo.hpp index 427f09099..9adf133d7 100644 --- a/src/graphics/cvertexbuffervbo.hpp +++ b/include/eepp/graphics/cvertexbuffervbo.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICSCVERTEXBUFFERVBO_HPP #define EE_GRAPHICSCVERTEXBUFFERVBO_HPP -#include "cvertexbuffer.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/fonthelper.hpp b/include/eepp/graphics/fonthelper.hpp similarity index 100% rename from src/graphics/fonthelper.hpp rename to include/eepp/graphics/fonthelper.hpp diff --git a/src/graphics/glhelper.hpp b/include/eepp/graphics/glhelper.hpp similarity index 63% rename from src/graphics/glhelper.hpp rename to include/eepp/graphics/glhelper.hpp index 79cc3c275..61742b8d2 100644 --- a/src/graphics/glhelper.hpp +++ b/include/eepp/graphics/glhelper.hpp @@ -1,6 +1,6 @@ #ifndef EE_GRAPHICSGLHELPER_HPP #define EE_GRAPHICSGLHELPER_HPP -#include "renderer/cgl.hpp" +#include #endif diff --git a/src/graphics/packerhelper.hpp b/include/eepp/graphics/packerhelper.hpp similarity index 96% rename from src/graphics/packerhelper.hpp rename to include/eepp/graphics/packerhelper.hpp index 195405274..f5f180fcb 100644 --- a/src/graphics/packerhelper.hpp +++ b/include/eepp/graphics/packerhelper.hpp @@ -1,7 +1,7 @@ #ifndef EE_PACKER_HELPER #define EE_PACKER_HELPER -#include "base.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/pixelperfect.hpp b/include/eepp/graphics/pixelperfect.hpp similarity index 97% rename from src/graphics/pixelperfect.hpp rename to include/eepp/graphics/pixelperfect.hpp index 7129d4c4a..e50cd4180 100644 --- a/src/graphics/pixelperfect.hpp +++ b/include/eepp/graphics/pixelperfect.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICS_PIXELPERFECT_H #define EE_GRAPHICS_PIXELPERFECT_H -#include "ctexturefactory.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renderer/base.hpp b/include/eepp/graphics/renderer/base.hpp similarity index 78% rename from src/graphics/renderer/base.hpp rename to include/eepp/graphics/renderer/base.hpp index 0b97b2976..77257644d 100644 --- a/src/graphics/renderer/base.hpp +++ b/include/eepp/graphics/renderer/base.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICS_RENDERER_BASE_HPP #define EE_GRAPHICS_RENDERER_BASE_HPP -#include "../base.hpp" -#include "../renders.hpp" +#include +#include //! It seems that it's not possible to compile GLM on GCC 4.4 ( Haiku GCC version ) #if !defined( EE_GLES1 ) && EE_PLATFORM != EE_PLATFORM_HAIKU diff --git a/src/graphics/renderer/cgl.hpp b/include/eepp/graphics/renderer/cgl.hpp similarity index 98% rename from src/graphics/renderer/cgl.hpp rename to include/eepp/graphics/renderer/cgl.hpp index 2b7ccdd7b..a8e099608 100644 --- a/src/graphics/renderer/cgl.hpp +++ b/include/eepp/graphics/renderer/cgl.hpp @@ -1,8 +1,8 @@ #ifndef EE_GRAPHICS_CGL_HPP #define EE_GRAPHICS_CGL_HPP -#include "base.hpp" -#include "../cshaderprogram.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renderer/crenderergl.hpp b/include/eepp/graphics/renderer/crenderergl.hpp similarity index 98% rename from src/graphics/renderer/crenderergl.hpp rename to include/eepp/graphics/renderer/crenderergl.hpp index 51f143d8a..eadfe2c03 100644 --- a/src/graphics/renderer/crenderergl.hpp +++ b/include/eepp/graphics/renderer/crenderergl.hpp @@ -1,7 +1,7 @@ #ifndef EE_GRAPHICS_CRENDERERGL_HPP #define EE_GRAPHICS_CRENDERERGL_HPP -#include "cgl.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renderer/crenderergl3.hpp b/include/eepp/graphics/renderer/crenderergl3.hpp similarity index 96% rename from src/graphics/renderer/crenderergl3.hpp rename to include/eepp/graphics/renderer/crenderergl3.hpp index b28127410..14e072edd 100644 --- a/src/graphics/renderer/crenderergl3.hpp +++ b/include/eepp/graphics/renderer/crenderergl3.hpp @@ -1,10 +1,11 @@ #ifndef EE_GRAPHICS_CRENDERERGL3_HPP #define EE_GRAPHICS_CRENDERERGL3_HPP -#include "cgl.hpp" +#include #ifdef EE_GL3_ENABLED +// GLM doesn't support forward declaration of the internal types // Xlib Madness #ifdef True #undef True @@ -13,8 +14,7 @@ #ifdef False #undef False #endif - -#include "../../helper/glm/gtx/transform.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renders.hpp b/include/eepp/graphics/renders.hpp similarity index 100% rename from src/graphics/renders.hpp rename to include/eepp/graphics/renders.hpp diff --git a/src/graphics/vbohelper.hpp b/include/eepp/graphics/vbohelper.hpp similarity index 100% rename from src/graphics/vbohelper.hpp rename to include/eepp/graphics/vbohelper.hpp diff --git a/src/helper/PlusCallback/callback.hpp b/include/eepp/helper/PlusCallback/callback.hpp similarity index 100% rename from src/helper/PlusCallback/callback.hpp rename to include/eepp/helper/PlusCallback/callback.hpp diff --git a/src/helper/SOIL/SOIL.h b/include/eepp/helper/SOIL/SOIL.h similarity index 100% rename from src/helper/SOIL/SOIL.h rename to include/eepp/helper/SOIL/SOIL.h diff --git a/src/helper/SOIL/image_DXT.h b/include/eepp/helper/SOIL/image_DXT.h similarity index 100% rename from src/helper/SOIL/image_DXT.h rename to include/eepp/helper/SOIL/image_DXT.h diff --git a/src/helper/SOIL/image_helper.h b/include/eepp/helper/SOIL/image_helper.h similarity index 100% rename from src/helper/SOIL/image_helper.h rename to include/eepp/helper/SOIL/image_helper.h diff --git a/src/helper/SOIL/stb_image.h b/include/eepp/helper/SOIL/stb_image.h similarity index 100% rename from src/helper/SOIL/stb_image.h rename to include/eepp/helper/SOIL/stb_image.h diff --git a/src/helper/SOIL/stb_image_write.h b/include/eepp/helper/SOIL/stb_image_write.h similarity index 100% rename from src/helper/SOIL/stb_image_write.h rename to include/eepp/helper/SOIL/stb_image_write.h diff --git a/src/helper/SOIL/stbi_DDS.h b/include/eepp/helper/SOIL/stbi_DDS.h similarity index 100% rename from src/helper/SOIL/stbi_DDS.h rename to include/eepp/helper/SOIL/stbi_DDS.h diff --git a/src/helper/chipmunk/chipmunk.h b/include/eepp/helper/chipmunk/chipmunk.h similarity index 100% rename from src/helper/chipmunk/chipmunk.h rename to include/eepp/helper/chipmunk/chipmunk.h diff --git a/src/helper/chipmunk/chipmunk_ffi.h b/include/eepp/helper/chipmunk/chipmunk_ffi.h similarity index 100% rename from src/helper/chipmunk/chipmunk_ffi.h rename to include/eepp/helper/chipmunk/chipmunk_ffi.h diff --git a/src/helper/chipmunk/chipmunk_private.h b/include/eepp/helper/chipmunk/chipmunk_private.h similarity index 100% rename from src/helper/chipmunk/chipmunk_private.h rename to include/eepp/helper/chipmunk/chipmunk_private.h diff --git a/src/helper/chipmunk/chipmunk_types.h b/include/eepp/helper/chipmunk/chipmunk_types.h similarity index 100% rename from src/helper/chipmunk/chipmunk_types.h rename to include/eepp/helper/chipmunk/chipmunk_types.h diff --git a/src/helper/chipmunk/chipmunk_unsafe.h b/include/eepp/helper/chipmunk/chipmunk_unsafe.h similarity index 100% rename from src/helper/chipmunk/chipmunk_unsafe.h rename to include/eepp/helper/chipmunk/chipmunk_unsafe.h diff --git a/src/helper/chipmunk/constraints/cpConstraint.h b/include/eepp/helper/chipmunk/constraints/cpConstraint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpConstraint.h rename to include/eepp/helper/chipmunk/constraints/cpConstraint.h diff --git a/src/helper/chipmunk/constraints/cpDampedRotarySpring.h b/include/eepp/helper/chipmunk/constraints/cpDampedRotarySpring.h similarity index 100% rename from src/helper/chipmunk/constraints/cpDampedRotarySpring.h rename to include/eepp/helper/chipmunk/constraints/cpDampedRotarySpring.h diff --git a/src/helper/chipmunk/constraints/cpDampedSpring.h b/include/eepp/helper/chipmunk/constraints/cpDampedSpring.h similarity index 100% rename from src/helper/chipmunk/constraints/cpDampedSpring.h rename to include/eepp/helper/chipmunk/constraints/cpDampedSpring.h diff --git a/src/helper/chipmunk/constraints/cpGearJoint.h b/include/eepp/helper/chipmunk/constraints/cpGearJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpGearJoint.h rename to include/eepp/helper/chipmunk/constraints/cpGearJoint.h diff --git a/src/helper/chipmunk/constraints/cpGrooveJoint.h b/include/eepp/helper/chipmunk/constraints/cpGrooveJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpGrooveJoint.h rename to include/eepp/helper/chipmunk/constraints/cpGrooveJoint.h diff --git a/src/helper/chipmunk/constraints/cpPinJoint.h b/include/eepp/helper/chipmunk/constraints/cpPinJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpPinJoint.h rename to include/eepp/helper/chipmunk/constraints/cpPinJoint.h diff --git a/src/helper/chipmunk/constraints/cpPivotJoint.h b/include/eepp/helper/chipmunk/constraints/cpPivotJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpPivotJoint.h rename to include/eepp/helper/chipmunk/constraints/cpPivotJoint.h diff --git a/src/helper/chipmunk/constraints/cpRatchetJoint.h b/include/eepp/helper/chipmunk/constraints/cpRatchetJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpRatchetJoint.h rename to include/eepp/helper/chipmunk/constraints/cpRatchetJoint.h diff --git a/src/helper/chipmunk/constraints/cpRotaryLimitJoint.h b/include/eepp/helper/chipmunk/constraints/cpRotaryLimitJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpRotaryLimitJoint.h rename to include/eepp/helper/chipmunk/constraints/cpRotaryLimitJoint.h diff --git a/src/helper/chipmunk/constraints/cpSimpleMotor.h b/include/eepp/helper/chipmunk/constraints/cpSimpleMotor.h similarity index 100% rename from src/helper/chipmunk/constraints/cpSimpleMotor.h rename to include/eepp/helper/chipmunk/constraints/cpSimpleMotor.h diff --git a/src/helper/chipmunk/constraints/cpSlideJoint.h b/include/eepp/helper/chipmunk/constraints/cpSlideJoint.h similarity index 100% rename from src/helper/chipmunk/constraints/cpSlideJoint.h rename to include/eepp/helper/chipmunk/constraints/cpSlideJoint.h diff --git a/src/helper/chipmunk/constraints/util.h b/include/eepp/helper/chipmunk/constraints/util.h similarity index 100% rename from src/helper/chipmunk/constraints/util.h rename to include/eepp/helper/chipmunk/constraints/util.h diff --git a/src/helper/chipmunk/cpArbiter.h b/include/eepp/helper/chipmunk/cpArbiter.h similarity index 100% rename from src/helper/chipmunk/cpArbiter.h rename to include/eepp/helper/chipmunk/cpArbiter.h diff --git a/src/helper/chipmunk/cpBB.h b/include/eepp/helper/chipmunk/cpBB.h similarity index 100% rename from src/helper/chipmunk/cpBB.h rename to include/eepp/helper/chipmunk/cpBB.h diff --git a/src/helper/chipmunk/cpBody.h b/include/eepp/helper/chipmunk/cpBody.h similarity index 100% rename from src/helper/chipmunk/cpBody.h rename to include/eepp/helper/chipmunk/cpBody.h diff --git a/src/helper/chipmunk/cpPolyShape.h b/include/eepp/helper/chipmunk/cpPolyShape.h similarity index 100% rename from src/helper/chipmunk/cpPolyShape.h rename to include/eepp/helper/chipmunk/cpPolyShape.h diff --git a/src/helper/chipmunk/cpShape.h b/include/eepp/helper/chipmunk/cpShape.h similarity index 100% rename from src/helper/chipmunk/cpShape.h rename to include/eepp/helper/chipmunk/cpShape.h diff --git a/src/helper/chipmunk/cpSpace.h b/include/eepp/helper/chipmunk/cpSpace.h similarity index 100% rename from src/helper/chipmunk/cpSpace.h rename to include/eepp/helper/chipmunk/cpSpace.h diff --git a/src/helper/chipmunk/cpSpatialIndex.h b/include/eepp/helper/chipmunk/cpSpatialIndex.h similarity index 100% rename from src/helper/chipmunk/cpSpatialIndex.h rename to include/eepp/helper/chipmunk/cpSpatialIndex.h diff --git a/src/helper/chipmunk/cpVect.h b/include/eepp/helper/chipmunk/cpVect.h similarity index 100% rename from src/helper/chipmunk/cpVect.h rename to include/eepp/helper/chipmunk/cpVect.h diff --git a/src/helper/chipmunk/prime.h b/include/eepp/helper/chipmunk/prime.h similarity index 100% rename from src/helper/chipmunk/prime.h rename to include/eepp/helper/chipmunk/prime.h diff --git a/src/helper/glew/glew.h b/include/eepp/helper/glew/glew.h similarity index 100% rename from src/helper/glew/glew.h rename to include/eepp/helper/glew/glew.h diff --git a/src/helper/glew/glxew.h b/include/eepp/helper/glew/glxew.h similarity index 100% rename from src/helper/glew/glxew.h rename to include/eepp/helper/glew/glxew.h diff --git a/src/helper/glew/wglew.h b/include/eepp/helper/glew/wglew.h similarity index 100% rename from src/helper/glew/wglew.h rename to include/eepp/helper/glew/wglew.h diff --git a/src/helper/glm/core/_detail.hpp b/include/eepp/helper/glm/core/_detail.hpp similarity index 100% rename from src/helper/glm/core/_detail.hpp rename to include/eepp/helper/glm/core/_detail.hpp diff --git a/src/helper/glm/core/_fixes.hpp b/include/eepp/helper/glm/core/_fixes.hpp similarity index 100% rename from src/helper/glm/core/_fixes.hpp rename to include/eepp/helper/glm/core/_fixes.hpp diff --git a/src/helper/glm/core/_swizzle.hpp b/include/eepp/helper/glm/core/_swizzle.hpp similarity index 100% rename from src/helper/glm/core/_swizzle.hpp rename to include/eepp/helper/glm/core/_swizzle.hpp diff --git a/src/helper/glm/core/_swizzle.inl b/include/eepp/helper/glm/core/_swizzle.inl similarity index 100% rename from src/helper/glm/core/_swizzle.inl rename to include/eepp/helper/glm/core/_swizzle.inl diff --git a/src/helper/glm/core/dummy.cpp b/include/eepp/helper/glm/core/dummy.cpp similarity index 100% rename from src/helper/glm/core/dummy.cpp rename to include/eepp/helper/glm/core/dummy.cpp diff --git a/src/helper/glm/core/func_common.hpp b/include/eepp/helper/glm/core/func_common.hpp similarity index 100% rename from src/helper/glm/core/func_common.hpp rename to include/eepp/helper/glm/core/func_common.hpp diff --git a/src/helper/glm/core/func_common.inl b/include/eepp/helper/glm/core/func_common.inl similarity index 100% rename from src/helper/glm/core/func_common.inl rename to include/eepp/helper/glm/core/func_common.inl diff --git a/src/helper/glm/core/func_exponential.hpp b/include/eepp/helper/glm/core/func_exponential.hpp similarity index 100% rename from src/helper/glm/core/func_exponential.hpp rename to include/eepp/helper/glm/core/func_exponential.hpp diff --git a/src/helper/glm/core/func_exponential.inl b/include/eepp/helper/glm/core/func_exponential.inl similarity index 100% rename from src/helper/glm/core/func_exponential.inl rename to include/eepp/helper/glm/core/func_exponential.inl diff --git a/src/helper/glm/core/func_geometric.hpp b/include/eepp/helper/glm/core/func_geometric.hpp similarity index 100% rename from src/helper/glm/core/func_geometric.hpp rename to include/eepp/helper/glm/core/func_geometric.hpp diff --git a/src/helper/glm/core/func_geometric.inl b/include/eepp/helper/glm/core/func_geometric.inl similarity index 100% rename from src/helper/glm/core/func_geometric.inl rename to include/eepp/helper/glm/core/func_geometric.inl diff --git a/src/helper/glm/core/func_integer.hpp b/include/eepp/helper/glm/core/func_integer.hpp similarity index 100% rename from src/helper/glm/core/func_integer.hpp rename to include/eepp/helper/glm/core/func_integer.hpp diff --git a/src/helper/glm/core/func_integer.inl b/include/eepp/helper/glm/core/func_integer.inl similarity index 100% rename from src/helper/glm/core/func_integer.inl rename to include/eepp/helper/glm/core/func_integer.inl diff --git a/src/helper/glm/core/func_matrix.hpp b/include/eepp/helper/glm/core/func_matrix.hpp similarity index 100% rename from src/helper/glm/core/func_matrix.hpp rename to include/eepp/helper/glm/core/func_matrix.hpp diff --git a/src/helper/glm/core/func_matrix.inl b/include/eepp/helper/glm/core/func_matrix.inl similarity index 100% rename from src/helper/glm/core/func_matrix.inl rename to include/eepp/helper/glm/core/func_matrix.inl diff --git a/src/helper/glm/core/func_noise.hpp b/include/eepp/helper/glm/core/func_noise.hpp similarity index 100% rename from src/helper/glm/core/func_noise.hpp rename to include/eepp/helper/glm/core/func_noise.hpp diff --git a/src/helper/glm/core/func_noise.inl b/include/eepp/helper/glm/core/func_noise.inl similarity index 100% rename from src/helper/glm/core/func_noise.inl rename to include/eepp/helper/glm/core/func_noise.inl diff --git a/src/helper/glm/core/func_packing.hpp b/include/eepp/helper/glm/core/func_packing.hpp similarity index 100% rename from src/helper/glm/core/func_packing.hpp rename to include/eepp/helper/glm/core/func_packing.hpp diff --git a/src/helper/glm/core/func_packing.inl b/include/eepp/helper/glm/core/func_packing.inl similarity index 100% rename from src/helper/glm/core/func_packing.inl rename to include/eepp/helper/glm/core/func_packing.inl diff --git a/src/helper/glm/core/func_trigonometric.hpp b/include/eepp/helper/glm/core/func_trigonometric.hpp similarity index 100% rename from src/helper/glm/core/func_trigonometric.hpp rename to include/eepp/helper/glm/core/func_trigonometric.hpp diff --git a/src/helper/glm/core/func_trigonometric.inl b/include/eepp/helper/glm/core/func_trigonometric.inl similarity index 100% rename from src/helper/glm/core/func_trigonometric.inl rename to include/eepp/helper/glm/core/func_trigonometric.inl diff --git a/src/helper/glm/core/func_vector_relational.hpp b/include/eepp/helper/glm/core/func_vector_relational.hpp similarity index 100% rename from src/helper/glm/core/func_vector_relational.hpp rename to include/eepp/helper/glm/core/func_vector_relational.hpp diff --git a/src/helper/glm/core/func_vector_relational.inl b/include/eepp/helper/glm/core/func_vector_relational.inl similarity index 100% rename from src/helper/glm/core/func_vector_relational.inl rename to include/eepp/helper/glm/core/func_vector_relational.inl diff --git a/src/helper/glm/core/hint.hpp b/include/eepp/helper/glm/core/hint.hpp similarity index 100% rename from src/helper/glm/core/hint.hpp rename to include/eepp/helper/glm/core/hint.hpp diff --git a/src/helper/glm/core/intrinsic_common.hpp b/include/eepp/helper/glm/core/intrinsic_common.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_common.hpp rename to include/eepp/helper/glm/core/intrinsic_common.hpp diff --git a/src/helper/glm/core/intrinsic_common.inl b/include/eepp/helper/glm/core/intrinsic_common.inl similarity index 100% rename from src/helper/glm/core/intrinsic_common.inl rename to include/eepp/helper/glm/core/intrinsic_common.inl diff --git a/src/helper/glm/core/intrinsic_exponential.hpp b/include/eepp/helper/glm/core/intrinsic_exponential.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_exponential.hpp rename to include/eepp/helper/glm/core/intrinsic_exponential.hpp diff --git a/src/helper/glm/core/intrinsic_exponential.inl b/include/eepp/helper/glm/core/intrinsic_exponential.inl similarity index 100% rename from src/helper/glm/core/intrinsic_exponential.inl rename to include/eepp/helper/glm/core/intrinsic_exponential.inl diff --git a/src/helper/glm/core/intrinsic_geometric.hpp b/include/eepp/helper/glm/core/intrinsic_geometric.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_geometric.hpp rename to include/eepp/helper/glm/core/intrinsic_geometric.hpp diff --git a/src/helper/glm/core/intrinsic_geometric.inl b/include/eepp/helper/glm/core/intrinsic_geometric.inl similarity index 100% rename from src/helper/glm/core/intrinsic_geometric.inl rename to include/eepp/helper/glm/core/intrinsic_geometric.inl diff --git a/src/helper/glm/core/intrinsic_matrix.hpp b/include/eepp/helper/glm/core/intrinsic_matrix.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_matrix.hpp rename to include/eepp/helper/glm/core/intrinsic_matrix.hpp diff --git a/src/helper/glm/core/intrinsic_matrix.inl b/include/eepp/helper/glm/core/intrinsic_matrix.inl similarity index 100% rename from src/helper/glm/core/intrinsic_matrix.inl rename to include/eepp/helper/glm/core/intrinsic_matrix.inl diff --git a/src/helper/glm/core/intrinsic_trigonometric.hpp b/include/eepp/helper/glm/core/intrinsic_trigonometric.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_trigonometric.hpp rename to include/eepp/helper/glm/core/intrinsic_trigonometric.hpp diff --git a/src/helper/glm/core/intrinsic_trigonometric.inl b/include/eepp/helper/glm/core/intrinsic_trigonometric.inl similarity index 100% rename from src/helper/glm/core/intrinsic_trigonometric.inl rename to include/eepp/helper/glm/core/intrinsic_trigonometric.inl diff --git a/src/helper/glm/core/intrinsic_vector_relational.hpp b/include/eepp/helper/glm/core/intrinsic_vector_relational.hpp similarity index 100% rename from src/helper/glm/core/intrinsic_vector_relational.hpp rename to include/eepp/helper/glm/core/intrinsic_vector_relational.hpp diff --git a/src/helper/glm/core/intrinsic_vector_relational.inl b/include/eepp/helper/glm/core/intrinsic_vector_relational.inl similarity index 100% rename from src/helper/glm/core/intrinsic_vector_relational.inl rename to include/eepp/helper/glm/core/intrinsic_vector_relational.inl diff --git a/src/helper/glm/core/setup.hpp b/include/eepp/helper/glm/core/setup.hpp similarity index 100% rename from src/helper/glm/core/setup.hpp rename to include/eepp/helper/glm/core/setup.hpp diff --git a/src/helper/glm/core/type.hpp b/include/eepp/helper/glm/core/type.hpp similarity index 100% rename from src/helper/glm/core/type.hpp rename to include/eepp/helper/glm/core/type.hpp diff --git a/src/helper/glm/core/type_float.hpp b/include/eepp/helper/glm/core/type_float.hpp similarity index 100% rename from src/helper/glm/core/type_float.hpp rename to include/eepp/helper/glm/core/type_float.hpp diff --git a/src/helper/glm/core/type_gentype.hpp b/include/eepp/helper/glm/core/type_gentype.hpp similarity index 100% rename from src/helper/glm/core/type_gentype.hpp rename to include/eepp/helper/glm/core/type_gentype.hpp diff --git a/src/helper/glm/core/type_gentype.inl b/include/eepp/helper/glm/core/type_gentype.inl similarity index 100% rename from src/helper/glm/core/type_gentype.inl rename to include/eepp/helper/glm/core/type_gentype.inl diff --git a/src/helper/glm/core/type_half.hpp b/include/eepp/helper/glm/core/type_half.hpp similarity index 100% rename from src/helper/glm/core/type_half.hpp rename to include/eepp/helper/glm/core/type_half.hpp diff --git a/src/helper/glm/core/type_half.inl b/include/eepp/helper/glm/core/type_half.inl similarity index 100% rename from src/helper/glm/core/type_half.inl rename to include/eepp/helper/glm/core/type_half.inl diff --git a/src/helper/glm/core/type_int.hpp b/include/eepp/helper/glm/core/type_int.hpp similarity index 100% rename from src/helper/glm/core/type_int.hpp rename to include/eepp/helper/glm/core/type_int.hpp diff --git a/src/helper/glm/core/type_mat.hpp b/include/eepp/helper/glm/core/type_mat.hpp similarity index 100% rename from src/helper/glm/core/type_mat.hpp rename to include/eepp/helper/glm/core/type_mat.hpp diff --git a/src/helper/glm/core/type_mat.inl b/include/eepp/helper/glm/core/type_mat.inl similarity index 100% rename from src/helper/glm/core/type_mat.inl rename to include/eepp/helper/glm/core/type_mat.inl diff --git a/src/helper/glm/core/type_mat2x2.hpp b/include/eepp/helper/glm/core/type_mat2x2.hpp similarity index 100% rename from src/helper/glm/core/type_mat2x2.hpp rename to include/eepp/helper/glm/core/type_mat2x2.hpp diff --git a/src/helper/glm/core/type_mat2x2.inl b/include/eepp/helper/glm/core/type_mat2x2.inl similarity index 100% rename from src/helper/glm/core/type_mat2x2.inl rename to include/eepp/helper/glm/core/type_mat2x2.inl diff --git a/src/helper/glm/core/type_mat2x3.hpp b/include/eepp/helper/glm/core/type_mat2x3.hpp similarity index 100% rename from src/helper/glm/core/type_mat2x3.hpp rename to include/eepp/helper/glm/core/type_mat2x3.hpp diff --git a/src/helper/glm/core/type_mat2x3.inl b/include/eepp/helper/glm/core/type_mat2x3.inl similarity index 100% rename from src/helper/glm/core/type_mat2x3.inl rename to include/eepp/helper/glm/core/type_mat2x3.inl diff --git a/src/helper/glm/core/type_mat2x4.hpp b/include/eepp/helper/glm/core/type_mat2x4.hpp similarity index 100% rename from src/helper/glm/core/type_mat2x4.hpp rename to include/eepp/helper/glm/core/type_mat2x4.hpp diff --git a/src/helper/glm/core/type_mat2x4.inl b/include/eepp/helper/glm/core/type_mat2x4.inl similarity index 100% rename from src/helper/glm/core/type_mat2x4.inl rename to include/eepp/helper/glm/core/type_mat2x4.inl diff --git a/src/helper/glm/core/type_mat3x2.hpp b/include/eepp/helper/glm/core/type_mat3x2.hpp similarity index 100% rename from src/helper/glm/core/type_mat3x2.hpp rename to include/eepp/helper/glm/core/type_mat3x2.hpp diff --git a/src/helper/glm/core/type_mat3x2.inl b/include/eepp/helper/glm/core/type_mat3x2.inl similarity index 100% rename from src/helper/glm/core/type_mat3x2.inl rename to include/eepp/helper/glm/core/type_mat3x2.inl diff --git a/src/helper/glm/core/type_mat3x3.hpp b/include/eepp/helper/glm/core/type_mat3x3.hpp similarity index 100% rename from src/helper/glm/core/type_mat3x3.hpp rename to include/eepp/helper/glm/core/type_mat3x3.hpp diff --git a/src/helper/glm/core/type_mat3x3.inl b/include/eepp/helper/glm/core/type_mat3x3.inl similarity index 100% rename from src/helper/glm/core/type_mat3x3.inl rename to include/eepp/helper/glm/core/type_mat3x3.inl diff --git a/src/helper/glm/core/type_mat3x4.hpp b/include/eepp/helper/glm/core/type_mat3x4.hpp similarity index 100% rename from src/helper/glm/core/type_mat3x4.hpp rename to include/eepp/helper/glm/core/type_mat3x4.hpp diff --git a/src/helper/glm/core/type_mat3x4.inl b/include/eepp/helper/glm/core/type_mat3x4.inl similarity index 100% rename from src/helper/glm/core/type_mat3x4.inl rename to include/eepp/helper/glm/core/type_mat3x4.inl diff --git a/src/helper/glm/core/type_mat4x2.hpp b/include/eepp/helper/glm/core/type_mat4x2.hpp similarity index 100% rename from src/helper/glm/core/type_mat4x2.hpp rename to include/eepp/helper/glm/core/type_mat4x2.hpp diff --git a/src/helper/glm/core/type_mat4x2.inl b/include/eepp/helper/glm/core/type_mat4x2.inl similarity index 100% rename from src/helper/glm/core/type_mat4x2.inl rename to include/eepp/helper/glm/core/type_mat4x2.inl diff --git a/src/helper/glm/core/type_mat4x3.hpp b/include/eepp/helper/glm/core/type_mat4x3.hpp similarity index 100% rename from src/helper/glm/core/type_mat4x3.hpp rename to include/eepp/helper/glm/core/type_mat4x3.hpp diff --git a/src/helper/glm/core/type_mat4x3.inl b/include/eepp/helper/glm/core/type_mat4x3.inl similarity index 100% rename from src/helper/glm/core/type_mat4x3.inl rename to include/eepp/helper/glm/core/type_mat4x3.inl diff --git a/src/helper/glm/core/type_mat4x4.hpp b/include/eepp/helper/glm/core/type_mat4x4.hpp similarity index 100% rename from src/helper/glm/core/type_mat4x4.hpp rename to include/eepp/helper/glm/core/type_mat4x4.hpp diff --git a/src/helper/glm/core/type_mat4x4.inl b/include/eepp/helper/glm/core/type_mat4x4.inl similarity index 100% rename from src/helper/glm/core/type_mat4x4.inl rename to include/eepp/helper/glm/core/type_mat4x4.inl diff --git a/src/helper/glm/core/type_size.hpp b/include/eepp/helper/glm/core/type_size.hpp similarity index 100% rename from src/helper/glm/core/type_size.hpp rename to include/eepp/helper/glm/core/type_size.hpp diff --git a/src/helper/glm/core/type_vec.hpp b/include/eepp/helper/glm/core/type_vec.hpp similarity index 100% rename from src/helper/glm/core/type_vec.hpp rename to include/eepp/helper/glm/core/type_vec.hpp diff --git a/src/helper/glm/core/type_vec.inl b/include/eepp/helper/glm/core/type_vec.inl similarity index 100% rename from src/helper/glm/core/type_vec.inl rename to include/eepp/helper/glm/core/type_vec.inl diff --git a/src/helper/glm/core/type_vec1.hpp b/include/eepp/helper/glm/core/type_vec1.hpp similarity index 100% rename from src/helper/glm/core/type_vec1.hpp rename to include/eepp/helper/glm/core/type_vec1.hpp diff --git a/src/helper/glm/core/type_vec1.inl b/include/eepp/helper/glm/core/type_vec1.inl similarity index 100% rename from src/helper/glm/core/type_vec1.inl rename to include/eepp/helper/glm/core/type_vec1.inl diff --git a/src/helper/glm/core/type_vec2.hpp b/include/eepp/helper/glm/core/type_vec2.hpp similarity index 100% rename from src/helper/glm/core/type_vec2.hpp rename to include/eepp/helper/glm/core/type_vec2.hpp diff --git a/src/helper/glm/core/type_vec2.inl b/include/eepp/helper/glm/core/type_vec2.inl similarity index 100% rename from src/helper/glm/core/type_vec2.inl rename to include/eepp/helper/glm/core/type_vec2.inl diff --git a/src/helper/glm/core/type_vec3.hpp b/include/eepp/helper/glm/core/type_vec3.hpp similarity index 100% rename from src/helper/glm/core/type_vec3.hpp rename to include/eepp/helper/glm/core/type_vec3.hpp diff --git a/src/helper/glm/core/type_vec3.inl b/include/eepp/helper/glm/core/type_vec3.inl similarity index 100% rename from src/helper/glm/core/type_vec3.inl rename to include/eepp/helper/glm/core/type_vec3.inl diff --git a/src/helper/glm/core/type_vec4.hpp b/include/eepp/helper/glm/core/type_vec4.hpp similarity index 100% rename from src/helper/glm/core/type_vec4.hpp rename to include/eepp/helper/glm/core/type_vec4.hpp diff --git a/src/helper/glm/core/type_vec4.inl b/include/eepp/helper/glm/core/type_vec4.inl similarity index 100% rename from src/helper/glm/core/type_vec4.inl rename to include/eepp/helper/glm/core/type_vec4.inl diff --git a/src/helper/glm/ext.hpp b/include/eepp/helper/glm/ext.hpp similarity index 100% rename from src/helper/glm/ext.hpp rename to include/eepp/helper/glm/ext.hpp diff --git a/src/helper/glm/glm.hpp b/include/eepp/helper/glm/glm.hpp similarity index 100% rename from src/helper/glm/glm.hpp rename to include/eepp/helper/glm/glm.hpp diff --git a/src/helper/glm/gtc/half_float.hpp b/include/eepp/helper/glm/gtc/half_float.hpp similarity index 100% rename from src/helper/glm/gtc/half_float.hpp rename to include/eepp/helper/glm/gtc/half_float.hpp diff --git a/src/helper/glm/gtc/half_float.inl b/include/eepp/helper/glm/gtc/half_float.inl similarity index 100% rename from src/helper/glm/gtc/half_float.inl rename to include/eepp/helper/glm/gtc/half_float.inl diff --git a/src/helper/glm/gtc/matrix_access.hpp b/include/eepp/helper/glm/gtc/matrix_access.hpp similarity index 100% rename from src/helper/glm/gtc/matrix_access.hpp rename to include/eepp/helper/glm/gtc/matrix_access.hpp diff --git a/src/helper/glm/gtc/matrix_access.inl b/include/eepp/helper/glm/gtc/matrix_access.inl similarity index 100% rename from src/helper/glm/gtc/matrix_access.inl rename to include/eepp/helper/glm/gtc/matrix_access.inl diff --git a/src/helper/glm/gtc/matrix_integer.hpp b/include/eepp/helper/glm/gtc/matrix_integer.hpp similarity index 100% rename from src/helper/glm/gtc/matrix_integer.hpp rename to include/eepp/helper/glm/gtc/matrix_integer.hpp diff --git a/src/helper/glm/gtc/matrix_inverse.hpp b/include/eepp/helper/glm/gtc/matrix_inverse.hpp similarity index 100% rename from src/helper/glm/gtc/matrix_inverse.hpp rename to include/eepp/helper/glm/gtc/matrix_inverse.hpp diff --git a/src/helper/glm/gtc/matrix_inverse.inl b/include/eepp/helper/glm/gtc/matrix_inverse.inl similarity index 100% rename from src/helper/glm/gtc/matrix_inverse.inl rename to include/eepp/helper/glm/gtc/matrix_inverse.inl diff --git a/src/helper/glm/gtc/matrix_transform.hpp b/include/eepp/helper/glm/gtc/matrix_transform.hpp similarity index 100% rename from src/helper/glm/gtc/matrix_transform.hpp rename to include/eepp/helper/glm/gtc/matrix_transform.hpp diff --git a/src/helper/glm/gtc/matrix_transform.inl b/include/eepp/helper/glm/gtc/matrix_transform.inl similarity index 100% rename from src/helper/glm/gtc/matrix_transform.inl rename to include/eepp/helper/glm/gtc/matrix_transform.inl diff --git a/src/helper/glm/gtc/quaternion.hpp b/include/eepp/helper/glm/gtc/quaternion.hpp similarity index 100% rename from src/helper/glm/gtc/quaternion.hpp rename to include/eepp/helper/glm/gtc/quaternion.hpp diff --git a/src/helper/glm/gtc/quaternion.inl b/include/eepp/helper/glm/gtc/quaternion.inl similarity index 100% rename from src/helper/glm/gtc/quaternion.inl rename to include/eepp/helper/glm/gtc/quaternion.inl diff --git a/src/helper/glm/gtc/swizzle.hpp b/include/eepp/helper/glm/gtc/swizzle.hpp similarity index 100% rename from src/helper/glm/gtc/swizzle.hpp rename to include/eepp/helper/glm/gtc/swizzle.hpp diff --git a/src/helper/glm/gtc/swizzle.inl b/include/eepp/helper/glm/gtc/swizzle.inl similarity index 100% rename from src/helper/glm/gtc/swizzle.inl rename to include/eepp/helper/glm/gtc/swizzle.inl diff --git a/src/helper/glm/gtc/type_precision.hpp b/include/eepp/helper/glm/gtc/type_precision.hpp similarity index 100% rename from src/helper/glm/gtc/type_precision.hpp rename to include/eepp/helper/glm/gtc/type_precision.hpp diff --git a/src/helper/glm/gtc/type_precision.inl b/include/eepp/helper/glm/gtc/type_precision.inl similarity index 100% rename from src/helper/glm/gtc/type_precision.inl rename to include/eepp/helper/glm/gtc/type_precision.inl diff --git a/src/helper/glm/gtc/type_ptr.hpp b/include/eepp/helper/glm/gtc/type_ptr.hpp similarity index 100% rename from src/helper/glm/gtc/type_ptr.hpp rename to include/eepp/helper/glm/gtc/type_ptr.hpp diff --git a/src/helper/glm/gtc/type_ptr.inl b/include/eepp/helper/glm/gtc/type_ptr.inl similarity index 100% rename from src/helper/glm/gtc/type_ptr.inl rename to include/eepp/helper/glm/gtc/type_ptr.inl diff --git a/src/helper/glm/gtx/associated_min_max.hpp b/include/eepp/helper/glm/gtx/associated_min_max.hpp similarity index 100% rename from src/helper/glm/gtx/associated_min_max.hpp rename to include/eepp/helper/glm/gtx/associated_min_max.hpp diff --git a/src/helper/glm/gtx/associated_min_max.inl b/include/eepp/helper/glm/gtx/associated_min_max.inl similarity index 100% rename from src/helper/glm/gtx/associated_min_max.inl rename to include/eepp/helper/glm/gtx/associated_min_max.inl diff --git a/src/helper/glm/gtx/bit.hpp b/include/eepp/helper/glm/gtx/bit.hpp similarity index 100% rename from src/helper/glm/gtx/bit.hpp rename to include/eepp/helper/glm/gtx/bit.hpp diff --git a/src/helper/glm/gtx/bit.inl b/include/eepp/helper/glm/gtx/bit.inl similarity index 100% rename from src/helper/glm/gtx/bit.inl rename to include/eepp/helper/glm/gtx/bit.inl diff --git a/src/helper/glm/gtx/closest_point.hpp b/include/eepp/helper/glm/gtx/closest_point.hpp similarity index 100% rename from src/helper/glm/gtx/closest_point.hpp rename to include/eepp/helper/glm/gtx/closest_point.hpp diff --git a/src/helper/glm/gtx/closest_point.inl b/include/eepp/helper/glm/gtx/closest_point.inl similarity index 100% rename from src/helper/glm/gtx/closest_point.inl rename to include/eepp/helper/glm/gtx/closest_point.inl diff --git a/src/helper/glm/gtx/color_cast.hpp b/include/eepp/helper/glm/gtx/color_cast.hpp similarity index 100% rename from src/helper/glm/gtx/color_cast.hpp rename to include/eepp/helper/glm/gtx/color_cast.hpp diff --git a/src/helper/glm/gtx/color_cast.inl b/include/eepp/helper/glm/gtx/color_cast.inl similarity index 100% rename from src/helper/glm/gtx/color_cast.inl rename to include/eepp/helper/glm/gtx/color_cast.inl diff --git a/src/helper/glm/gtx/color_space.hpp b/include/eepp/helper/glm/gtx/color_space.hpp similarity index 100% rename from src/helper/glm/gtx/color_space.hpp rename to include/eepp/helper/glm/gtx/color_space.hpp diff --git a/src/helper/glm/gtx/color_space.inl b/include/eepp/helper/glm/gtx/color_space.inl similarity index 100% rename from src/helper/glm/gtx/color_space.inl rename to include/eepp/helper/glm/gtx/color_space.inl diff --git a/src/helper/glm/gtx/color_space_YCoCg.hpp b/include/eepp/helper/glm/gtx/color_space_YCoCg.hpp similarity index 100% rename from src/helper/glm/gtx/color_space_YCoCg.hpp rename to include/eepp/helper/glm/gtx/color_space_YCoCg.hpp diff --git a/src/helper/glm/gtx/color_space_YCoCg.inl b/include/eepp/helper/glm/gtx/color_space_YCoCg.inl similarity index 100% rename from src/helper/glm/gtx/color_space_YCoCg.inl rename to include/eepp/helper/glm/gtx/color_space_YCoCg.inl diff --git a/src/helper/glm/gtx/compatibility.hpp b/include/eepp/helper/glm/gtx/compatibility.hpp similarity index 100% rename from src/helper/glm/gtx/compatibility.hpp rename to include/eepp/helper/glm/gtx/compatibility.hpp diff --git a/src/helper/glm/gtx/compatibility.inl b/include/eepp/helper/glm/gtx/compatibility.inl similarity index 100% rename from src/helper/glm/gtx/compatibility.inl rename to include/eepp/helper/glm/gtx/compatibility.inl diff --git a/src/helper/glm/gtx/component_wise.hpp b/include/eepp/helper/glm/gtx/component_wise.hpp similarity index 100% rename from src/helper/glm/gtx/component_wise.hpp rename to include/eepp/helper/glm/gtx/component_wise.hpp diff --git a/src/helper/glm/gtx/component_wise.inl b/include/eepp/helper/glm/gtx/component_wise.inl similarity index 100% rename from src/helper/glm/gtx/component_wise.inl rename to include/eepp/helper/glm/gtx/component_wise.inl diff --git a/src/helper/glm/gtx/epsilon.hpp b/include/eepp/helper/glm/gtx/epsilon.hpp similarity index 100% rename from src/helper/glm/gtx/epsilon.hpp rename to include/eepp/helper/glm/gtx/epsilon.hpp diff --git a/src/helper/glm/gtx/epsilon.inl b/include/eepp/helper/glm/gtx/epsilon.inl similarity index 100% rename from src/helper/glm/gtx/epsilon.inl rename to include/eepp/helper/glm/gtx/epsilon.inl diff --git a/src/helper/glm/gtx/euler_angles.hpp b/include/eepp/helper/glm/gtx/euler_angles.hpp similarity index 100% rename from src/helper/glm/gtx/euler_angles.hpp rename to include/eepp/helper/glm/gtx/euler_angles.hpp diff --git a/src/helper/glm/gtx/euler_angles.inl b/include/eepp/helper/glm/gtx/euler_angles.inl similarity index 100% rename from src/helper/glm/gtx/euler_angles.inl rename to include/eepp/helper/glm/gtx/euler_angles.inl diff --git a/src/helper/glm/gtx/extend.hpp b/include/eepp/helper/glm/gtx/extend.hpp similarity index 100% rename from src/helper/glm/gtx/extend.hpp rename to include/eepp/helper/glm/gtx/extend.hpp diff --git a/src/helper/glm/gtx/extend.inl b/include/eepp/helper/glm/gtx/extend.inl similarity index 100% rename from src/helper/glm/gtx/extend.inl rename to include/eepp/helper/glm/gtx/extend.inl diff --git a/src/helper/glm/gtx/extented_min_max.hpp b/include/eepp/helper/glm/gtx/extented_min_max.hpp similarity index 100% rename from src/helper/glm/gtx/extented_min_max.hpp rename to include/eepp/helper/glm/gtx/extented_min_max.hpp diff --git a/src/helper/glm/gtx/extented_min_max.inl b/include/eepp/helper/glm/gtx/extented_min_max.inl similarity index 100% rename from src/helper/glm/gtx/extented_min_max.inl rename to include/eepp/helper/glm/gtx/extented_min_max.inl diff --git a/src/helper/glm/gtx/fast_exponential.hpp b/include/eepp/helper/glm/gtx/fast_exponential.hpp similarity index 100% rename from src/helper/glm/gtx/fast_exponential.hpp rename to include/eepp/helper/glm/gtx/fast_exponential.hpp diff --git a/src/helper/glm/gtx/fast_exponential.inl b/include/eepp/helper/glm/gtx/fast_exponential.inl similarity index 100% rename from src/helper/glm/gtx/fast_exponential.inl rename to include/eepp/helper/glm/gtx/fast_exponential.inl diff --git a/src/helper/glm/gtx/fast_square_root.hpp b/include/eepp/helper/glm/gtx/fast_square_root.hpp similarity index 100% rename from src/helper/glm/gtx/fast_square_root.hpp rename to include/eepp/helper/glm/gtx/fast_square_root.hpp diff --git a/src/helper/glm/gtx/fast_square_root.inl b/include/eepp/helper/glm/gtx/fast_square_root.inl similarity index 100% rename from src/helper/glm/gtx/fast_square_root.inl rename to include/eepp/helper/glm/gtx/fast_square_root.inl diff --git a/src/helper/glm/gtx/fast_trigonometry.hpp b/include/eepp/helper/glm/gtx/fast_trigonometry.hpp similarity index 100% rename from src/helper/glm/gtx/fast_trigonometry.hpp rename to include/eepp/helper/glm/gtx/fast_trigonometry.hpp diff --git a/src/helper/glm/gtx/fast_trigonometry.inl b/include/eepp/helper/glm/gtx/fast_trigonometry.inl similarity index 100% rename from src/helper/glm/gtx/fast_trigonometry.inl rename to include/eepp/helper/glm/gtx/fast_trigonometry.inl diff --git a/src/helper/glm/gtx/gradient_paint.hpp b/include/eepp/helper/glm/gtx/gradient_paint.hpp similarity index 100% rename from src/helper/glm/gtx/gradient_paint.hpp rename to include/eepp/helper/glm/gtx/gradient_paint.hpp diff --git a/src/helper/glm/gtx/gradient_paint.inl b/include/eepp/helper/glm/gtx/gradient_paint.inl similarity index 100% rename from src/helper/glm/gtx/gradient_paint.inl rename to include/eepp/helper/glm/gtx/gradient_paint.inl diff --git a/src/helper/glm/gtx/handed_coordinate_space.hpp b/include/eepp/helper/glm/gtx/handed_coordinate_space.hpp similarity index 100% rename from src/helper/glm/gtx/handed_coordinate_space.hpp rename to include/eepp/helper/glm/gtx/handed_coordinate_space.hpp diff --git a/src/helper/glm/gtx/handed_coordinate_space.inl b/include/eepp/helper/glm/gtx/handed_coordinate_space.inl similarity index 100% rename from src/helper/glm/gtx/handed_coordinate_space.inl rename to include/eepp/helper/glm/gtx/handed_coordinate_space.inl diff --git a/src/helper/glm/gtx/inertia.hpp b/include/eepp/helper/glm/gtx/inertia.hpp similarity index 100% rename from src/helper/glm/gtx/inertia.hpp rename to include/eepp/helper/glm/gtx/inertia.hpp diff --git a/src/helper/glm/gtx/inertia.inl b/include/eepp/helper/glm/gtx/inertia.inl similarity index 100% rename from src/helper/glm/gtx/inertia.inl rename to include/eepp/helper/glm/gtx/inertia.inl diff --git a/src/helper/glm/gtx/int_10_10_10_2.hpp b/include/eepp/helper/glm/gtx/int_10_10_10_2.hpp similarity index 100% rename from src/helper/glm/gtx/int_10_10_10_2.hpp rename to include/eepp/helper/glm/gtx/int_10_10_10_2.hpp diff --git a/src/helper/glm/gtx/int_10_10_10_2.inl b/include/eepp/helper/glm/gtx/int_10_10_10_2.inl similarity index 100% rename from src/helper/glm/gtx/int_10_10_10_2.inl rename to include/eepp/helper/glm/gtx/int_10_10_10_2.inl diff --git a/src/helper/glm/gtx/integer.hpp b/include/eepp/helper/glm/gtx/integer.hpp similarity index 100% rename from src/helper/glm/gtx/integer.hpp rename to include/eepp/helper/glm/gtx/integer.hpp diff --git a/src/helper/glm/gtx/integer.inl b/include/eepp/helper/glm/gtx/integer.inl similarity index 100% rename from src/helper/glm/gtx/integer.inl rename to include/eepp/helper/glm/gtx/integer.inl diff --git a/src/helper/glm/gtx/intersect.hpp b/include/eepp/helper/glm/gtx/intersect.hpp similarity index 100% rename from src/helper/glm/gtx/intersect.hpp rename to include/eepp/helper/glm/gtx/intersect.hpp diff --git a/src/helper/glm/gtx/intersect.inl b/include/eepp/helper/glm/gtx/intersect.inl similarity index 100% rename from src/helper/glm/gtx/intersect.inl rename to include/eepp/helper/glm/gtx/intersect.inl diff --git a/src/helper/glm/gtx/log_base.hpp b/include/eepp/helper/glm/gtx/log_base.hpp similarity index 100% rename from src/helper/glm/gtx/log_base.hpp rename to include/eepp/helper/glm/gtx/log_base.hpp diff --git a/src/helper/glm/gtx/log_base.inl b/include/eepp/helper/glm/gtx/log_base.inl similarity index 100% rename from src/helper/glm/gtx/log_base.inl rename to include/eepp/helper/glm/gtx/log_base.inl diff --git a/src/helper/glm/gtx/matrix_cross_product.hpp b/include/eepp/helper/glm/gtx/matrix_cross_product.hpp similarity index 100% rename from src/helper/glm/gtx/matrix_cross_product.hpp rename to include/eepp/helper/glm/gtx/matrix_cross_product.hpp diff --git a/src/helper/glm/gtx/matrix_cross_product.inl b/include/eepp/helper/glm/gtx/matrix_cross_product.inl similarity index 100% rename from src/helper/glm/gtx/matrix_cross_product.inl rename to include/eepp/helper/glm/gtx/matrix_cross_product.inl diff --git a/src/helper/glm/gtx/matrix_major_storage.hpp b/include/eepp/helper/glm/gtx/matrix_major_storage.hpp similarity index 100% rename from src/helper/glm/gtx/matrix_major_storage.hpp rename to include/eepp/helper/glm/gtx/matrix_major_storage.hpp diff --git a/src/helper/glm/gtx/matrix_major_storage.inl b/include/eepp/helper/glm/gtx/matrix_major_storage.inl similarity index 100% rename from src/helper/glm/gtx/matrix_major_storage.inl rename to include/eepp/helper/glm/gtx/matrix_major_storage.inl diff --git a/src/helper/glm/gtx/matrix_operation.hpp b/include/eepp/helper/glm/gtx/matrix_operation.hpp similarity index 100% rename from src/helper/glm/gtx/matrix_operation.hpp rename to include/eepp/helper/glm/gtx/matrix_operation.hpp diff --git a/src/helper/glm/gtx/matrix_operation.inl b/include/eepp/helper/glm/gtx/matrix_operation.inl similarity index 100% rename from src/helper/glm/gtx/matrix_operation.inl rename to include/eepp/helper/glm/gtx/matrix_operation.inl diff --git a/src/helper/glm/gtx/matrix_query.hpp b/include/eepp/helper/glm/gtx/matrix_query.hpp similarity index 100% rename from src/helper/glm/gtx/matrix_query.hpp rename to include/eepp/helper/glm/gtx/matrix_query.hpp diff --git a/src/helper/glm/gtx/matrix_query.inl b/include/eepp/helper/glm/gtx/matrix_query.inl similarity index 100% rename from src/helper/glm/gtx/matrix_query.inl rename to include/eepp/helper/glm/gtx/matrix_query.inl diff --git a/src/helper/glm/gtx/mixed_product.hpp b/include/eepp/helper/glm/gtx/mixed_product.hpp similarity index 100% rename from src/helper/glm/gtx/mixed_product.hpp rename to include/eepp/helper/glm/gtx/mixed_product.hpp diff --git a/src/helper/glm/gtx/mixed_product.inl b/include/eepp/helper/glm/gtx/mixed_product.inl similarity index 100% rename from src/helper/glm/gtx/mixed_product.inl rename to include/eepp/helper/glm/gtx/mixed_product.inl diff --git a/src/helper/glm/gtx/multiple.hpp b/include/eepp/helper/glm/gtx/multiple.hpp similarity index 100% rename from src/helper/glm/gtx/multiple.hpp rename to include/eepp/helper/glm/gtx/multiple.hpp diff --git a/src/helper/glm/gtx/multiple.inl b/include/eepp/helper/glm/gtx/multiple.inl similarity index 100% rename from src/helper/glm/gtx/multiple.inl rename to include/eepp/helper/glm/gtx/multiple.inl diff --git a/src/helper/glm/gtx/norm.hpp b/include/eepp/helper/glm/gtx/norm.hpp similarity index 100% rename from src/helper/glm/gtx/norm.hpp rename to include/eepp/helper/glm/gtx/norm.hpp diff --git a/src/helper/glm/gtx/norm.inl b/include/eepp/helper/glm/gtx/norm.inl similarity index 100% rename from src/helper/glm/gtx/norm.inl rename to include/eepp/helper/glm/gtx/norm.inl diff --git a/src/helper/glm/gtx/normal.hpp b/include/eepp/helper/glm/gtx/normal.hpp similarity index 100% rename from src/helper/glm/gtx/normal.hpp rename to include/eepp/helper/glm/gtx/normal.hpp diff --git a/src/helper/glm/gtx/normal.inl b/include/eepp/helper/glm/gtx/normal.inl similarity index 100% rename from src/helper/glm/gtx/normal.inl rename to include/eepp/helper/glm/gtx/normal.inl diff --git a/src/helper/glm/gtx/normalize_dot.hpp b/include/eepp/helper/glm/gtx/normalize_dot.hpp similarity index 100% rename from src/helper/glm/gtx/normalize_dot.hpp rename to include/eepp/helper/glm/gtx/normalize_dot.hpp diff --git a/src/helper/glm/gtx/normalize_dot.inl b/include/eepp/helper/glm/gtx/normalize_dot.inl similarity index 100% rename from src/helper/glm/gtx/normalize_dot.inl rename to include/eepp/helper/glm/gtx/normalize_dot.inl diff --git a/src/helper/glm/gtx/number_precision.hpp b/include/eepp/helper/glm/gtx/number_precision.hpp similarity index 100% rename from src/helper/glm/gtx/number_precision.hpp rename to include/eepp/helper/glm/gtx/number_precision.hpp diff --git a/src/helper/glm/gtx/number_precision.inl b/include/eepp/helper/glm/gtx/number_precision.inl similarity index 100% rename from src/helper/glm/gtx/number_precision.inl rename to include/eepp/helper/glm/gtx/number_precision.inl diff --git a/src/helper/glm/gtx/ocl_type.hpp b/include/eepp/helper/glm/gtx/ocl_type.hpp similarity index 100% rename from src/helper/glm/gtx/ocl_type.hpp rename to include/eepp/helper/glm/gtx/ocl_type.hpp diff --git a/src/helper/glm/gtx/ocl_type.inl b/include/eepp/helper/glm/gtx/ocl_type.inl similarity index 100% rename from src/helper/glm/gtx/ocl_type.inl rename to include/eepp/helper/glm/gtx/ocl_type.inl diff --git a/src/helper/glm/gtx/optimum_pow.hpp b/include/eepp/helper/glm/gtx/optimum_pow.hpp similarity index 100% rename from src/helper/glm/gtx/optimum_pow.hpp rename to include/eepp/helper/glm/gtx/optimum_pow.hpp diff --git a/src/helper/glm/gtx/optimum_pow.inl b/include/eepp/helper/glm/gtx/optimum_pow.inl similarity index 100% rename from src/helper/glm/gtx/optimum_pow.inl rename to include/eepp/helper/glm/gtx/optimum_pow.inl diff --git a/src/helper/glm/gtx/orthonormalize.hpp b/include/eepp/helper/glm/gtx/orthonormalize.hpp similarity index 100% rename from src/helper/glm/gtx/orthonormalize.hpp rename to include/eepp/helper/glm/gtx/orthonormalize.hpp diff --git a/src/helper/glm/gtx/orthonormalize.inl b/include/eepp/helper/glm/gtx/orthonormalize.inl similarity index 100% rename from src/helper/glm/gtx/orthonormalize.inl rename to include/eepp/helper/glm/gtx/orthonormalize.inl diff --git a/src/helper/glm/gtx/perpendicular.hpp b/include/eepp/helper/glm/gtx/perpendicular.hpp similarity index 100% rename from src/helper/glm/gtx/perpendicular.hpp rename to include/eepp/helper/glm/gtx/perpendicular.hpp diff --git a/src/helper/glm/gtx/perpendicular.inl b/include/eepp/helper/glm/gtx/perpendicular.inl similarity index 100% rename from src/helper/glm/gtx/perpendicular.inl rename to include/eepp/helper/glm/gtx/perpendicular.inl diff --git a/src/helper/glm/gtx/polar_coordinates.hpp b/include/eepp/helper/glm/gtx/polar_coordinates.hpp similarity index 100% rename from src/helper/glm/gtx/polar_coordinates.hpp rename to include/eepp/helper/glm/gtx/polar_coordinates.hpp diff --git a/src/helper/glm/gtx/polar_coordinates.inl b/include/eepp/helper/glm/gtx/polar_coordinates.inl similarity index 100% rename from src/helper/glm/gtx/polar_coordinates.inl rename to include/eepp/helper/glm/gtx/polar_coordinates.inl diff --git a/src/helper/glm/gtx/projection.hpp b/include/eepp/helper/glm/gtx/projection.hpp similarity index 100% rename from src/helper/glm/gtx/projection.hpp rename to include/eepp/helper/glm/gtx/projection.hpp diff --git a/src/helper/glm/gtx/projection.inl b/include/eepp/helper/glm/gtx/projection.inl similarity index 100% rename from src/helper/glm/gtx/projection.inl rename to include/eepp/helper/glm/gtx/projection.inl diff --git a/src/helper/glm/gtx/quaternion.hpp b/include/eepp/helper/glm/gtx/quaternion.hpp similarity index 100% rename from src/helper/glm/gtx/quaternion.hpp rename to include/eepp/helper/glm/gtx/quaternion.hpp diff --git a/src/helper/glm/gtx/quaternion.inl b/include/eepp/helper/glm/gtx/quaternion.inl similarity index 100% rename from src/helper/glm/gtx/quaternion.inl rename to include/eepp/helper/glm/gtx/quaternion.inl diff --git a/src/helper/glm/gtx/random.hpp b/include/eepp/helper/glm/gtx/random.hpp similarity index 100% rename from src/helper/glm/gtx/random.hpp rename to include/eepp/helper/glm/gtx/random.hpp diff --git a/src/helper/glm/gtx/random.inl b/include/eepp/helper/glm/gtx/random.inl similarity index 100% rename from src/helper/glm/gtx/random.inl rename to include/eepp/helper/glm/gtx/random.inl diff --git a/src/helper/glm/gtx/raw_data.hpp b/include/eepp/helper/glm/gtx/raw_data.hpp similarity index 100% rename from src/helper/glm/gtx/raw_data.hpp rename to include/eepp/helper/glm/gtx/raw_data.hpp diff --git a/src/helper/glm/gtx/raw_data.inl b/include/eepp/helper/glm/gtx/raw_data.inl similarity index 100% rename from src/helper/glm/gtx/raw_data.inl rename to include/eepp/helper/glm/gtx/raw_data.inl diff --git a/src/helper/glm/gtx/reciprocal.hpp b/include/eepp/helper/glm/gtx/reciprocal.hpp similarity index 100% rename from src/helper/glm/gtx/reciprocal.hpp rename to include/eepp/helper/glm/gtx/reciprocal.hpp diff --git a/src/helper/glm/gtx/reciprocal.inl b/include/eepp/helper/glm/gtx/reciprocal.inl similarity index 100% rename from src/helper/glm/gtx/reciprocal.inl rename to include/eepp/helper/glm/gtx/reciprocal.inl diff --git a/src/helper/glm/gtx/rotate_vector.hpp b/include/eepp/helper/glm/gtx/rotate_vector.hpp similarity index 100% rename from src/helper/glm/gtx/rotate_vector.hpp rename to include/eepp/helper/glm/gtx/rotate_vector.hpp diff --git a/src/helper/glm/gtx/rotate_vector.inl b/include/eepp/helper/glm/gtx/rotate_vector.inl similarity index 100% rename from src/helper/glm/gtx/rotate_vector.inl rename to include/eepp/helper/glm/gtx/rotate_vector.inl diff --git a/src/helper/glm/gtx/simd_mat4.hpp b/include/eepp/helper/glm/gtx/simd_mat4.hpp similarity index 100% rename from src/helper/glm/gtx/simd_mat4.hpp rename to include/eepp/helper/glm/gtx/simd_mat4.hpp diff --git a/src/helper/glm/gtx/simd_mat4.inl b/include/eepp/helper/glm/gtx/simd_mat4.inl similarity index 100% rename from src/helper/glm/gtx/simd_mat4.inl rename to include/eepp/helper/glm/gtx/simd_mat4.inl diff --git a/src/helper/glm/gtx/simd_vec4.hpp b/include/eepp/helper/glm/gtx/simd_vec4.hpp similarity index 100% rename from src/helper/glm/gtx/simd_vec4.hpp rename to include/eepp/helper/glm/gtx/simd_vec4.hpp diff --git a/src/helper/glm/gtx/simd_vec4.inl b/include/eepp/helper/glm/gtx/simd_vec4.inl similarity index 100% rename from src/helper/glm/gtx/simd_vec4.inl rename to include/eepp/helper/glm/gtx/simd_vec4.inl diff --git a/src/helper/glm/gtx/spline.hpp b/include/eepp/helper/glm/gtx/spline.hpp similarity index 100% rename from src/helper/glm/gtx/spline.hpp rename to include/eepp/helper/glm/gtx/spline.hpp diff --git a/src/helper/glm/gtx/spline.inl b/include/eepp/helper/glm/gtx/spline.inl similarity index 100% rename from src/helper/glm/gtx/spline.inl rename to include/eepp/helper/glm/gtx/spline.inl diff --git a/src/helper/glm/gtx/std_based_type.hpp b/include/eepp/helper/glm/gtx/std_based_type.hpp similarity index 100% rename from src/helper/glm/gtx/std_based_type.hpp rename to include/eepp/helper/glm/gtx/std_based_type.hpp diff --git a/src/helper/glm/gtx/std_based_type.inl b/include/eepp/helper/glm/gtx/std_based_type.inl similarity index 100% rename from src/helper/glm/gtx/std_based_type.inl rename to include/eepp/helper/glm/gtx/std_based_type.inl diff --git a/src/helper/glm/gtx/string_cast.hpp b/include/eepp/helper/glm/gtx/string_cast.hpp similarity index 100% rename from src/helper/glm/gtx/string_cast.hpp rename to include/eepp/helper/glm/gtx/string_cast.hpp diff --git a/src/helper/glm/gtx/string_cast.inl b/include/eepp/helper/glm/gtx/string_cast.inl similarity index 100% rename from src/helper/glm/gtx/string_cast.inl rename to include/eepp/helper/glm/gtx/string_cast.inl diff --git a/src/helper/glm/gtx/transform.hpp b/include/eepp/helper/glm/gtx/transform.hpp similarity index 100% rename from src/helper/glm/gtx/transform.hpp rename to include/eepp/helper/glm/gtx/transform.hpp diff --git a/src/helper/glm/gtx/transform.inl b/include/eepp/helper/glm/gtx/transform.inl similarity index 100% rename from src/helper/glm/gtx/transform.inl rename to include/eepp/helper/glm/gtx/transform.inl diff --git a/src/helper/glm/gtx/transform2.hpp b/include/eepp/helper/glm/gtx/transform2.hpp similarity index 100% rename from src/helper/glm/gtx/transform2.hpp rename to include/eepp/helper/glm/gtx/transform2.hpp diff --git a/src/helper/glm/gtx/transform2.inl b/include/eepp/helper/glm/gtx/transform2.inl similarity index 100% rename from src/helper/glm/gtx/transform2.inl rename to include/eepp/helper/glm/gtx/transform2.inl diff --git a/src/helper/glm/gtx/unsigned_int.hpp b/include/eepp/helper/glm/gtx/unsigned_int.hpp similarity index 100% rename from src/helper/glm/gtx/unsigned_int.hpp rename to include/eepp/helper/glm/gtx/unsigned_int.hpp diff --git a/src/helper/glm/gtx/unsigned_int.inl b/include/eepp/helper/glm/gtx/unsigned_int.inl similarity index 100% rename from src/helper/glm/gtx/unsigned_int.inl rename to include/eepp/helper/glm/gtx/unsigned_int.inl diff --git a/src/helper/glm/gtx/vec1.hpp b/include/eepp/helper/glm/gtx/vec1.hpp similarity index 100% rename from src/helper/glm/gtx/vec1.hpp rename to include/eepp/helper/glm/gtx/vec1.hpp diff --git a/src/helper/glm/gtx/vec1.inl b/include/eepp/helper/glm/gtx/vec1.inl similarity index 100% rename from src/helper/glm/gtx/vec1.inl rename to include/eepp/helper/glm/gtx/vec1.inl diff --git a/src/helper/glm/gtx/vector_access.hpp b/include/eepp/helper/glm/gtx/vector_access.hpp similarity index 100% rename from src/helper/glm/gtx/vector_access.hpp rename to include/eepp/helper/glm/gtx/vector_access.hpp diff --git a/src/helper/glm/gtx/vector_access.inl b/include/eepp/helper/glm/gtx/vector_access.inl similarity index 100% rename from src/helper/glm/gtx/vector_access.inl rename to include/eepp/helper/glm/gtx/vector_access.inl diff --git a/src/helper/glm/gtx/vector_angle.hpp b/include/eepp/helper/glm/gtx/vector_angle.hpp similarity index 100% rename from src/helper/glm/gtx/vector_angle.hpp rename to include/eepp/helper/glm/gtx/vector_angle.hpp diff --git a/src/helper/glm/gtx/vector_angle.inl b/include/eepp/helper/glm/gtx/vector_angle.inl similarity index 100% rename from src/helper/glm/gtx/vector_angle.inl rename to include/eepp/helper/glm/gtx/vector_angle.inl diff --git a/src/helper/glm/gtx/vector_query.hpp b/include/eepp/helper/glm/gtx/vector_query.hpp similarity index 100% rename from src/helper/glm/gtx/vector_query.hpp rename to include/eepp/helper/glm/gtx/vector_query.hpp diff --git a/src/helper/glm/gtx/vector_query.inl b/include/eepp/helper/glm/gtx/vector_query.inl similarity index 100% rename from src/helper/glm/gtx/vector_query.inl rename to include/eepp/helper/glm/gtx/vector_query.inl diff --git a/src/helper/glm/gtx/verbose_operator.hpp b/include/eepp/helper/glm/gtx/verbose_operator.hpp similarity index 100% rename from src/helper/glm/gtx/verbose_operator.hpp rename to include/eepp/helper/glm/gtx/verbose_operator.hpp diff --git a/src/helper/glm/gtx/verbose_operator.inl b/include/eepp/helper/glm/gtx/verbose_operator.inl similarity index 100% rename from src/helper/glm/gtx/verbose_operator.inl rename to include/eepp/helper/glm/gtx/verbose_operator.inl diff --git a/src/helper/glm/gtx/wrap.hpp b/include/eepp/helper/glm/gtx/wrap.hpp similarity index 100% rename from src/helper/glm/gtx/wrap.hpp rename to include/eepp/helper/glm/gtx/wrap.hpp diff --git a/src/helper/glm/gtx/wrap.inl b/include/eepp/helper/glm/gtx/wrap.inl similarity index 100% rename from src/helper/glm/gtx/wrap.inl rename to include/eepp/helper/glm/gtx/wrap.inl diff --git a/src/helper/glm/virtrev/xstream.hpp b/include/eepp/helper/glm/virtrev/xstream.hpp similarity index 100% rename from src/helper/glm/virtrev/xstream.hpp rename to include/eepp/helper/glm/virtrev/xstream.hpp diff --git a/src/helper/haikuttf/sophist.h b/include/eepp/helper/sophist/sophist.h similarity index 100% rename from src/helper/haikuttf/sophist.h rename to include/eepp/helper/sophist/sophist.h diff --git a/include/eepp/math/base.hpp b/include/eepp/math/base.hpp new file mode 100644 index 000000000..e18840e46 --- /dev/null +++ b/include/eepp/math/base.hpp @@ -0,0 +1,17 @@ +#ifndef EE_MATH_BASE +#define EE_MATH_BASE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace EE::Utils; + +#endif diff --git a/src/math/cmtrand.hpp b/include/eepp/math/cmtrand.hpp similarity index 96% rename from src/math/cmtrand.hpp rename to include/eepp/math/cmtrand.hpp index 4479ecd7e..e91b8e3a8 100755 --- a/src/math/cmtrand.hpp +++ b/include/eepp/math/cmtrand.hpp @@ -61,7 +61,7 @@ #ifndef EE_UTILSCMTRAND_HPP #define EE_UTILSCMTRAND_HPP -#include "base.hpp" +#include namespace EE { namespace Math { diff --git a/src/math/math.hpp b/include/eepp/math/math.hpp similarity index 99% rename from src/math/math.hpp rename to include/eepp/math/math.hpp index 9d0e6d2c7..ed6a76976 100755 --- a/src/math/math.hpp +++ b/include/eepp/math/math.hpp @@ -1,7 +1,7 @@ #ifndef EECMATH_H #define EECMATH_H -#include "base.hpp" +#include namespace EE { namespace Math { diff --git a/src/physics/area.hpp b/include/eepp/physics/area.hpp similarity index 93% rename from src/physics/area.hpp rename to include/eepp/physics/area.hpp index 0bf717323..eaf0540c2 100644 --- a/src/physics/area.hpp +++ b/include/eepp/physics/area.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_AREA_HPP #define EE_PHYSICS_AREA_HPP -#include "base.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/base.hpp b/include/eepp/physics/base.hpp similarity index 50% rename from src/physics/base.hpp rename to include/eepp/physics/base.hpp index 21aae6ea3..ed86e32e3 100644 --- a/src/physics/base.hpp +++ b/include/eepp/physics/base.hpp @@ -2,23 +2,23 @@ #define EE_PHYSICS_BASE //! Chipmunk includes -#include "../helper/chipmunk/chipmunk_private.h" -#include "../helper/chipmunk/chipmunk_unsafe.h" +#include +#include //! EE includes needed for the wrapper, all templates, so it will be easy to port this. -#include "../base.hpp" -#include "../utils/vector2.hpp" -#include "../utils/rect.hpp" -#include "../utils/colors.hpp" +#include +#include +#include +#include using namespace EE::Utils; -#include "../system/tsingleton.hpp" +#include using namespace EE::System; //! Default settings are defined here -#include "settings.hpp" +#include //! Some helpers for the wrapper ( most of them can be disabled in the settings ) -#include "physicshelper.hpp" +#include #endif diff --git a/src/physics/carbiter.hpp b/include/eepp/physics/carbiter.hpp similarity index 88% rename from src/physics/carbiter.hpp rename to include/eepp/physics/carbiter.hpp index 68f845333..4b1e4c169 100644 --- a/src/physics/carbiter.hpp +++ b/include/eepp/physics/carbiter.hpp @@ -1,9 +1,9 @@ #ifndef EE_PHYSICS_CARBITER_HPP #define EE_PHYSICS_CARBITER_HPP -#include "base.hpp" -#include "cshape.hpp" -#include "cbody.hpp" +#include +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cbody.hpp b/include/eepp/physics/cbody.hpp similarity index 99% rename from src/physics/cbody.hpp rename to include/eepp/physics/cbody.hpp index 6fa4463ed..ea88facc9 100644 --- a/src/physics/cbody.hpp +++ b/include/eepp/physics/cbody.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CBODY_HPP #define EE_PHYSICS_CBODY_HPP -#include "base.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cconstraint.hpp b/include/eepp/physics/constraints/cconstraint.hpp similarity index 91% rename from src/physics/constraints/cconstraint.hpp rename to include/eepp/physics/constraints/cconstraint.hpp index f9ec8ab0a..79fe7ee42 100644 --- a/src/physics/constraints/cconstraint.hpp +++ b/include/eepp/physics/constraints/cconstraint.hpp @@ -1,8 +1,8 @@ #ifndef EE_PHYSICS_CCONSTRAINT_HPP #define EE_PHYSICS_CCONSTRAINT_HPP -#include "../base.hpp" -#include "../cbody.hpp" +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cdampedrotaryspring.hpp b/include/eepp/physics/constraints/cdampedrotaryspring.hpp similarity index 91% rename from src/physics/constraints/cdampedrotaryspring.hpp rename to include/eepp/physics/constraints/cdampedrotaryspring.hpp index bcc592b77..b49f4c466 100644 --- a/src/physics/constraints/cdampedrotaryspring.hpp +++ b/include/eepp/physics/constraints/cdampedrotaryspring.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CDAMPEDROTARYSPRING_HPP #define EE_PHYSICS_CDAMPEDROTARYSPRING_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cdampedspring.hpp b/include/eepp/physics/constraints/cdampedspring.hpp similarity index 92% rename from src/physics/constraints/cdampedspring.hpp rename to include/eepp/physics/constraints/cdampedspring.hpp index cb336c83d..a76371868 100644 --- a/src/physics/constraints/cdampedspring.hpp +++ b/include/eepp/physics/constraints/cdampedspring.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CDAMPEDSPRING_HPP #define EE_PHYSICS_CDAMPEDSPRING_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cgearjoint.hpp b/include/eepp/physics/constraints/cgearjoint.hpp similarity index 88% rename from src/physics/constraints/cgearjoint.hpp rename to include/eepp/physics/constraints/cgearjoint.hpp index 353500a42..336314fd8 100644 --- a/src/physics/constraints/cgearjoint.hpp +++ b/include/eepp/physics/constraints/cgearjoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CGEARJOINT_HPP #define EE_PHYSICS_CGEARJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cgroovejoint.hpp b/include/eepp/physics/constraints/cgroovejoint.hpp similarity index 90% rename from src/physics/constraints/cgroovejoint.hpp rename to include/eepp/physics/constraints/cgroovejoint.hpp index 9b85b67b0..10d052a7a 100644 --- a/src/physics/constraints/cgroovejoint.hpp +++ b/include/eepp/physics/constraints/cgroovejoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CGROOVEJOINT_HPP #define EE_PHYSICS_CGROOVEJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cpinjoint.hpp b/include/eepp/physics/constraints/cpinjoint.hpp similarity index 89% rename from src/physics/constraints/cpinjoint.hpp rename to include/eepp/physics/constraints/cpinjoint.hpp index c01bf0776..146feda04 100644 --- a/src/physics/constraints/cpinjoint.hpp +++ b/include/eepp/physics/constraints/cpinjoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CPINJOINT_HPP #define EE_PHYSICS_CPINJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cpivotjoint.hpp b/include/eepp/physics/constraints/cpivotjoint.hpp similarity index 89% rename from src/physics/constraints/cpivotjoint.hpp rename to include/eepp/physics/constraints/cpivotjoint.hpp index ae3e23e54..388c67c27 100644 --- a/src/physics/constraints/cpivotjoint.hpp +++ b/include/eepp/physics/constraints/cpivotjoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CPIVOTJOINT_HPP #define EE_PHYSICS_CPIVOTJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cratchetjoint.hpp b/include/eepp/physics/constraints/cratchetjoint.hpp similarity index 89% rename from src/physics/constraints/cratchetjoint.hpp rename to include/eepp/physics/constraints/cratchetjoint.hpp index 79dbc9ed0..d730873e1 100644 --- a/src/physics/constraints/cratchetjoint.hpp +++ b/include/eepp/physics/constraints/cratchetjoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CRATCHETJOINT_HPP #define EE_PHYSICS_CRATCHETJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/crotarylimitjoint.hpp b/include/eepp/physics/constraints/crotarylimitjoint.hpp similarity index 88% rename from src/physics/constraints/crotarylimitjoint.hpp rename to include/eepp/physics/constraints/crotarylimitjoint.hpp index c704ff6b2..c34305522 100644 --- a/src/physics/constraints/crotarylimitjoint.hpp +++ b/include/eepp/physics/constraints/crotarylimitjoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CROTARYLIMITJOINT_HPP #define EE_PHYSICS_CROTARYLIMITJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/csimplemotor.hpp b/include/eepp/physics/constraints/csimplemotor.hpp similarity index 85% rename from src/physics/constraints/csimplemotor.hpp rename to include/eepp/physics/constraints/csimplemotor.hpp index db48e8b04..9d67bc265 100644 --- a/src/physics/constraints/csimplemotor.hpp +++ b/include/eepp/physics/constraints/csimplemotor.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CSIMPLEMOTOR_HPP #define EE_PHYSICS_CSIMPLEMOTOR_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cslidejoint.hpp b/include/eepp/physics/constraints/cslidejoint.hpp similarity index 90% rename from src/physics/constraints/cslidejoint.hpp rename to include/eepp/physics/constraints/cslidejoint.hpp index 797cb38b0..5c507b45b 100644 --- a/src/physics/constraints/cslidejoint.hpp +++ b/include/eepp/physics/constraints/cslidejoint.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CSLIDEJOINT_HPP #define EE_PHYSICS_CSLIDEJOINT_HPP -#include "cconstraint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cphysicsmanager.hpp b/include/eepp/physics/cphysicsmanager.hpp similarity index 98% rename from src/physics/cphysicsmanager.hpp rename to include/eepp/physics/cphysicsmanager.hpp index 0f536c814..84bf6b823 100644 --- a/src/physics/cphysicsmanager.hpp +++ b/include/eepp/physics/cphysicsmanager.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_PHYSICSMANAGER_HPP #define EE_PHYSICS_PHYSICSMANAGER_HPP -#include "base.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cshape.hpp b/include/eepp/physics/cshape.hpp similarity index 95% rename from src/physics/cshape.hpp rename to include/eepp/physics/cshape.hpp index bd70b429c..89ce7b90b 100644 --- a/src/physics/cshape.hpp +++ b/include/eepp/physics/cshape.hpp @@ -1,8 +1,8 @@ #ifndef EE_PHYSICS_CSHAPE_HPP #define EE_PHYSICS_CSHAPE_HPP -#include "base.hpp" -#include "cbody.hpp" +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cshapecircle.hpp b/include/eepp/physics/cshapecircle.hpp similarity index 93% rename from src/physics/cshapecircle.hpp rename to include/eepp/physics/cshapecircle.hpp index 7666def83..c26d48916 100644 --- a/src/physics/cshapecircle.hpp +++ b/include/eepp/physics/cshapecircle.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CSHAPECIRCLE_HPP #define EE_PHYSICS_CSHAPECIRCLE_HPP -#include "cshape.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cshapecirclesprite.hpp b/include/eepp/physics/cshapecirclesprite.hpp similarity index 90% rename from src/physics/cshapecirclesprite.hpp rename to include/eepp/physics/cshapecirclesprite.hpp index 66780aa63..46e5668d4 100644 --- a/src/physics/cshapecirclesprite.hpp +++ b/include/eepp/physics/cshapecirclesprite.hpp @@ -1,11 +1,11 @@ #ifndef CSHAPECIRCLESPRITE_HPP #define CSHAPECIRCLESPRITE_HPP -#include "cshapecircle.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/csprite.hpp" +#include using namespace EE::Graphics; CP_NAMESPACE_BEGIN diff --git a/src/physics/cshapepoly.hpp b/include/eepp/physics/cshapepoly.hpp similarity index 95% rename from src/physics/cshapepoly.hpp rename to include/eepp/physics/cshapepoly.hpp index f41cfed54..2f54b7555 100644 --- a/src/physics/cshapepoly.hpp +++ b/include/eepp/physics/cshapepoly.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CSHAPEPOLY_HPP #define EE_PHYSICS_CSHAPEPOLY_HPP -#include "cshape.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cshapepolysprite.hpp b/include/eepp/physics/cshapepolysprite.hpp similarity index 92% rename from src/physics/cshapepolysprite.hpp rename to include/eepp/physics/cshapepolysprite.hpp index f89a5a183..f2a763e97 100644 --- a/src/physics/cshapepolysprite.hpp +++ b/include/eepp/physics/cshapepolysprite.hpp @@ -1,11 +1,11 @@ #ifndef EE_PHYSICS_CSHAPEPOLYSPRITE_HPP #define EE_PHYSICS_CSHAPEPOLYSPRITE_HPP -#include "cshapepoly.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/csprite.hpp" +#include using namespace EE::Graphics; CP_NAMESPACE_BEGIN diff --git a/src/physics/cshapesegment.hpp b/include/eepp/physics/cshapesegment.hpp similarity index 95% rename from src/physics/cshapesegment.hpp rename to include/eepp/physics/cshapesegment.hpp index af38af11a..a97e34b6a 100644 --- a/src/physics/cshapesegment.hpp +++ b/include/eepp/physics/cshapesegment.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_CSHAPESEGMENT_HPP #define EE_PHYSICS_CSHAPESEGMENT_HPP -#include "cshape.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cspace.hpp b/include/eepp/physics/cspace.hpp similarity index 97% rename from src/physics/cspace.hpp rename to include/eepp/physics/cspace.hpp index ce9f96255..3f75bec51 100644 --- a/src/physics/cspace.hpp +++ b/include/eepp/physics/cspace.hpp @@ -1,11 +1,11 @@ #ifndef EE_PHYSICS_CSPACE_HPP #define EE_PHYSICS_CSPACE_HPP -#include "base.hpp" -#include "cbody.hpp" -#include "cshape.hpp" -#include "carbiter.hpp" -#include "constraints/cconstraint.hpp" +#include +#include +#include +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/moment.hpp b/include/eepp/physics/moment.hpp similarity index 95% rename from src/physics/moment.hpp rename to include/eepp/physics/moment.hpp index a037dc754..ff810b560 100644 --- a/src/physics/moment.hpp +++ b/include/eepp/physics/moment.hpp @@ -1,7 +1,7 @@ #ifndef EE_PHYSICS_MOMENT_HPP #define EE_PHYSICS_MOMENT_HPP -#include "base.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/physicshelper.hpp b/include/eepp/physics/physicshelper.hpp similarity index 98% rename from src/physics/physicshelper.hpp rename to include/eepp/physics/physicshelper.hpp index 6f961093b..4cb5fdeb3 100644 --- a/src/physics/physicshelper.hpp +++ b/include/eepp/physics/physicshelper.hpp @@ -1,8 +1,8 @@ #ifndef EE_PHYSICS_HELPER #define EE_PHYSICS_HELPER -#include "base.hpp" -#include "../graphics/base.hpp" +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/settings.hpp b/include/eepp/physics/settings.hpp similarity index 100% rename from src/physics/settings.hpp rename to include/eepp/physics/settings.hpp diff --git a/include/eepp/system/base.hpp b/include/eepp/system/base.hpp new file mode 100644 index 000000000..bf2a7778d --- /dev/null +++ b/include/eepp/system/base.hpp @@ -0,0 +1,12 @@ +#ifndef EE_UTILS_BASE +#define EE_UTILS_BASE + +#include + +#include +#include +#include + +using namespace EE::Utils; + +#endif diff --git a/src/system/cinifile.hpp b/include/eepp/system/cinifile.hpp similarity index 99% rename from src/system/cinifile.hpp rename to include/eepp/system/cinifile.hpp index 9250b2432..6b4cdafee 100755 --- a/src/system/cinifile.hpp +++ b/include/eepp/system/cinifile.hpp @@ -16,7 +16,7 @@ #ifndef CINIFILE_H #define CINIFILE_H -#include "base.hpp" +#include #define MAX_KEYNAME 128 #define MAX_VALUENAME 128 diff --git a/src/system/ciostream.hpp b/include/eepp/system/ciostream.hpp similarity index 94% rename from src/system/ciostream.hpp rename to include/eepp/system/ciostream.hpp index 918fbdda7..0a6af021a 100644 --- a/src/system/ciostream.hpp +++ b/include/eepp/system/ciostream.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCIOSTREAM_HPP #define EE_SYSTEMCIOSTREAM_HPP -#include "base.hpp" +#include namespace EE { typedef std::streamsize ios_size; diff --git a/src/system/ciostreamfile.hpp b/include/eepp/system/ciostreamfile.hpp similarity index 93% rename from src/system/ciostreamfile.hpp rename to include/eepp/system/ciostreamfile.hpp index 97433a7a2..7347abce1 100644 --- a/src/system/ciostreamfile.hpp +++ b/include/eepp/system/ciostreamfile.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCIOSTREAMFILE_HPP #define EE_SYSTEMCIOSTREAMFILE_HPP -#include "ciostream.hpp" +#include namespace EE { namespace System { diff --git a/src/system/ciostreammemory.hpp b/include/eepp/system/ciostreammemory.hpp similarity index 94% rename from src/system/ciostreammemory.hpp rename to include/eepp/system/ciostreammemory.hpp index 0c28b3dba..f07ee31fa 100644 --- a/src/system/ciostreammemory.hpp +++ b/include/eepp/system/ciostreammemory.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCIOSTREAMMEMORY_HPP #define EE_SYSTEMCIOSTREAMMEMORY_HPP -#include "ciostream.hpp" +#include namespace EE { namespace System { diff --git a/src/system/clog.hpp b/include/eepp/system/clog.hpp similarity index 83% rename from src/system/clog.hpp rename to include/eepp/system/clog.hpp index 752f11c29..9ef88c082 100755 --- a/src/system/clog.hpp +++ b/include/eepp/system/clog.hpp @@ -1,10 +1,10 @@ #ifndef EECLOG_H #define EECLOG_H -#include "base.hpp" -#include "tsingleton.hpp" -#include "ciostreamfile.hpp" -#include "cmutex.hpp" +#include +#include +#include +#include namespace EE { namespace System { diff --git a/src/system/cmutex.hpp b/include/eepp/system/cmutex.hpp similarity index 82% rename from src/system/cmutex.hpp rename to include/eepp/system/cmutex.hpp index eb725d918..e6dff7111 100755 --- a/src/system/cmutex.hpp +++ b/include/eepp/system/cmutex.hpp @@ -1,10 +1,11 @@ #ifndef EE_SYSTEMCMUTEX_H #define EE_SYSTEMCMUTEX_H -#include "../base.hpp" -#include "platform/platformimpl.hpp" +#include namespace EE { namespace System { + +namespace Platform { class cMutexImpl; } /** Simple mutex class */ class EE_API cMutex { diff --git a/src/system/cobjectloader.hpp b/include/eepp/system/cobjectloader.hpp similarity index 93% rename from src/system/cobjectloader.hpp rename to include/eepp/system/cobjectloader.hpp index c757a988d..990d35ad9 100644 --- a/src/system/cobjectloader.hpp +++ b/include/eepp/system/cobjectloader.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCOBJECTLOADER #define EE_SYSTEMCOBJECTLOADER -#include "base.hpp" -#include "cthread.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cpack.hpp b/include/eepp/system/cpack.hpp similarity index 97% rename from src/system/cpack.hpp rename to include/eepp/system/cpack.hpp index 6d91e3055..c16192755 100755 --- a/src/system/cpack.hpp +++ b/include/eepp/system/cpack.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCPACK_HPP #define EE_SYSTEMCPACK_HPP -#include "base.hpp" -#include "cmutex.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cpackmanager.hpp b/include/eepp/system/cpackmanager.hpp similarity index 79% rename from src/system/cpackmanager.hpp rename to include/eepp/system/cpackmanager.hpp index 9933b6c66..bcfaee40e 100644 --- a/src/system/cpackmanager.hpp +++ b/include/eepp/system/cpackmanager.hpp @@ -1,9 +1,9 @@ #ifndef EE_SYSTEMCPACKMANAGER_HPP #define EE_SYSTEMCPACKMANAGER_HPP -#include "tsingleton.hpp" -#include "tcontainer.hpp" -#include "cpack.hpp" +#include +#include +#include namespace EE { namespace System { diff --git a/src/system/cpak.hpp b/include/eepp/system/cpak.hpp similarity index 95% rename from src/system/cpak.hpp rename to include/eepp/system/cpak.hpp index f07343021..f5de31b03 100755 --- a/src/system/cpak.hpp +++ b/include/eepp/system/cpak.hpp @@ -1,10 +1,10 @@ #ifndef EE_SYSTEMCPAK_HPP #define EE_SYSTEMCPAK_HPP -#include "base.hpp" -#include "cpack.hpp" -#include "clog.hpp" -#include "ciostreamfile.hpp" +#include +#include +#include +#include namespace EE { namespace System { diff --git a/src/system/crc4.hpp b/include/eepp/system/crc4.hpp similarity index 98% rename from src/system/crc4.hpp rename to include/eepp/system/crc4.hpp index 3814dc3d9..12fe5f17a 100755 --- a/src/system/crc4.hpp +++ b/include/eepp/system/crc4.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCRC4_H #define EE_SYSTEMCRC4_H -#include "base.hpp" +#include namespace EE { namespace System { diff --git a/src/system/cresourceloader.hpp b/include/eepp/system/cresourceloader.hpp similarity index 94% rename from src/system/cresourceloader.hpp rename to include/eepp/system/cresourceloader.hpp index 25bf68501..8ddedaa23 100644 --- a/src/system/cresourceloader.hpp +++ b/include/eepp/system/cresourceloader.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCRESOURCELOADER #define EE_SYSTEMCRESOURCELOADER -#include "base.hpp" -#include "cobjectloader.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cthread.hpp b/include/eepp/system/cthread.hpp similarity index 98% rename from src/system/cthread.hpp rename to include/eepp/system/cthread.hpp index d39cbe2e9..4a7a02d77 100755 --- a/src/system/cthread.hpp +++ b/include/eepp/system/cthread.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCTHREAD_H #define EE_SYSTEMCTHREAD_H -#include "base.hpp" +#include namespace EE { namespace System { diff --git a/src/system/ctimeelapsed.hpp b/include/eepp/system/ctimeelapsed.hpp similarity index 90% rename from src/system/ctimeelapsed.hpp rename to include/eepp/system/ctimeelapsed.hpp index 3e811ce6a..cb09cb62a 100755 --- a/src/system/ctimeelapsed.hpp +++ b/include/eepp/system/ctimeelapsed.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCTIMEELAPSED_H #define EE_SYSTEMCTIMEELAPSED_H -#include "base.hpp" -#include "ctimer.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/ctimer.hpp b/include/eepp/system/ctimer.hpp similarity index 87% rename from src/system/ctimer.hpp rename to include/eepp/system/ctimer.hpp index 7f15a37dc..3aadfd87f 100644 --- a/src/system/ctimer.hpp +++ b/include/eepp/system/ctimer.hpp @@ -1,11 +1,12 @@ #ifndef EE_SYSTEMCTIMER_H #define EE_SYSTEMCTIMER_H -#include "base.hpp" -#include "platform/platformimpl.hpp" +#include namespace EE { namespace System { +namespace Platform { class cTimerImpl; } + class EE_API cTimer { public: /** Timer constructor. MUST be called on same thread that calls getMilliseconds() */ diff --git a/src/system/czip.hpp b/include/eepp/system/czip.hpp similarity index 97% rename from src/system/czip.hpp rename to include/eepp/system/czip.hpp index 1da862364..204e848ec 100644 --- a/src/system/czip.hpp +++ b/include/eepp/system/czip.hpp @@ -1,8 +1,8 @@ #ifndef EE_SYSTEMCZIP_HPP #define EE_SYSTEMCZIP_HPP -#include "base.hpp" -#include "cpack.hpp" +#include +#include struct zip; diff --git a/src/system/tcontainer.hpp b/include/eepp/system/tcontainer.hpp similarity index 96% rename from src/system/tcontainer.hpp rename to include/eepp/system/tcontainer.hpp index f2031b691..61cbe5477 100644 --- a/src/system/tcontainer.hpp +++ b/include/eepp/system/tcontainer.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMTCONTAINER_HPP #define EE_SYSTEMTCONTAINER_HPP -#include "base.hpp" +#include namespace EE { namespace System { diff --git a/src/system/tresourcemanager.hpp b/include/eepp/system/tresourcemanager.hpp similarity index 99% rename from src/system/tresourcemanager.hpp rename to include/eepp/system/tresourcemanager.hpp index f67095daf..b096684ac 100644 --- a/src/system/tresourcemanager.hpp +++ b/include/eepp/system/tresourcemanager.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMTRESOURCEMANAGER_HPP #define EE_SYSTEMTRESOURCEMANAGER_HPP -#include "base.hpp" +#include namespace EE { namespace System { diff --git a/src/system/tsingleton.hpp b/include/eepp/system/tsingleton.hpp similarity index 93% rename from src/system/tsingleton.hpp rename to include/eepp/system/tsingleton.hpp index 1e7e6ccf0..0117ad52d 100755 --- a/src/system/tsingleton.hpp +++ b/include/eepp/system/tsingleton.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMSINGLETON_H #define EE_SYSTEMSINGLETON_H -#include "../base.hpp" +#include /** Internally we gonna use the macro singleton because it works with the engine compiled as dynamic libraries */ diff --git a/include/eepp/ui/base.hpp b/include/eepp/ui/base.hpp new file mode 100644 index 000000000..30dc4a1b9 --- /dev/null +++ b/include/eepp/ui/base.hpp @@ -0,0 +1,32 @@ +#ifndef EE_UI_BASE +#define EE_UI_BASE + +#include + +#include +#include +#include +#include +#include +#include +#include +using namespace EE::Utils; + +#include +using namespace EE::Math; + +#include +using namespace EE::System; + +#include +using namespace EE::Window; + +#include +#include +#include +#include +#include +#include +using namespace EE::Graphics; + +#endif diff --git a/src/ui/cuiaquatheme.hpp b/include/eepp/ui/cuiaquatheme.hpp similarity index 99% rename from src/ui/cuiaquatheme.hpp rename to include/eepp/ui/cuiaquatheme.hpp index 90e76bb9e..a7afa36ff 100644 --- a/src/ui/cuiaquatheme.hpp +++ b/include/eepp/ui/cuiaquatheme.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIAQUATHEME_HPP #define EE_UICUIAQUATHEME_HPP -#include "cuitheme.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuibackground.hpp b/include/eepp/ui/cuibackground.hpp similarity index 97% rename from src/ui/cuibackground.hpp rename to include/eepp/ui/cuibackground.hpp index 8a3cfc6f2..bd9bc6d0c 100644 --- a/src/ui/cuibackground.hpp +++ b/include/eepp/ui/cuibackground.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIBACKGROUND_HPP #define EE_UICUIBACKGROUND_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiborder.hpp b/include/eepp/ui/cuiborder.hpp similarity index 93% rename from src/ui/cuiborder.hpp rename to include/eepp/ui/cuiborder.hpp index 9019ef68d..edd6d0ee1 100644 --- a/src/ui/cuiborder.hpp +++ b/include/eepp/ui/cuiborder.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIBORDER_HPP #define EE_UICUIBORDER_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuicheckbox.hpp b/include/eepp/ui/cuicheckbox.hpp similarity index 93% rename from src/ui/cuicheckbox.hpp rename to include/eepp/ui/cuicheckbox.hpp index 6fa725508..9df7bae64 100644 --- a/src/ui/cuicheckbox.hpp +++ b/include/eepp/ui/cuicheckbox.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUICHECKBOX_H #define EE_UICUICHECKBOX_H -#include "cuitextbox.hpp" -#include "cuipushbutton.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicombobox.hpp b/include/eepp/ui/cuicombobox.hpp similarity index 94% rename from src/ui/cuicombobox.hpp rename to include/eepp/ui/cuicombobox.hpp index 1c226fc93..6c8025987 100644 --- a/src/ui/cuicombobox.hpp +++ b/include/eepp/ui/cuicombobox.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUICOMBOBOX_HPP #define EE_UICUICOMBOBOX_HPP -#include "cuidropdownlist.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuicommondialog.hpp b/include/eepp/ui/cuicommondialog.hpp similarity index 89% rename from src/ui/cuicommondialog.hpp rename to include/eepp/ui/cuicommondialog.hpp index 184ed9e03..2885809eb 100644 --- a/src/ui/cuicommondialog.hpp +++ b/include/eepp/ui/cuicommondialog.hpp @@ -1,13 +1,13 @@ #ifndef EE_UICUICOMMONDIALOG_HPP #define EE_UICUICOMMONDIALOG_HPP -#include "base.hpp" -#include "cuicomplexcontrol.hpp" -#include "cuipushbutton.hpp" -#include "cuilistbox.hpp" -#include "cuitextinput.hpp" -#include "cuicombobox.hpp" -#include "cuiwindow.hpp" +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicomplexcontrol.hpp b/include/eepp/ui/cuicomplexcontrol.hpp similarity index 95% rename from src/ui/cuicomplexcontrol.hpp rename to include/eepp/ui/cuicomplexcontrol.hpp index 83d39c3d5..9e518c23a 100644 --- a/src/ui/cuicomplexcontrol.hpp +++ b/include/eepp/ui/cuicomplexcontrol.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUICOMPLEXCONTROL_HPP #define EE_UICUICOMPLEXCONTROL_HPP -#include "cuicontrolanim.hpp" -#include "cuitooltip.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicontrol.hpp b/include/eepp/ui/cuicontrol.hpp similarity index 94% rename from src/ui/cuicontrol.hpp rename to include/eepp/ui/cuicontrol.hpp index 12126ed13..2d3f9015b 100644 --- a/src/ui/cuicontrol.hpp +++ b/include/eepp/ui/cuicontrol.hpp @@ -1,20 +1,20 @@ #ifndef EE_UICUICONTROL_H #define EE_UICUICONTROL_H -#include "base.hpp" -#include "uihelper.hpp" -#include "cuibackground.hpp" -#include "cuiborder.hpp" -#include "cuimessage.hpp" -#include "cuievent.hpp" -#include "cuieventkey.hpp" -#include "cuieventmouse.hpp" -#include "cuiskin.hpp" -#include "cuiskinstate.hpp" -#include "cuiskinsimple.hpp" -#include "cuiskincomplex.hpp" -#include "cuitheme.hpp" -#include "cuithememanager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicontrolanim.hpp b/include/eepp/ui/cuicontrolanim.hpp similarity index 96% rename from src/ui/cuicontrolanim.hpp rename to include/eepp/ui/cuicontrolanim.hpp index dca6f843b..795dd4c5c 100644 --- a/src/ui/cuicontrolanim.hpp +++ b/include/eepp/ui/cuicontrolanim.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUICONTROLANIM_H #define EE_UICUICONTROLANIM_H -#include "base.hpp" -#include "cuicontrol.hpp" -#include "cuidragable.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuidragable.hpp b/include/eepp/ui/cuidragable.hpp similarity index 96% rename from src/ui/cuidragable.hpp rename to include/eepp/ui/cuidragable.hpp index 7014bbece..556e5be37 100644 --- a/src/ui/cuidragable.hpp +++ b/include/eepp/ui/cuidragable.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIDRAGABLE_H #define EE_UICUIDRAGABLE_H -#include "cuicontrol.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuidropdownlist.hpp b/include/eepp/ui/cuidropdownlist.hpp similarity index 95% rename from src/ui/cuidropdownlist.hpp rename to include/eepp/ui/cuidropdownlist.hpp index 78f3be47b..fa979ad04 100644 --- a/src/ui/cuidropdownlist.hpp +++ b/include/eepp/ui/cuidropdownlist.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUIDROPDOWNLIST_HPP #define EE_UICUIDROPDOWNLIST_HPP -#include "cuitextinput.hpp" -#include "cuilistbox.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuievent.hpp b/include/eepp/ui/cuievent.hpp similarity index 98% rename from src/ui/cuievent.hpp rename to include/eepp/ui/cuievent.hpp index f9c793c51..2cb089640 100644 --- a/src/ui/cuievent.hpp +++ b/include/eepp/ui/cuievent.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIEVENT_HPP #define EE_UICUIEVENT_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuieventkey.hpp b/include/eepp/ui/cuieventkey.hpp similarity index 88% rename from src/ui/cuieventkey.hpp rename to include/eepp/ui/cuieventkey.hpp index 02ae50c45..23b2c6ed7 100644 --- a/src/ui/cuieventkey.hpp +++ b/include/eepp/ui/cuieventkey.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUIEVENTKEY_HPP #define EE_UICUIEVENTKEY_HPP -#include "base.hpp" -#include "cuievent.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuieventmouse.hpp b/include/eepp/ui/cuieventmouse.hpp similarity index 87% rename from src/ui/cuieventmouse.hpp rename to include/eepp/ui/cuieventmouse.hpp index 37bd9a685..5666f5b73 100644 --- a/src/ui/cuieventmouse.hpp +++ b/include/eepp/ui/cuieventmouse.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUIEVENTMOUSE_HPP #define EE_UICUIEVENTMOUSE_HPP -#include "base.hpp" -#include "cuievent.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuigenericgrid.hpp b/include/eepp/ui/cuigenericgrid.hpp similarity index 95% rename from src/ui/cuigenericgrid.hpp rename to include/eepp/ui/cuigenericgrid.hpp index 28be03abc..934dd559f 100644 --- a/src/ui/cuigenericgrid.hpp +++ b/include/eepp/ui/cuigenericgrid.hpp @@ -1,10 +1,10 @@ #ifndef EE_UICUIGENERICGRID_HPP #define EE_UICUIGENERICGRID_HPP -#include "cuicontrolanim.hpp" -#include "cuigridcell.hpp" -#include "cuiscrollbar.hpp" -#include "tuiitemcontainer.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuigfx.hpp b/include/eepp/ui/cuigfx.hpp similarity index 96% rename from src/ui/cuigfx.hpp rename to include/eepp/ui/cuigfx.hpp index 85c055d10..a79da1479 100644 --- a/src/ui/cuigfx.hpp +++ b/include/eepp/ui/cuigfx.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIGFX_H #define EE_UICUIGFX_H -#include "cuicomplexcontrol.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuigridcell.hpp b/include/eepp/ui/cuigridcell.hpp similarity index 91% rename from src/ui/cuigridcell.hpp rename to include/eepp/ui/cuigridcell.hpp index e6f85071e..669ea6dd8 100644 --- a/src/ui/cuigridcell.hpp +++ b/include/eepp/ui/cuigridcell.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUIGRIDCELL_HPP #define EE_UICUIGRIDCELL_HPP -#include "cuicomplexcontrol.hpp" -#include "tuiitemcontainer.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuilistbox.hpp b/include/eepp/ui/cuilistbox.hpp similarity index 97% rename from src/ui/cuilistbox.hpp rename to include/eepp/ui/cuilistbox.hpp index 57b37f13b..ead786f74 100644 --- a/src/ui/cuilistbox.hpp +++ b/include/eepp/ui/cuilistbox.hpp @@ -1,10 +1,10 @@ #ifndef EE_UICUILISTBOX_HPP #define EE_UICUILISTBOX_HPP -#include "cuicontrolanim.hpp" -#include "cuiscrollbar.hpp" -#include "tuiitemcontainer.hpp" -#include "cuilistboxitem.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuilistboxitem.hpp b/include/eepp/ui/cuilistboxitem.hpp similarity index 90% rename from src/ui/cuilistboxitem.hpp rename to include/eepp/ui/cuilistboxitem.hpp index 59b2b5b02..2e98f263e 100644 --- a/src/ui/cuilistboxitem.hpp +++ b/include/eepp/ui/cuilistboxitem.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUILISTBOXITEM_HPP #define EE_UICUILISTBOXITEM_HPP -#include "cuitextbox.hpp" -#include "tuiitemcontainer.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimanager.hpp b/include/eepp/ui/cuimanager.hpp similarity index 95% rename from src/ui/cuimanager.hpp rename to include/eepp/ui/cuimanager.hpp index 110e3bfd0..94b71285c 100644 --- a/src/ui/cuimanager.hpp +++ b/include/eepp/ui/cuimanager.hpp @@ -1,10 +1,10 @@ #ifndef EE_UICUIMANAGER_H #define EE_UICUIMANAGER_H -#include "cuicontrol.hpp" -#include "cuiwindow.hpp" -#include "../window/cinput.hpp" -#include "../window/cwindow.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenu.hpp b/include/eepp/ui/cuimenu.hpp similarity index 95% rename from src/ui/cuimenu.hpp rename to include/eepp/ui/cuimenu.hpp index e5d5cfa63..2a9414aba 100644 --- a/src/ui/cuimenu.hpp +++ b/include/eepp/ui/cuimenu.hpp @@ -1,11 +1,11 @@ #ifndef EE_UICUIMENU_HPP #define EE_UICUIMENU_HPP -#include "cuicontrolanim.hpp" -#include "cuimenuitem.hpp" -#include "cuimenucheckbox.hpp" -#include "cuimenusubmenu.hpp" -#include "cuiseparator.hpp" +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenucheckbox.hpp b/include/eepp/ui/cuimenucheckbox.hpp similarity index 95% rename from src/ui/cuimenucheckbox.hpp rename to include/eepp/ui/cuimenucheckbox.hpp index aaf94635f..04fd1f8ef 100644 --- a/src/ui/cuimenucheckbox.hpp +++ b/include/eepp/ui/cuimenucheckbox.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIMENUCHECKBOX_HPP #define EE_UICUIMENUCHECKBOX_HPP -#include "cuimenuitem.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenuitem.hpp b/include/eepp/ui/cuimenuitem.hpp similarity index 93% rename from src/ui/cuimenuitem.hpp rename to include/eepp/ui/cuimenuitem.hpp index f940ad16d..039d76fe2 100644 --- a/src/ui/cuimenuitem.hpp +++ b/include/eepp/ui/cuimenuitem.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIMENUITEM_HPP #define EE_UICUIMENUITEM_HPP -#include "cuipushbutton.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenusubmenu.hpp b/include/eepp/ui/cuimenusubmenu.hpp similarity index 97% rename from src/ui/cuimenusubmenu.hpp rename to include/eepp/ui/cuimenusubmenu.hpp index 1e5797fc5..1b072773c 100644 --- a/src/ui/cuimenusubmenu.hpp +++ b/include/eepp/ui/cuimenusubmenu.hpp @@ -1,7 +1,7 @@ #ifndef EE_CUIMENUSUBMENU_HPP #define EE_CUIMENUSUBMENU_HPP -#include "cuimenuitem.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuimessage.hpp b/include/eepp/ui/cuimessage.hpp similarity index 96% rename from src/ui/cuimessage.hpp rename to include/eepp/ui/cuimessage.hpp index ae87093b3..ada290a02 100644 --- a/src/ui/cuimessage.hpp +++ b/include/eepp/ui/cuimessage.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIMESSAGE_HPP #define EE_UICUIMESSAGE_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuimessagebox.hpp b/include/eepp/ui/cuimessagebox.hpp similarity index 89% rename from src/ui/cuimessagebox.hpp rename to include/eepp/ui/cuimessagebox.hpp index 34e9dcd69..57f18f954 100644 --- a/src/ui/cuimessagebox.hpp +++ b/include/eepp/ui/cuimessagebox.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUIMESSAGEBOX_HPP #define EE_UICUIMESSAGEBOX_HPP -#include "cuiwindow.hpp" -#include "cuitextbox.hpp" -#include "cuipushbutton.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuipopupmenu.hpp b/include/eepp/ui/cuipopupmenu.hpp similarity index 94% rename from src/ui/cuipopupmenu.hpp rename to include/eepp/ui/cuipopupmenu.hpp index d4478f09d..124812631 100644 --- a/src/ui/cuipopupmenu.hpp +++ b/include/eepp/ui/cuipopupmenu.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUIPOPUPMENU #define EE_UICUIPOPUPMENU -#include "cuimenu.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiprogressbar.hpp b/include/eepp/ui/cuiprogressbar.hpp similarity index 93% rename from src/ui/cuiprogressbar.hpp rename to include/eepp/ui/cuiprogressbar.hpp index 328a2c4bd..5a02c67a2 100644 --- a/src/ui/cuiprogressbar.hpp +++ b/include/eepp/ui/cuiprogressbar.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICPROGRESSBAR_HPP #define EE_UICPROGRESSBAR_HPP -#include "cuicontrolanim.hpp" -#include "cuitextbox.hpp" -#include "../graphics/cscrollparallax.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuipushbutton.hpp b/include/eepp/ui/cuipushbutton.hpp similarity index 95% rename from src/ui/cuipushbutton.hpp rename to include/eepp/ui/cuipushbutton.hpp index 2b9883817..eb8eb26ad 100644 --- a/src/ui/cuipushbutton.hpp +++ b/include/eepp/ui/cuipushbutton.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUIPUSHBUTTON_HPP #define EE_UICUIPUSHBUTTON_HPP -#include "cuicomplexcontrol.hpp" -#include "cuitextbox.hpp" -#include "cuigfx.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiradiobutton.hpp b/include/eepp/ui/cuiradiobutton.hpp similarity index 93% rename from src/ui/cuiradiobutton.hpp rename to include/eepp/ui/cuiradiobutton.hpp index a4b2917bc..c01df5417 100644 --- a/src/ui/cuiradiobutton.hpp +++ b/include/eepp/ui/cuiradiobutton.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUIRADIOBUTTON_H #define EE_UICUIRADIOBUTTON_H -#include "cuitextbox.hpp" -#include "cuipushbutton.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiscrollbar.hpp b/include/eepp/ui/cuiscrollbar.hpp similarity index 95% rename from src/ui/cuiscrollbar.hpp rename to include/eepp/ui/cuiscrollbar.hpp index da9adfd64..a1f48369c 100644 --- a/src/ui/cuiscrollbar.hpp +++ b/include/eepp/ui/cuiscrollbar.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUISCROLLBAR_HPP #define EE_UICUISCROLLBAR_HPP -#include "cuicomplexcontrol.hpp" -#include "cuislider.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiselectbutton.hpp b/include/eepp/ui/cuiselectbutton.hpp similarity index 92% rename from src/ui/cuiselectbutton.hpp rename to include/eepp/ui/cuiselectbutton.hpp index 84974a949..198985109 100644 --- a/src/ui/cuiselectbutton.hpp +++ b/include/eepp/ui/cuiselectbutton.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUISELECTBUTTON_HPP #define EE_UICUISELECTBUTTON_HPP -#include "cuipushbutton.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiseparator.hpp b/include/eepp/ui/cuiseparator.hpp similarity index 91% rename from src/ui/cuiseparator.hpp rename to include/eepp/ui/cuiseparator.hpp index 44c22b10b..de6c31f3e 100644 --- a/src/ui/cuiseparator.hpp +++ b/include/eepp/ui/cuiseparator.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUISEPARATOR #define EE_UICUISEPARATOR -#include "cuicontrolanim.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskin.hpp b/include/eepp/ui/cuiskin.hpp similarity index 95% rename from src/ui/cuiskin.hpp rename to include/eepp/ui/cuiskin.hpp index e15c1f9f5..9cf2ff9ad 100644 --- a/src/ui/cuiskin.hpp +++ b/include/eepp/ui/cuiskin.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUISKIN_HPP #define EE_UICUISKIN_HPP -#include "base.hpp" -#include "cuiskinstate.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskincomplex.hpp b/include/eepp/ui/cuiskincomplex.hpp similarity index 94% rename from src/ui/cuiskincomplex.hpp rename to include/eepp/ui/cuiskincomplex.hpp index 2dfdeb6b3..2caf8c2cc 100644 --- a/src/ui/cuiskincomplex.hpp +++ b/include/eepp/ui/cuiskincomplex.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUISKINCOMPLEX_HPP #define EE_UICUISKINCOMPLEX_HPP -#include "base.hpp" -#include "cuiskin.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskinsimple.hpp b/include/eepp/ui/cuiskinsimple.hpp similarity index 92% rename from src/ui/cuiskinsimple.hpp rename to include/eepp/ui/cuiskinsimple.hpp index 7e30b3aac..92a625d4f 100644 --- a/src/ui/cuiskinsimple.hpp +++ b/include/eepp/ui/cuiskinsimple.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUISKINSIMPLE_HPP #define EE_UICUISKINSIMPLE_HPP -#include "base.hpp" -#include "cuiskin.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskinstate.hpp b/include/eepp/ui/cuiskinstate.hpp similarity index 97% rename from src/ui/cuiskinstate.hpp rename to include/eepp/ui/cuiskinstate.hpp index 16e533129..f9d829c47 100644 --- a/src/ui/cuiskinstate.hpp +++ b/include/eepp/ui/cuiskinstate.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUISKINSTATE_HPP #define EE_UICUISKINSTATE_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuislider.hpp b/include/eepp/ui/cuislider.hpp similarity index 95% rename from src/ui/cuislider.hpp rename to include/eepp/ui/cuislider.hpp index 40a2b3af9..f4152c322 100644 --- a/src/ui/cuislider.hpp +++ b/include/eepp/ui/cuislider.hpp @@ -1,8 +1,8 @@ #ifndef EE_UIcUISlider_HPP #define EE_UIcUISlider_HPP -#include "cuicomplexcontrol.hpp" -#include "cuisliderbutton.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuisliderbutton.hpp b/include/eepp/ui/cuisliderbutton.hpp similarity index 89% rename from src/ui/cuisliderbutton.hpp rename to include/eepp/ui/cuisliderbutton.hpp index 2b4b75ab1..a184da175 100644 --- a/src/ui/cuisliderbutton.hpp +++ b/include/eepp/ui/cuisliderbutton.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUISLIDERBUTTON_HPP #define EE_UICUISLIDERBUTTON_HPP -#include "cuicontrolanim.hpp" +#include namespace EE { namespace UI { namespace Private { diff --git a/src/ui/cuispinbox.hpp b/include/eepp/ui/cuispinbox.hpp similarity index 95% rename from src/ui/cuispinbox.hpp rename to include/eepp/ui/cuispinbox.hpp index 501deb1c1..8d615b6e5 100644 --- a/src/ui/cuispinbox.hpp +++ b/include/eepp/ui/cuispinbox.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUISPINBOX_HPP #define EE_UICUISPINBOX_HPP -#include "cuitextinput.hpp" -#include "cuipushbutton.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuisprite.hpp b/include/eepp/ui/cuisprite.hpp similarity index 96% rename from src/ui/cuisprite.hpp rename to include/eepp/ui/cuisprite.hpp index 7ecc719b0..ca5a7c96a 100644 --- a/src/ui/cuisprite.hpp +++ b/include/eepp/ui/cuisprite.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUISPRITE_HPP #define EE_UICUISPRITE_HPP -#include "cuicomplexcontrol.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuitab.hpp b/include/eepp/ui/cuitab.hpp similarity index 95% rename from src/ui/cuitab.hpp rename to include/eepp/ui/cuitab.hpp index 23ff4bc0e..993de3da4 100644 --- a/src/ui/cuitab.hpp +++ b/include/eepp/ui/cuitab.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUITAB_HPP #define EE_UICUITAB_HPP -#include "cuiselectbutton.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuitabwidget.hpp b/include/eepp/ui/cuitabwidget.hpp similarity index 98% rename from src/ui/cuitabwidget.hpp rename to include/eepp/ui/cuitabwidget.hpp index 1c028fa46..051e0c9a7 100644 --- a/src/ui/cuitabwidget.hpp +++ b/include/eepp/ui/cuitabwidget.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICUITABWIDGET_HPP #define EE_UICUITABWIDGET_HPP -#include "cuicomplexcontrol.hpp" -#include "cuitab.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextbox.hpp b/include/eepp/ui/cuitextbox.hpp similarity index 98% rename from src/ui/cuitextbox.hpp rename to include/eepp/ui/cuitextbox.hpp index bccfdc8c1..1c612ad25 100644 --- a/src/ui/cuitextbox.hpp +++ b/include/eepp/ui/cuitextbox.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUITEXTBOX_H #define EE_UICUITEXTBOX_H -#include "cuicomplexcontrol.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextedit.hpp b/include/eepp/ui/cuitextedit.hpp similarity index 94% rename from src/ui/cuitextedit.hpp rename to include/eepp/ui/cuitextedit.hpp index 5e2b849b6..858efb3eb 100644 --- a/src/ui/cuitextedit.hpp +++ b/include/eepp/ui/cuitextedit.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUITEXTEDIT_HPP #define EE_UICUITEXTEDIT_HPP -#include "cuicontrolanim.hpp" -#include "cuitextinput.hpp" -#include "cuiscrollbar.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextinput.hpp b/include/eepp/ui/cuitextinput.hpp similarity index 92% rename from src/ui/cuitextinput.hpp rename to include/eepp/ui/cuitextinput.hpp index a905b1e58..65615c29d 100644 --- a/src/ui/cuitextinput.hpp +++ b/include/eepp/ui/cuitextinput.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUITEXTINPUT_H #define EE_UICUITEXTINPUT_H -#include "cuicontrolanim.hpp" -#include "cuitextbox.hpp" -#include "../window/cinputtextbuffer.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitheme.hpp b/include/eepp/ui/cuitheme.hpp similarity index 98% rename from src/ui/cuitheme.hpp rename to include/eepp/ui/cuitheme.hpp index cf98a1665..97aa61117 100644 --- a/src/ui/cuitheme.hpp +++ b/include/eepp/ui/cuitheme.hpp @@ -1,11 +1,11 @@ #ifndef EE_UICUITHEME_HPP #define EE_UICUITHEME_HPP -#include "base.hpp" -#include "uihelper.hpp" -#include "../graphics/cshapegroup.hpp" -#include "../graphics/cfont.hpp" -#include "cuiskin.hpp" +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuithememanager.hpp b/include/eepp/ui/cuithememanager.hpp similarity index 96% rename from src/ui/cuithememanager.hpp rename to include/eepp/ui/cuithememanager.hpp index 3c628b3bc..fd13b660e 100644 --- a/src/ui/cuithememanager.hpp +++ b/include/eepp/ui/cuithememanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_UICTHEMEMANAGER #define EE_UICTHEMEMANAGER -#include "base.hpp" -#include "cuitheme.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitooltip.hpp b/include/eepp/ui/cuitooltip.hpp similarity index 98% rename from src/ui/cuitooltip.hpp rename to include/eepp/ui/cuitooltip.hpp index 0dfca30a7..50147fc4e 100644 --- a/src/ui/cuitooltip.hpp +++ b/include/eepp/ui/cuitooltip.hpp @@ -1,7 +1,7 @@ #ifndef EE_UICUITOOLTIP_HPP #define EE_UICUITOOLTIP_HPP -#include "cuicontrolanim.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiwindow.hpp b/include/eepp/ui/cuiwindow.hpp similarity index 97% rename from src/ui/cuiwindow.hpp rename to include/eepp/ui/cuiwindow.hpp index 017256835..3c405df19 100644 --- a/src/ui/cuiwindow.hpp +++ b/include/eepp/ui/cuiwindow.hpp @@ -1,9 +1,9 @@ #ifndef EE_UICUIWINDOW_HPP #define EE_UICUIWINDOW_HPP -#include "cuicomplexcontrol.hpp" -#include "cuipushbutton.hpp" -#include "cuitextbox.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiwinmenu.hpp b/include/eepp/ui/cuiwinmenu.hpp similarity index 95% rename from src/ui/cuiwinmenu.hpp rename to include/eepp/ui/cuiwinmenu.hpp index 183aeee89..e645c03c0 100644 --- a/src/ui/cuiwinmenu.hpp +++ b/include/eepp/ui/cuiwinmenu.hpp @@ -1,10 +1,10 @@ #ifndef EE_UICUIWINMENU_HPP #define EE_UICUIWINMENU_HPP -#include "base.hpp" -#include "cuicomplexcontrol.hpp" -#include "cuiselectbutton.hpp" -#include "cuipopupmenu.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/tools/ctexturegroupeditor.hpp b/include/eepp/ui/tools/ctexturegroupeditor.hpp similarity index 86% rename from src/ui/tools/ctexturegroupeditor.hpp rename to include/eepp/ui/tools/ctexturegroupeditor.hpp index 1c45f492e..44fd4072e 100644 --- a/src/ui/tools/ctexturegroupeditor.hpp +++ b/include/eepp/ui/tools/ctexturegroupeditor.hpp @@ -1,15 +1,15 @@ #ifndef EE_UITOOLSCTEXTUREGROUPEDITOR_HPP #define EE_UITOOLSCTEXTUREGROUPEDITOR_HPP -#include "../base.hpp" -#include "ctexturegroupshapeeditor.hpp" -#include "../cuiwindow.hpp" -#include "../cuispinbox.hpp" -#include "../cuilistbox.hpp" -#include "../cuiwinmenu.hpp" -#include "../../graphics/ctexturepacker.hpp" -#include "../../graphics/ctexturegrouploader.hpp" -#include "../../graphics/cshapegroupmanager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/tools/ctexturegroupnew.hpp b/include/eepp/ui/tools/ctexturegroupnew.hpp similarity index 82% rename from src/ui/tools/ctexturegroupnew.hpp rename to include/eepp/ui/tools/ctexturegroupnew.hpp index 67206df92..865d12f97 100644 --- a/src/ui/tools/ctexturegroupnew.hpp +++ b/include/eepp/ui/tools/ctexturegroupnew.hpp @@ -1,12 +1,12 @@ #ifndef EE_UITOOLSCTEXTUREGROUPNEW_HPP #define EE_UITOOLSCTEXTUREGROUPNEW_HPP -#include "../base.hpp" -#include "../cuiwindow.hpp" -#include "../cuicombobox.hpp" -#include "../cuispinbox.hpp" -#include "../cuipushbutton.hpp" -#include "../../graphics/ctexturepacker.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/tools/ctexturegroupshapeeditor.hpp b/include/eepp/ui/tools/ctexturegroupshapeeditor.hpp similarity index 84% rename from src/ui/tools/ctexturegroupshapeeditor.hpp rename to include/eepp/ui/tools/ctexturegroupshapeeditor.hpp index 6ac270426..323e3c2c7 100644 --- a/src/ui/tools/ctexturegroupshapeeditor.hpp +++ b/include/eepp/ui/tools/ctexturegroupshapeeditor.hpp @@ -1,10 +1,10 @@ #ifndef EE_UITOOLSCTEXTUREGROUPSHAPEEDITOR_HPP #define EE_UITOOLSCTEXTUREGROUPSHAPEEDITOR_HPP -#include "../base.hpp" -#include "../cuicomplexcontrol.hpp" -#include "../../graphics/cshape.hpp" -#include "../cuigfx.hpp" +#include +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/tuiitemcontainer.hpp b/include/eepp/ui/tuiitemcontainer.hpp similarity index 98% rename from src/ui/tuiitemcontainer.hpp rename to include/eepp/ui/tuiitemcontainer.hpp index 301a9c13b..433eb4404 100644 --- a/src/ui/tuiitemcontainer.hpp +++ b/include/eepp/ui/tuiitemcontainer.hpp @@ -1,7 +1,7 @@ #ifndef EE_UITUIITEMCONTAINER_HPP #define EE_UITUIITEMCONTAINER_HPP -#include "cuicontrol.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/uihelper.hpp b/include/eepp/ui/uihelper.hpp similarity index 99% rename from src/ui/uihelper.hpp rename to include/eepp/ui/uihelper.hpp index d66e40cd4..b0172bb19 100644 --- a/src/ui/uihelper.hpp +++ b/include/eepp/ui/uihelper.hpp @@ -1,7 +1,7 @@ #ifndef EE_UIHELPER_HPP #define EE_UIHELPER_HPP -#include "base.hpp" +#include namespace EE { namespace UI { diff --git a/include/eepp/utils/base.hpp b/include/eepp/utils/base.hpp new file mode 100644 index 000000000..5798b7c44 --- /dev/null +++ b/include/eepp/utils/base.hpp @@ -0,0 +1,7 @@ +#ifndef EE_UTILS_BASE +#define EE_UTILS_BASE + +#include +#include + +#endif diff --git a/src/utils/cinterpolation.hpp b/include/eepp/utils/cinterpolation.hpp similarity index 99% rename from src/utils/cinterpolation.hpp rename to include/eepp/utils/cinterpolation.hpp index cbb95d813..8caf1ffd8 100644 --- a/src/utils/cinterpolation.hpp +++ b/include/eepp/utils/cinterpolation.hpp @@ -1,7 +1,7 @@ #ifndef EE_UTILSCINTERPOLATION_H #define EE_UTILSCINTERPOLATION_H -#include "base.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/colors.hpp b/include/eepp/utils/colors.hpp similarity index 100% rename from src/utils/colors.hpp rename to include/eepp/utils/colors.hpp diff --git a/src/utils/cperlinnoise.hpp b/include/eepp/utils/cperlinnoise.hpp similarity index 98% rename from src/utils/cperlinnoise.hpp rename to include/eepp/utils/cperlinnoise.hpp index 95f3a43e5..8445ef6d9 100755 --- a/src/utils/cperlinnoise.hpp +++ b/include/eepp/utils/cperlinnoise.hpp @@ -7,7 +7,7 @@ http://www.animeimaging.com/asp/PerlinNoise.aspx - by James Long And for the C++ implementation of Henrik Krysell. */ -#include "base.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/cwaypoints.hpp b/include/eepp/utils/cwaypoints.hpp similarity index 98% rename from src/utils/cwaypoints.hpp rename to include/eepp/utils/cwaypoints.hpp index cd6d1990b..99332fa8f 100755 --- a/src/utils/cwaypoints.hpp +++ b/include/eepp/utils/cwaypoints.hpp @@ -1,8 +1,8 @@ #ifndef EE_UTILSCWAYPOINTS_H #define EE_UTILSCWAYPOINTS_H -#include "base.hpp" -#include "vector2.hpp" +#include +#include namespace EE { namespace Utils { diff --git a/src/utils/easing.hpp b/include/eepp/utils/easing.hpp similarity index 99% rename from src/utils/easing.hpp rename to include/eepp/utils/easing.hpp index bca06f125..4f59772b6 100644 --- a/src/utils/easing.hpp +++ b/include/eepp/utils/easing.hpp @@ -1,7 +1,7 @@ #ifndef EE_UTILS_EASINGEASING_H #define EE_UTILS_EASINGEASING_H -#include "base.hpp" +#include namespace EE { namespace Utils { namespace easing { diff --git a/src/utils/helper.hpp b/include/eepp/utils/helper.hpp similarity index 100% rename from src/utils/helper.hpp rename to include/eepp/utils/helper.hpp diff --git a/src/utils/line2.hpp b/include/eepp/utils/line2.hpp similarity index 100% rename from src/utils/line2.hpp rename to include/eepp/utils/line2.hpp diff --git a/src/utils/polygon2.hpp b/include/eepp/utils/polygon2.hpp similarity index 97% rename from src/utils/polygon2.hpp rename to include/eepp/utils/polygon2.hpp index 56de755ac..6cd2a6c7b 100755 --- a/src/utils/polygon2.hpp +++ b/include/eepp/utils/polygon2.hpp @@ -1,9 +1,9 @@ #ifndef EE_UTILSPOLIGON2_H #define EE_UTILSPOLIGON2_H -#include "triangle2.hpp" -#include "quad2.hpp" -#include "rect.hpp" +#include +#include +#include namespace EE { namespace Utils { diff --git a/src/utils/quad2.hpp b/include/eepp/utils/quad2.hpp similarity index 100% rename from src/utils/quad2.hpp rename to include/eepp/utils/quad2.hpp diff --git a/src/utils/rect.hpp b/include/eepp/utils/rect.hpp similarity index 98% rename from src/utils/rect.hpp rename to include/eepp/utils/rect.hpp index 9f68af4ba..a2ea05946 100755 --- a/src/utils/rect.hpp +++ b/include/eepp/utils/rect.hpp @@ -1,8 +1,8 @@ #ifndef EE_UTILSCRECT_H #define EE_UTILSCRECT_H -#include "vector2.hpp" -#include "size.hpp" +#include +#include namespace EE { namespace Utils { diff --git a/src/utils/safedatapointer.hpp b/include/eepp/utils/safedatapointer.hpp similarity index 88% rename from src/utils/safedatapointer.hpp rename to include/eepp/utils/safedatapointer.hpp index ee187b4af..42cc2497b 100644 --- a/src/utils/safedatapointer.hpp +++ b/include/eepp/utils/safedatapointer.hpp @@ -1,7 +1,7 @@ #ifndef EE_UTILS_SAFEDATAPOINTER #define EE_UTILS_SAFEDATAPOINTER -#include "base.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/size.hpp b/include/eepp/utils/size.hpp similarity index 100% rename from src/utils/size.hpp rename to include/eepp/utils/size.hpp diff --git a/src/utils/string.hpp b/include/eepp/utils/string.hpp similarity index 99% rename from src/utils/string.hpp rename to include/eepp/utils/string.hpp index 575356a0a..550401e9b 100755 --- a/src/utils/string.hpp +++ b/include/eepp/utils/string.hpp @@ -1,7 +1,7 @@ #ifndef EE_UTILSCSTRING_H #define EE_UTILSCSTRING_H -#include "base.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/triangle2.hpp b/include/eepp/utils/triangle2.hpp similarity index 100% rename from src/utils/triangle2.hpp rename to include/eepp/utils/triangle2.hpp diff --git a/src/utils/utils.hpp b/include/eepp/utils/utils.hpp similarity index 98% rename from src/utils/utils.hpp rename to include/eepp/utils/utils.hpp index 2e1bcd4bf..4f73f2df3 100755 --- a/src/utils/utils.hpp +++ b/include/eepp/utils/utils.hpp @@ -1,8 +1,8 @@ #ifndef EE_UTILSCUTILS_H #define EE_UTILSCUTILS_H -#include "base.hpp" -#include "safedatapointer.hpp" +#include +#include namespace EE { namespace Utils { /** @return True if the file exists ( false if is a directory, to know if directory exists use IsDirectory ) */ diff --git a/src/utils/vector2.hpp b/include/eepp/utils/vector2.hpp similarity index 100% rename from src/utils/vector2.hpp rename to include/eepp/utils/vector2.hpp diff --git a/src/utils/vector3.hpp b/include/eepp/utils/vector3.hpp similarity index 100% rename from src/utils/vector3.hpp rename to include/eepp/utils/vector3.hpp diff --git a/src/window/base.hpp b/include/eepp/window/base.hpp similarity index 68% rename from src/window/base.hpp rename to include/eepp/window/base.hpp index 1f35a80e7..90d70980c 100644 --- a/src/window/base.hpp +++ b/include/eepp/window/base.hpp @@ -1,25 +1,30 @@ #ifndef EE_WINDOW_BASE #define EE_WINDOW_BASE -#include "../base.hpp" +#include -#include "../utils/colors.hpp" -#include "../utils/rect.hpp" -#include "../utils/vector2.hpp" -#include "../utils/string.hpp" -#include "../utils/utils.hpp" +#include +#include +#include +#include +#include using namespace EE::Utils; -#include "../system/ctimeelapsed.hpp" -#include "../system/tsingleton.hpp" -#include "../system/clog.hpp" +#include +#include +#include using namespace EE::System; -#include "../graphics/renders.hpp" -#include "../graphics/glhelper.hpp" +#include +#include using namespace EE::Graphics; #if EE_PLATFORM == EE_PLATFORM_WIN + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include + inline BOOL WIN_ShowWindow( HWND hWnd, int nCmdShow ) { return ShowWindow( hWnd, nCmdShow ); } @@ -52,12 +57,12 @@ using namespace EE::Graphics; #ifdef EE_GLEW_AVAILABLE #if EE_PLATFORM == EE_PLATFORM_WIN - #include "../helper/glew/wglew.h" + #include typedef HGLRC eeWindowContex; #elif defined( EE_X11_PLATFORM ) - #include "../helper/glew/glxew.h" + #include typedef GLXContext eeWindowContex; #elif EE_PLATFORM == EE_PLATFORM_MACOSX @@ -69,6 +74,6 @@ using namespace EE::Graphics; typedef unsigned int eeWindowContex; //! Fallback #endif -#include "keycodes.hpp" +#include #endif diff --git a/src/window/cbackend.hpp b/include/eepp/window/cbackend.hpp similarity index 90% rename from src/window/cbackend.hpp rename to include/eepp/window/cbackend.hpp index 6869a6d41..ebf07af9d 100644 --- a/src/window/cbackend.hpp +++ b/include/eepp/window/cbackend.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCBACKEND_HPP #define EE_WINDOWCBACKEND_HPP -#include "../base.hpp" +#include namespace EE { namespace Window { namespace Backend { diff --git a/src/window/cclipboard.hpp b/include/eepp/window/cclipboard.hpp similarity index 95% rename from src/window/cclipboard.hpp rename to include/eepp/window/cclipboard.hpp index 33704313e..dec3696ae 100644 --- a/src/window/cclipboard.hpp +++ b/include/eepp/window/cclipboard.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCLIPBOARD_HPP #define EE_WINDOWCCLIPBOARD_HPP -#include "cwindow.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/ccursor.hpp b/include/eepp/window/ccursor.hpp similarity index 85% rename from src/window/ccursor.hpp rename to include/eepp/window/ccursor.hpp index f3c358dbf..8a1a4d2d6 100644 --- a/src/window/ccursor.hpp +++ b/include/eepp/window/ccursor.hpp @@ -1,13 +1,13 @@ #ifndef EE_WINDOWCCURSOR_HPP #define EE_WINDOWCCURSOR_HPP -#include "base.hpp" +#include -#include "../graphics/cimage.hpp" -#include "../graphics/ctexture.hpp" +#include +#include using namespace EE::Graphics; -#include "cwindow.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/ccursormanager.hpp b/include/eepp/window/ccursormanager.hpp similarity index 88% rename from src/window/ccursormanager.hpp rename to include/eepp/window/ccursormanager.hpp index 6d74e5992..efecd2351 100644 --- a/src/window/ccursormanager.hpp +++ b/include/eepp/window/ccursormanager.hpp @@ -1,15 +1,15 @@ #ifndef EE_WINDOWCCURSORMANAGER_HPP #define EE_WINDOWCCURSORMANAGER_HPP -#include "base.hpp" +#include -#include "../graphics/cimage.hpp" -#include "../graphics/ctexture.hpp" +#include +#include using namespace EE::Graphics; -#include "cwindow.hpp" -#include "cursorhelper.hpp" -#include "ccursor.hpp" +#include +#include +#include using namespace EE::Window::Cursor; namespace EE { namespace Window { diff --git a/src/window/cengine.hpp b/include/eepp/window/cengine.hpp similarity index 93% rename from src/window/cengine.hpp rename to include/eepp/window/cengine.hpp index c5d862510..031ed3ebb 100755 --- a/src/window/cengine.hpp +++ b/include/eepp/window/cengine.hpp @@ -1,9 +1,9 @@ #ifndef EE_WINDOWCENGINE_H #define EE_WINDOWCENGINE_H -#include "base.hpp" -#include "cbackend.hpp" -#include "cwindow.hpp" +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/cinput.hpp b/include/eepp/window/cinput.hpp similarity index 96% rename from src/window/cinput.hpp rename to include/eepp/window/cinput.hpp index 48e8265c6..001e676b9 100644 --- a/src/window/cinput.hpp +++ b/include/eepp/window/cinput.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCINPUT_H #define EE_WINDOWCINPUT_H -#include "base.hpp" -#include "cwindow.hpp" -#include "inputhelper.hpp" -#include "inputevent.hpp" -#include "cjoystickmanager.hpp" -#include "cinputfinger.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/cinputfinger.hpp b/include/eepp/window/cinputfinger.hpp similarity index 93% rename from src/window/cinputfinger.hpp rename to include/eepp/window/cinputfinger.hpp index 11bc3c10e..d89b03f8e 100644 --- a/src/window/cinputfinger.hpp +++ b/include/eepp/window/cinputfinger.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOW_CINPUTFINGER_HPP #define EE_WINDOW_CINPUTFINGER_HPP -#include "base.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cinputtextbuffer.hpp b/include/eepp/window/cinputtextbuffer.hpp similarity index 97% rename from src/window/cinputtextbuffer.hpp rename to include/eepp/window/cinputtextbuffer.hpp index 59bb11de7..d06046e89 100755 --- a/src/window/cinputtextbuffer.hpp +++ b/include/eepp/window/cinputtextbuffer.hpp @@ -1,9 +1,9 @@ #ifndef EE_WINDOWCINPUTTEXTBUFFER_H #define EE_WINDOWCINPUTTEXTBUFFER_H -#include "base.hpp" -#include "cinput.hpp" -#include "cwindow.hpp" +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/cjoystick.hpp b/include/eepp/window/cjoystick.hpp similarity index 94% rename from src/window/cjoystick.hpp rename to include/eepp/window/cjoystick.hpp index bc8e83cb4..a3f08f172 100644 --- a/src/window/cjoystick.hpp +++ b/include/eepp/window/cjoystick.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCJOYSTICK_HPP #define EE_WINDOWCJOYSTICK_HPP -#include "base.hpp" -#include "joycodes.hpp" +#include +#include namespace EE { namespace Window { diff --git a/src/window/cjoystickmanager.hpp b/include/eepp/window/cjoystickmanager.hpp similarity index 89% rename from src/window/cjoystickmanager.hpp rename to include/eepp/window/cjoystickmanager.hpp index 1d8a14f93..51aea673f 100644 --- a/src/window/cjoystickmanager.hpp +++ b/include/eepp/window/cjoystickmanager.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCJOYSTICKMANAGER_HPP #define EE_WINDOWCJOYSTICKMANAGER_HPP -#include "base.hpp" -#include "cjoystick.hpp" +#include +#include namespace EE { namespace Window { diff --git a/src/window/cplatformimpl.hpp b/include/eepp/window/cplatformimpl.hpp similarity index 95% rename from src/window/cplatformimpl.hpp rename to include/eepp/window/cplatformimpl.hpp index fc98a4367..cc91b5cfe 100644 --- a/src/window/cplatformimpl.hpp +++ b/include/eepp/window/cplatformimpl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCPLATFORMIMPL_HPP #define EE_WINDOWCPLATFORMIMPL_HPP -#include "base.hpp" -#include "cursorhelper.hpp" +#include +#include namespace EE { diff --git a/src/window/cursorhelper.hpp b/include/eepp/window/cursorhelper.hpp similarity index 100% rename from src/window/cursorhelper.hpp rename to include/eepp/window/cursorhelper.hpp diff --git a/src/window/cview.hpp b/include/eepp/window/cview.hpp similarity index 97% rename from src/window/cview.hpp rename to include/eepp/window/cview.hpp index bdb9d01d5..7ccb16d71 100755 --- a/src/window/cview.hpp +++ b/include/eepp/window/cview.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCVIEW_H #define EE_WINDOWCVIEW_H -#include "base.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cwindow.hpp b/include/eepp/window/cwindow.hpp similarity index 98% rename from src/window/cwindow.hpp rename to include/eepp/window/cwindow.hpp index ff257408b..e64b4c127 100644 --- a/src/window/cwindow.hpp +++ b/include/eepp/window/cwindow.hpp @@ -1,9 +1,9 @@ #ifndef EE_WINDOWCWINDOW_HPP #define EE_WINDOWCWINDOW_HPP -#include "base.hpp" -#include "cview.hpp" -#include "cplatformimpl.hpp" +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/inputevent.hpp b/include/eepp/window/inputevent.hpp similarity index 100% rename from src/window/inputevent.hpp rename to include/eepp/window/inputevent.hpp diff --git a/src/window/inputhelper.hpp b/include/eepp/window/inputhelper.hpp similarity index 86% rename from src/window/inputhelper.hpp rename to include/eepp/window/inputhelper.hpp index f5d50e1de..41e5acf26 100644 --- a/src/window/inputhelper.hpp +++ b/include/eepp/window/inputhelper.hpp @@ -1,8 +1,7 @@ #ifndef EE_INPUT_HELPER_HPP #define EE_INPUT_HELPER_HPP -#include "../base.hpp" -#include "base.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/joycodes.hpp b/include/eepp/window/joycodes.hpp similarity index 100% rename from src/window/joycodes.hpp rename to include/eepp/window/joycodes.hpp diff --git a/src/window/keycodes.hpp b/include/eepp/window/keycodes.hpp similarity index 100% rename from src/window/keycodes.hpp rename to include/eepp/window/keycodes.hpp diff --git a/android-project/AndroidManifest.xml b/projects/android-project/AndroidManifest.xml similarity index 100% rename from android-project/AndroidManifest.xml rename to projects/android-project/AndroidManifest.xml diff --git a/projects/android-project/README b/projects/android-project/README new file mode 100644 index 000000000..eac676b3d --- /dev/null +++ b/projects/android-project/README @@ -0,0 +1,5 @@ +Inside: + +src/eepp/helper/android/SDL2/include/ + +add a symbolic link to the same folder in a subfolder called SDL ( ln -s . SDL ) diff --git a/android-project/build.properties b/projects/android-project/build.properties similarity index 100% rename from android-project/build.properties rename to projects/android-project/build.properties diff --git a/android-project/build.xml b/projects/android-project/build.xml similarity index 100% rename from android-project/build.xml rename to projects/android-project/build.xml diff --git a/android-project/clean.sh b/projects/android-project/clean.sh similarity index 100% rename from android-project/clean.sh rename to projects/android-project/clean.sh diff --git a/android-project/compile.sh b/projects/android-project/compile.sh similarity index 100% rename from android-project/compile.sh rename to projects/android-project/compile.sh diff --git a/android-project/data.sh b/projects/android-project/data.sh similarity index 100% rename from android-project/data.sh rename to projects/android-project/data.sh diff --git a/android-project/default.properties b/projects/android-project/default.properties similarity index 100% rename from android-project/default.properties rename to projects/android-project/default.properties diff --git a/android-project/jni/Android.mk b/projects/android-project/jni/Android.mk similarity index 75% rename from android-project/jni/Android.mk rename to projects/android-project/jni/Android.mk index 7f7209b4d..c31738d7d 100644 --- a/android-project/jni/Android.mk +++ b/projects/android-project/jni/Android.mk @@ -1,15 +1,21 @@ LOCAL_PATH := $(call my-dir) -MY_PATH := $(LOCAL_PATH)/src +MY_PATH := $(LOCAL_PATH)/../../../src/eepp +INC_PATH := $(LOCAL_PATH)/../../../include +BASE_PATH := $(LOCAL_PATH)/../../../src -MY_SDL_PATH := $(MY_PATH)/helper/android/SDL1.3 -MY_SDL_MAIN_PATH := helper/android/SDL1.3/src/main/android/*.cpp +MY_SDL_PATH := $(MY_PATH)/helper/SDL2 +MY_SDL_MAIN_PATH := helper/SDL2/src/main/android/*.cpp MY_C_INCLUDES := \ $(MY_PATH)/helper/android/openal/include/ \ $(MY_PATH)/helper/freetype2/include \ $(MY_SDL_PATH)/include \ - $(MY_PATH)/helper/chipmunk - + $(MY_PATH)/helper/chipmunk \ + $(INC_PATH)/eepp/helper/chipmunk \ + $(INC_PATH)/eepp/helper/SOIL \ + $(INC_PATH)/eepp/helper/stb_vorbis \ + $(INC_PATH)/eepp/helper/chipmunk + MY_C_FLAGS := -DANDROID \ -DANDROID_NDK \ -DDISABLE_IMPORTGL \ @@ -17,7 +23,9 @@ MY_C_FLAGS := -DANDROID \ -Wno-unknown-pragmas \ $(EE_GLES_VERSION) \ -DEE_NO_SNDFILE \ - -D$(EE_SDL_VERSION) + -D$(EE_SDL_VERSION) \ + -I$(INC_PATH) \ + -I$(BASE_PATH) MY_LDLIBS := $(APP_LDLIBS) @@ -182,7 +190,31 @@ include $(BUILD_STATIC_LIBRARY) #************* empty_window ************* include $(CLEAR_VARS) -LOCAL_PATH := $(MY_PATH)/test/empty_window +LOCAL_PATH := $(MY_PATH) + +LOCAL_MODULE := empty_window + +LOCAL_LDLIBS := $(MY_LDLIBS) + +LOCAL_CFLAGS := $(MY_C_FLAGS) + +LOCAL_C_INCLUDES := $(MY_C_INCLUDES) + +CORE_SRCS := \ + $(MY_SDL_MAIN_PATH) \ + ../examples/empty_window/*.cpp + +LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) + +LOCAL_STATIC_LIBRARIES := eepp + +include $(BUILD_SHARED_LIBRARY) +#************ empty_window ************ + +#************* full_test ************* +include $(CLEAR_VARS) + +LOCAL_PATH := $(MY_PATH) LOCAL_MODULE := main @@ -193,56 +225,8 @@ LOCAL_CFLAGS := $(MY_C_FLAGS) LOCAL_C_INCLUDES := $(MY_C_INCLUDES) CORE_SRCS := \ - ../../$(MY_SDL_MAIN_PATH) \ - *.cpp \ - -LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) - -LOCAL_STATIC_LIBRARIES := eepp - -include $(BUILD_SHARED_LIBRARY) -#************ empty_window ************ - -#************* BnB ************* -include $(CLEAR_VARS) - -LOCAL_PATH := $(MY_PATH)/bnb - -LOCAL_MODULE := bnb - -LOCAL_LDLIBS := $(MY_LDLIBS) - -LOCAL_CFLAGS := $(MY_C_FLAGS) - -CORE_SRCS := \ - ../$(MY_SDL_MAIN_PATH) \ - *.cpp \ - -LOCAL_C_INCLUDES := $(MY_C_INCLUDES) - -LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) - -LOCAL_STATIC_LIBRARIES := eepp - -include $(BUILD_SHARED_LIBRARY) -#************ BnB ************ - -#************* full_test ************* -include $(CLEAR_VARS) - -LOCAL_PATH := $(MY_PATH)/test/ - -LOCAL_MODULE := full_test - -LOCAL_LDLIBS := $(MY_LDLIBS) - -LOCAL_CFLAGS := $(MY_C_FLAGS) - -LOCAL_C_INCLUDES := $(MY_C_INCLUDES) - -CORE_SRCS := \ - ../../$(MY_SDL_MAIN_PATH) \ - *.cpp \ + $(MY_SDL_MAIN_PATH) \ + ../test/*.cpp LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) @@ -250,53 +234,3 @@ LOCAL_STATIC_LIBRARIES := eepp include $(BUILD_SHARED_LIBRARY) #************ full_test ************ - -#************* KCTSU ************* -include $(CLEAR_VARS) - -LOCAL_PATH := $(MY_PATH)/particles - -LOCAL_MODULE := kctsu - -LOCAL_LDLIBS := $(MY_LDLIBS) - -LOCAL_CFLAGS := $(MY_C_FLAGS) - -CORE_SRCS := \ - ../$(MY_SDL_MAIN_PATH) \ - *.cpp \ - gameobjects/*.cpp \ - objects/*.cpp - -LOCAL_C_INCLUDES := $(MY_C_INCLUDES) - -LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) - -LOCAL_STATIC_LIBRARIES := eepp - -include $(BUILD_SHARED_LIBRARY) -#************ KCTSU ************ - -#************* Rhythm ************* -include $(CLEAR_VARS) - -LOCAL_PATH := $(MY_PATH)/rhythm - -LOCAL_MODULE := rhythm - -LOCAL_LDLIBS := $(MY_LDLIBS) - -LOCAL_CFLAGS := $(MY_C_FLAGS) - -CORE_SRCS := \ - ../$(MY_SDL_MAIN_PATH) \ - *.cpp - -LOCAL_C_INCLUDES := $(MY_C_INCLUDES) - -LOCAL_SRC_FILES := $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F))))) - -LOCAL_STATIC_LIBRARIES := eepp - -include $(BUILD_SHARED_LIBRARY) -#************ Rhythm ************ diff --git a/android-project/jni/Application.mk b/projects/android-project/jni/Application.mk similarity index 57% rename from android-project/jni/Application.mk rename to projects/android-project/jni/Application.mk index 86692d309..a985ca377 100644 --- a/android-project/jni/Application.mk +++ b/projects/android-project/jni/Application.mk @@ -3,7 +3,7 @@ APP_PROJECT_PATH := $(call my-dir)/.. #EE_GLES_VERSION := -DEE_GLES2 -DSOIL_GLES2 -DSDL_GLES2 #EE_GLES_LINK := -lGLESv2 -EE_SDL_VERSION := EE_SDL_VERSION_1_3 +EE_SDL_VERSION := EE_SDL_VERSION_2 EE_GLES_VERSION := -DEE_GLES1 -DSOIL_GLES1 -DSDL_GLES1 EE_GLES_LINK := -lGLESv1_CM @@ -11,7 +11,12 @@ APP_STL := stlport_static APP_LDLIBS := -llog $(EE_GLES_LINK) -lm -lz -APP_CFLAGS := -DDEBUG # arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources +#Debug Build +#APP_CFLAGS := -g -DDEBUG -DEE_DEBUG -DEE_MEMORY_MANAGER # arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources + +#Release Build +APP_CFLAGS := -fno-strict-aliasing -O3 -s -DNDEBUG -ffast-math + APP_PLATFORM := android-7 APP_MODULES := main #APP_ABI := armeabi-v7a diff --git a/android-project/local.properties b/projects/android-project/local.properties similarity index 100% rename from android-project/local.properties rename to projects/android-project/local.properties diff --git a/android-project/res/drawable-hdpi/icon.png b/projects/android-project/res/drawable-hdpi/icon.png similarity index 100% rename from android-project/res/drawable-hdpi/icon.png rename to projects/android-project/res/drawable-hdpi/icon.png diff --git a/android-project/res/drawable-ldpi/icon.png b/projects/android-project/res/drawable-ldpi/icon.png similarity index 100% rename from android-project/res/drawable-ldpi/icon.png rename to projects/android-project/res/drawable-ldpi/icon.png diff --git a/android-project/res/drawable-mdpi/icon.png b/projects/android-project/res/drawable-mdpi/icon.png similarity index 100% rename from android-project/res/drawable-mdpi/icon.png rename to projects/android-project/res/drawable-mdpi/icon.png diff --git a/android-project/res/layout/main.xml b/projects/android-project/res/layout/main.xml similarity index 88% rename from android-project/res/layout/main.xml rename to projects/android-project/res/layout/main.xml index 123c4b6ea..a6fd9fd9d 100644 --- a/android-project/res/layout/main.xml +++ b/projects/android-project/res/layout/main.xml @@ -7,7 +7,7 @@ diff --git a/android-project/res/values/strings.xml b/projects/android-project/res/values/strings.xml similarity index 100% rename from android-project/res/values/strings.xml rename to projects/android-project/res/values/strings.xml diff --git a/src/helper/android/SDL2/java/src/org/libsdl/app/SDLActivity.java b/projects/android-project/src/org/libsdl/app/SDLActivity.java similarity index 100% rename from src/helper/android/SDL2/java/src/org/libsdl/app/SDLActivity.java rename to projects/android-project/src/org/libsdl/app/SDLActivity.java diff --git a/ios/compile-debug.sh b/projects/ios/compile-debug.sh similarity index 95% rename from ios/compile-debug.sh rename to projects/ios/compile-debug.sh index fef77d776..e6f107561 100644 --- a/ios/compile-debug.sh +++ b/projects/ios/compile-debug.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd $(dirname "$0")/../ +cd $(dirname "$0")/../../ rm ./libs/ios/debug/libeepp-armv7.a rm ./libs/ios/debug/libeepp-i386.a diff --git a/ios/compile-release.sh b/projects/ios/compile-release.sh similarity index 95% rename from ios/compile-release.sh rename to projects/ios/compile-release.sh index f9dcdb56c..b3e339d9b 100644 --- a/ios/compile-release.sh +++ b/projects/ios/compile-release.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd $(dirname "$0")/../ +cd $(dirname "$0")/../../ rm ./libs/ios/release/libeepp-armv7.a rm ./libs/ios/release/libeepp-i386.a diff --git a/ee.config b/projects/linux/ee.config similarity index 100% rename from ee.config rename to projects/linux/ee.config diff --git a/ee.creator b/projects/linux/ee.creator similarity index 100% rename from ee.creator rename to projects/linux/ee.creator diff --git a/ee.creator.user b/projects/linux/ee.creator.user similarity index 96% rename from ee.creator.user rename to projects/linux/ee.creator.user index 6342cc92b..537091a58 100644 --- a/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + GenericProjectManager.GenericProject.Toolchain @@ -58,7 +58,7 @@ GenericProjectManager.GenericTarget - 4 + 0 0 0 @@ -594,6 +594,47 @@ debug-eeiv GenericProjectManager.GenericBuildConfiguration + + /home/programming/projects/EE + ProjectExplorer.ToolChain.Gcc:{cfef30df-2a59-45c8-a2ae-8c4d944e506e} + + + + false + -j4 ew -e DEBUGBUILD=yes NO_LIBSNDFILE=yes GLES2=yes + + true + Make + + GenericProjectManager.GenericMakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + -e DEBUGBUILD=yes clean + /usr/bin/make + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + debug-test-gles2 + debug-ew-gles2 + GenericProjectManager.GenericBuildConfiguration + /home/programming/projects/EE ProjectExplorer.ToolChain.Gcc:{cfef30df-2a59-45c8-a2ae-8c4d944e506e} @@ -881,7 +922,7 @@ release-fluid GenericProjectManager.GenericBuildConfiguration - 20 + 21 0 diff --git a/projects/linux/ee.files b/projects/linux/ee.files new file mode 100644 index 000000000..4398ff08c --- /dev/null +++ b/projects/linux/ee.files @@ -0,0 +1,470 @@ +../../include/eepp/audio/tsoundmanager.hpp +../../include/eepp/audio/tsoundloader.hpp +../../include/eepp/audio/openal.hpp +../../include/eepp/audio/csoundstream.hpp +../../include/eepp/audio/csoundfileogg.hpp +../../include/eepp/audio/csoundfiledefault.hpp +../../include/eepp/audio/csoundfile.hpp +../../include/eepp/audio/csoundbuffer.hpp +../../include/eepp/audio/csound.hpp +../../include/eepp/audio/cmusic.hpp +../../include/eepp/audio/caudioresource.hpp +../../include/eepp/audio/caudiolistener.hpp +../../include/eepp/audio/caudiodevice.hpp +../../include/eepp/audio/base.hpp +../../src/eepp/audio/openal.cpp +../../src/eepp/audio/csoundstream.cpp +../../src/eepp/audio/csoundfileogg.cpp +../../src/eepp/audio/csoundfiledefault.cpp +../../src/eepp/audio/csoundfile.cpp +../../src/eepp/audio/csoundbuffer.cpp +../../src/eepp/audio/csound.cpp +../../src/eepp/audio/cmusic.cpp +../../src/eepp/audio/caudioresource.cpp +../../src/eepp/audio/caudiolistener.cpp +../../src/eepp/audio/caudiodevice.cpp +../../include/eepp/base/utf.hpp +../../include/eepp/base/string.hpp +../../include/eepp/base/stlcontainers.hpp +../../include/eepp/base/memorymanager.hpp +../../include/eepp/base/debug.hpp +../../include/eepp/base/base.hpp +../../include/eepp/base/allocator.hpp +../../include/eepp/base/utf.inl +../../src/eepp/base/string.cpp +../../src/eepp/base/memorymanager.cpp +../../src/eepp/base/debug.cpp +../../include/eepp/system/tsingleton.hpp +../../include/eepp/system/tresourcemanager.hpp +../../include/eepp/system/tcontainer.hpp +../../include/eepp/system/czip.hpp +../../include/eepp/system/ctimer.hpp +../../include/eepp/system/ctimeelapsed.hpp +../../include/eepp/system/cthread.hpp +../../include/eepp/system/cresourceloader.hpp +../../include/eepp/system/crc4.hpp +../../include/eepp/system/cpak.hpp +../../include/eepp/system/cpackmanager.hpp +../../include/eepp/system/cpack.hpp +../../include/eepp/system/cobjectloader.hpp +../../include/eepp/system/cmutex.hpp +../../include/eepp/system/clog.hpp +../../include/eepp/system/ciostreammemory.hpp +../../include/eepp/system/ciostreamfile.hpp +../../include/eepp/system/ciostream.hpp +../../include/eepp/system/cinifile.hpp +../../include/eepp/system/base.hpp +../../src/eepp/system/czip.cpp +../../src/eepp/system/ctimer.cpp +../../src/eepp/system/ctimeelapsed.cpp +../../src/eepp/system/cthread.cpp +../../src/eepp/system/cresourceloader.cpp +../../src/eepp/system/crc4.cpp +../../src/eepp/system/cpak.cpp +../../src/eepp/system/cpackmanager.cpp +../../src/eepp/system/cpack.cpp +../../src/eepp/system/cobjectloader.cpp +../../src/eepp/system/cmutex.cpp +../../src/eepp/system/clog.cpp +../../src/eepp/system/ciostreammemory.cpp +../../src/eepp/system/ciostreamfile.cpp +../../src/eepp/system/cinifile.cpp +../../src/eepp/system/platform/platformimpl.hpp +../../src/eepp/system/platform/posix/ctimerimpl.hpp +../../src/eepp/system/platform/posix/cthreadimpl.hpp +../../src/eepp/system/platform/posix/cmuteximpl.hpp +../../src/eepp/system/platform/posix/ctimerimpl.cpp +../../src/eepp/system/platform/posix/cthreadimpl.cpp +../../src/eepp/system/platform/posix/cmuteximpl.cpp +../../src/eepp/system/platform/win/ctimerimpl.hpp +../../src/eepp/system/platform/win/cthreadimpl.hpp +../../src/eepp/system/platform/win/cmuteximpl.hpp +../../src/eepp/system/platform/win/ctimerimpl.cpp +../../src/eepp/system/platform/win/cthreadimpl.cpp +../../src/eepp/system/platform/win/cmuteximpl.cpp +../../include/eepp/gaming/maphelper.hpp +../../include/eepp/gaming/ctilelayer.hpp +../../include/eepp/gaming/cobjectlayer.hpp +../../include/eepp/gaming/cmap.hpp +../../include/eepp/gaming/clightmanager.hpp +../../include/eepp/gaming/clight.hpp +../../include/eepp/gaming/clayer.hpp +../../include/eepp/gaming/cisomap.hpp +../../include/eepp/gaming/cgameobjectvirtual.hpp +../../include/eepp/gaming/cgameobjectsprite.hpp +../../include/eepp/gaming/cgameobjectshapeex.hpp +../../include/eepp/gaming/cgameobjectshape.hpp +../../include/eepp/gaming/cgameobject.hpp +../../include/eepp/gaming/base.hpp +../../include/eepp/gaming/mapeditor/cuimapnew.hpp +../../include/eepp/gaming/mapeditor/cuimap.hpp +../../include/eepp/gaming/mapeditor/cuilayernew.hpp +../../include/eepp/gaming/mapeditor/cuigotypenew.hpp +../../include/eepp/gaming/mapeditor/cmapproperties.hpp +../../include/eepp/gaming/mapeditor/cmapeditor.hpp +../../include/eepp/gaming/mapeditor/clayerproperties.hpp +../../include/eepp/gaming/mapeditor/base.hpp +../../src/eepp/gaming/ctilelayer.cpp +../../src/eepp/gaming/cobjectlayer.cpp +../../src/eepp/gaming/cmap.cpp +../../src/eepp/gaming/clightmanager.cpp +../../src/eepp/gaming/clight.cpp +../../src/eepp/gaming/clayer.cpp +../../src/eepp/gaming/cisomap.cpp +../../src/eepp/gaming/cgameobjectvirtual.cpp +../../src/eepp/gaming/cgameobjectsprite.cpp +../../src/eepp/gaming/cgameobjectshapeex.cpp +../../src/eepp/gaming/cgameobjectshape.cpp +../../src/eepp/gaming/cgameobject.cpp +../../src/eepp/gaming/mapeditor/cuimapnew.cpp +../../src/eepp/gaming/mapeditor/cuimap.cpp +../../src/eepp/gaming/mapeditor/cuilayernew.cpp +../../src/eepp/gaming/mapeditor/cuigotypenew.cpp +../../src/eepp/gaming/mapeditor/cmapproperties.cpp +../../src/eepp/gaming/mapeditor/cmapeditor.cpp +../../src/eepp/gaming/mapeditor/clayerproperties.cpp +../../include/eepp/graphics/vbohelper.hpp +../../include/eepp/graphics/renders.hpp +../../include/eepp/graphics/pixelperfect.hpp +../../include/eepp/graphics/packerhelper.hpp +../../include/eepp/graphics/glhelper.hpp +../../include/eepp/graphics/fonthelper.hpp +../../include/eepp/graphics/cvertexbuffervbo.hpp +../../include/eepp/graphics/cvertexbufferogl.hpp +../../include/eepp/graphics/cvertexbuffermanager.hpp +../../include/eepp/graphics/cvertexbuffer.hpp +../../include/eepp/graphics/cttffontloader.hpp +../../include/eepp/graphics/cttffont.hpp +../../include/eepp/graphics/ctexturepackertex.hpp +../../include/eepp/graphics/ctexturepackernode.hpp +../../include/eepp/graphics/ctexturepacker.hpp +../../include/eepp/graphics/ctextureloader.hpp +../../include/eepp/graphics/ctexturegrouploader.hpp +../../include/eepp/graphics/ctexturefontloader.hpp +../../include/eepp/graphics/ctexturefont.hpp +../../include/eepp/graphics/ctexturefactory.hpp +../../include/eepp/graphics/ctexture.hpp +../../include/eepp/graphics/ctextcache.hpp +../../include/eepp/graphics/csprite.hpp +../../include/eepp/graphics/cshapegroupmanager.hpp +../../include/eepp/graphics/cshapegroup.hpp +../../include/eepp/graphics/cshape.hpp +../../include/eepp/graphics/cshaderprogrammanager.hpp +../../include/eepp/graphics/cshaderprogram.hpp +../../include/eepp/graphics/cshader.hpp +../../include/eepp/graphics/cscrollparallax.hpp +../../include/eepp/graphics/cprimitives.hpp +../../include/eepp/graphics/cparticlesystem.hpp +../../include/eepp/graphics/cparticle.hpp +../../include/eepp/graphics/cimage.hpp +../../include/eepp/graphics/cglobalshapegroup.hpp +../../include/eepp/graphics/cglobalbatchrenderer.hpp +../../include/eepp/graphics/cframebufferpbuffer.hpp +../../include/eepp/graphics/cframebuffermanager.hpp +../../include/eepp/graphics/cframebufferfbo.hpp +../../include/eepp/graphics/cframebuffer.hpp +../../include/eepp/graphics/cfontmanager.hpp +../../include/eepp/graphics/cfont.hpp +../../include/eepp/graphics/cconsole.hpp +../../include/eepp/graphics/cbatchrenderer.hpp +../../include/eepp/graphics/base.hpp +../../include/eepp/graphics/renderer/crenderergl3.hpp +../../include/eepp/graphics/renderer/crenderergl.hpp +../../include/eepp/graphics/renderer/cgl.hpp +../../include/eepp/graphics/renderer/base.hpp +../../include/eepp/math/math.hpp +../../include/eepp/math/cmtrand.hpp +../../include/eepp/math/base.hpp +../../src/eepp/math/math.cpp +../../src/eepp/math/cmtrand.cpp +../../include/eepp/physics/settings.hpp +../../include/eepp/physics/physicshelper.hpp +../../include/eepp/physics/moment.hpp +../../include/eepp/physics/cspace.hpp +../../include/eepp/physics/cshapesegment.hpp +../../include/eepp/physics/cshapepolysprite.hpp +../../include/eepp/physics/cshapepoly.hpp +../../include/eepp/physics/cshapecirclesprite.hpp +../../include/eepp/physics/cshapecircle.hpp +../../include/eepp/physics/cshape.hpp +../../include/eepp/physics/cphysicsmanager.hpp +../../include/eepp/physics/cbody.hpp +../../include/eepp/physics/carbiter.hpp +../../include/eepp/physics/base.hpp +../../include/eepp/physics/area.hpp +../../include/eepp/physics/constraints/cslidejoint.hpp +../../include/eepp/physics/constraints/csimplemotor.hpp +../../include/eepp/physics/constraints/crotarylimitjoint.hpp +../../include/eepp/physics/constraints/cratchetjoint.hpp +../../include/eepp/physics/constraints/cpivotjoint.hpp +../../include/eepp/physics/constraints/cpinjoint.hpp +../../include/eepp/physics/constraints/cgroovejoint.hpp +../../include/eepp/physics/constraints/cgearjoint.hpp +../../include/eepp/physics/constraints/cdampedspring.hpp +../../include/eepp/physics/constraints/cdampedrotaryspring.hpp +../../include/eepp/physics/constraints/cconstraint.hpp +../../src/eepp/physics/cspace.cpp +../../src/eepp/physics/cshapesegment.cpp +../../src/eepp/physics/cshapepolysprite.cpp +../../src/eepp/physics/cshapepoly.cpp +../../src/eepp/physics/cshapecirclesprite.cpp +../../src/eepp/physics/cshapecircle.cpp +../../src/eepp/physics/cshape.cpp +../../src/eepp/physics/cphysicsmanager.cpp +../../src/eepp/physics/cbody.cpp +../../src/eepp/physics/carbiter.cpp +../../src/eepp/physics/constraints/cslidejoint.cpp +../../src/eepp/physics/constraints/csimplemotor.cpp +../../src/eepp/physics/constraints/crotarylimitjoint.cpp +../../src/eepp/physics/constraints/cratchetjoint.cpp +../../src/eepp/physics/constraints/cpivotjoint.cpp +../../src/eepp/physics/constraints/cpinjoint.cpp +../../src/eepp/physics/constraints/cgroovejoint.cpp +../../src/eepp/physics/constraints/cgearjoint.cpp +../../src/eepp/physics/constraints/cdampedspring.cpp +../../src/eepp/physics/constraints/cdampedrotaryspring.cpp +../../src/eepp/physics/constraints/cconstraint.cpp +../../include/eepp/ui/uihelper.hpp +../../include/eepp/ui/tuiitemcontainer.hpp +../../include/eepp/ui/cuiwinmenu.hpp +../../include/eepp/ui/cuiwindow.hpp +../../include/eepp/ui/cuitooltip.hpp +../../include/eepp/ui/cuithememanager.hpp +../../include/eepp/ui/cuitheme.hpp +../../include/eepp/ui/cuitextinput.hpp +../../include/eepp/ui/cuitextedit.hpp +../../include/eepp/ui/cuitextbox.hpp +../../include/eepp/ui/cuitabwidget.hpp +../../include/eepp/ui/cuitab.hpp +../../include/eepp/ui/cuisprite.hpp +../../include/eepp/ui/cuispinbox.hpp +../../include/eepp/ui/cuisliderbutton.hpp +../../include/eepp/ui/cuislider.hpp +../../include/eepp/ui/cuiskinstate.hpp +../../include/eepp/ui/cuiskinsimple.hpp +../../include/eepp/ui/cuiskincomplex.hpp +../../include/eepp/ui/cuiskin.hpp +../../include/eepp/ui/cuiseparator.hpp +../../include/eepp/ui/cuiselectbutton.hpp +../../include/eepp/ui/cuiscrollbar.hpp +../../include/eepp/ui/cuiradiobutton.hpp +../../include/eepp/ui/cuipushbutton.hpp +../../include/eepp/ui/cuiprogressbar.hpp +../../include/eepp/ui/cuipopupmenu.hpp +../../include/eepp/ui/cuimessagebox.hpp +../../include/eepp/ui/cuimessage.hpp +../../include/eepp/ui/cuimenusubmenu.hpp +../../include/eepp/ui/cuimenuitem.hpp +../../include/eepp/ui/cuimenucheckbox.hpp +../../include/eepp/ui/cuimenu.hpp +../../include/eepp/ui/cuimanager.hpp +../../include/eepp/ui/cuilistboxitem.hpp +../../include/eepp/ui/cuilistbox.hpp +../../include/eepp/ui/cuigridcell.hpp +../../include/eepp/ui/cuigfx.hpp +../../include/eepp/ui/cuigenericgrid.hpp +../../include/eepp/ui/cuieventmouse.hpp +../../include/eepp/ui/cuieventkey.hpp +../../include/eepp/ui/cuievent.hpp +../../include/eepp/ui/cuidropdownlist.hpp +../../include/eepp/ui/cuidragable.hpp +../../include/eepp/ui/cuicontrolanim.hpp +../../include/eepp/ui/cuicontrol.hpp +../../include/eepp/ui/cuicomplexcontrol.hpp +../../include/eepp/ui/cuicommondialog.hpp +../../include/eepp/ui/cuicombobox.hpp +../../include/eepp/ui/cuicheckbox.hpp +../../include/eepp/ui/cuiborder.hpp +../../include/eepp/ui/cuibackground.hpp +../../include/eepp/ui/cuiaquatheme.hpp +../../include/eepp/ui/base.hpp +../../include/eepp/ui/tools/ctexturegroupshapeeditor.hpp +../../include/eepp/ui/tools/ctexturegroupnew.hpp +../../include/eepp/ui/tools/ctexturegroupeditor.hpp +../../src/eepp/ui/uihelper.cpp +../../src/eepp/ui/cuiwinmenu.cpp +../../src/eepp/ui/cuiwindow.cpp +../../src/eepp/ui/cuitooltip.cpp +../../src/eepp/ui/cuithememanager.cpp +../../src/eepp/ui/cuitheme.cpp +../../src/eepp/ui/cuitextinput.cpp +../../src/eepp/ui/cuitextedit.cpp +../../src/eepp/ui/cuitextbox.cpp +../../src/eepp/ui/cuitabwidget.cpp +../../src/eepp/ui/cuitab.cpp +../../src/eepp/ui/cuisprite.cpp +../../src/eepp/ui/cuispinbox.cpp +../../src/eepp/ui/cuisliderbutton.cpp +../../src/eepp/ui/cuislider.cpp +../../src/eepp/ui/cuiskinstate.cpp +../../src/eepp/ui/cuiskinsimple.cpp +../../src/eepp/ui/cuiskincomplex.cpp +../../src/eepp/ui/cuiskin.cpp +../../src/eepp/ui/cuiseparator.cpp +../../src/eepp/ui/cuiselectbutton.cpp +../../src/eepp/ui/cuiscrollbar.cpp +../../src/eepp/ui/cuiradiobutton.cpp +../../src/eepp/ui/cuipushbutton.cpp +../../src/eepp/ui/cuiprogressbar.cpp +../../src/eepp/ui/cuipopupmenu.cpp +../../src/eepp/ui/cuimessagebox.cpp +../../src/eepp/ui/cuimessage.cpp +../../src/eepp/ui/cuimenusubmenu.cpp +../../src/eepp/ui/cuimenuitem.cpp +../../src/eepp/ui/cuimenucheckbox.cpp +../../src/eepp/ui/cuimenu.cpp +../../src/eepp/ui/cuimanager.cpp +../../src/eepp/ui/cuilistboxitem.cpp +../../src/eepp/ui/cuilistbox.cpp +../../src/eepp/ui/cuigridcell.cpp +../../src/eepp/ui/cuigfx.cpp +../../src/eepp/ui/cuigenericgrid.cpp +../../src/eepp/ui/cuieventmouse.cpp +../../src/eepp/ui/cuieventkey.cpp +../../src/eepp/ui/cuievent.cpp +../../src/eepp/ui/cuidropdownlist.cpp +../../src/eepp/ui/cuidragable.cpp +../../src/eepp/ui/cuicontrolanim.cpp +../../src/eepp/ui/cuicontrol.cpp +../../src/eepp/ui/cuicomplexcontrol.cpp +../../src/eepp/ui/cuicommondialog.cpp +../../src/eepp/ui/cuicombobox.cpp +../../src/eepp/ui/cuicheckbox.cpp +../../src/eepp/ui/cuiborder.cpp +../../src/eepp/ui/cuibackground.cpp +../../src/eepp/ui/cuiaquatheme.cpp +../../src/eepp/ui/tools/ctexturegroupshapeeditor.cpp +../../src/eepp/ui/tools/ctexturegroupnew.cpp +../../src/eepp/ui/tools/ctexturegroupeditor.cpp +../../include/eepp/utils/vector3.hpp +../../include/eepp/utils/vector2.hpp +../../include/eepp/utils/utils.hpp +../../include/eepp/utils/triangle2.hpp +../../include/eepp/utils/string.hpp +../../include/eepp/utils/size.hpp +../../include/eepp/utils/safedatapointer.hpp +../../include/eepp/utils/rect.hpp +../../include/eepp/utils/quad2.hpp +../../include/eepp/utils/polygon2.hpp +../../include/eepp/utils/line2.hpp +../../include/eepp/utils/helper.hpp +../../include/eepp/utils/easing.hpp +../../include/eepp/utils/cwaypoints.hpp +../../include/eepp/utils/cperlinnoise.hpp +../../include/eepp/utils/colors.hpp +../../include/eepp/utils/cinterpolation.hpp +../../include/eepp/utils/base.hpp +../../src/eepp/utils/utils.cpp +../../src/eepp/utils/string.cpp +../../src/eepp/utils/safedatapointer.cpp +../../src/eepp/utils/easing.cpp +../../src/eepp/utils/cwaypoints.cpp +../../src/eepp/utils/cperlinnoise.cpp +../../src/eepp/utils/cinterpolation.cpp +../../include/eepp/window/keycodes.hpp +../../include/eepp/window/joycodes.hpp +../../include/eepp/window/inputhelper.hpp +../../include/eepp/window/inputevent.hpp +../../include/eepp/window/cwindow.hpp +../../include/eepp/window/cview.hpp +../../include/eepp/window/cursorhelper.hpp +../../include/eepp/window/cplatformimpl.hpp +../../include/eepp/window/cjoystickmanager.hpp +../../include/eepp/window/cjoystick.hpp +../../include/eepp/window/cinputtextbuffer.hpp +../../include/eepp/window/cinputfinger.hpp +../../include/eepp/window/cinput.hpp +../../include/eepp/window/cengine.hpp +../../include/eepp/window/ccursormanager.hpp +../../include/eepp/window/ccursor.hpp +../../include/eepp/window/cclipboard.hpp +../../include/eepp/window/cbackend.hpp +../../include/eepp/window/base.hpp +../../src/eepp/window/inputhelper.cpp +../../src/eepp/window/cwindow.cpp +../../src/eepp/window/cview.cpp +../../src/eepp/window/cplatformimpl.cpp +../../src/eepp/window/cjoystickmanager.cpp +../../src/eepp/window/cjoystick.cpp +../../src/eepp/window/cinputtextbuffer.cpp +../../src/eepp/window/cinputfinger.cpp +../../src/eepp/window/cinput.cpp +../../src/eepp/window/cengine.cpp +../../src/eepp/window/ccursormanager.cpp +../../src/eepp/window/ccursor.cpp +../../src/eepp/window/cclipboard.cpp +../../src/eepp/window/backend/SDL/cwindowsdl.hpp +../../src/eepp/window/backend/SDL/cjoysticksdl.hpp +../../src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp +../../src/eepp/window/backend/SDL/cinputsdl.hpp +../../src/eepp/window/backend/SDL/ccursorsdl.hpp +../../src/eepp/window/backend/SDL/ccursormanagersdl.hpp +../../src/eepp/window/backend/SDL/cclipboardsdl.hpp +../../src/eepp/window/backend/SDL/cbackendsdl.hpp +../../src/eepp/window/backend/SDL/base.hpp +../../src/eepp/window/backend/SDL/cwindowsdl.cpp +../../src/eepp/window/backend/SDL/cjoysticksdl.cpp +../../src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp +../../src/eepp/window/backend/SDL/cinputsdl.cpp +../../src/eepp/window/backend/SDL/ccursorsdl.cpp +../../src/eepp/window/backend/SDL/ccursormanagersdl.cpp +../../src/eepp/window/backend/SDL/cclipboardsdl.cpp +../../src/eepp/window/backend/SDL2/cwindowsdl.hpp +../../src/eepp/window/backend/SDL2/cjoysticksdl.hpp +../../src/eepp/window/backend/SDL2/cjoystickmanagersdl.hpp +../../src/eepp/window/backend/SDL2/cinputsdl.hpp +../../src/eepp/window/backend/SDL2/ccursorsdl.hpp +../../src/eepp/window/backend/SDL2/ccursormanagersdl.hpp +../../src/eepp/window/backend/SDL2/cclipboardsdl.hpp +../../src/eepp/window/backend/SDL2/cbackendsdl.hpp +../../src/eepp/window/backend/SDL2/base.hpp +../../src/eepp/window/backend/SDL2/cwindowsdl.cpp +../../src/eepp/window/backend/SDL2/cjoysticksdl.cpp +../../src/eepp/window/backend/SDL2/cjoystickmanagersdl.cpp +../../src/eepp/window/backend/SDL2/cinputsdl.cpp +../../src/eepp/window/backend/SDL2/ccursorsdl.cpp +../../src/eepp/window/backend/SDL2/ccursormanagersdl.cpp +../../src/eepp/window/backend/SDL2/cclipboardsdl.cpp +../../src/eepp/window/backend/allegro5/cwindowal.hpp +../../src/eepp/window/backend/allegro5/cjoystickmanageral.hpp +../../src/eepp/window/backend/allegro5/cjoystickal.hpp +../../src/eepp/window/backend/allegro5/cinputal.hpp +../../src/eepp/window/backend/allegro5/ccursormanageral.hpp +../../src/eepp/window/backend/allegro5/ccursoral.hpp +../../src/eepp/window/backend/allegro5/cclipboardal.hpp +../../src/eepp/window/backend/allegro5/cbackendal.hpp +../../src/eepp/window/backend/allegro5/cwindowal.cpp +../../src/eepp/window/backend/allegro5/cjoystickmanageral.cpp +../../src/eepp/window/backend/allegro5/cjoystickal.cpp +../../src/eepp/window/backend/allegro5/cinputal.cpp +../../src/eepp/window/backend/allegro5/ccursormanageral.cpp +../../src/eepp/window/backend/allegro5/ccursoral.cpp +../../src/eepp/window/backend/allegro5/cclipboardal.cpp +../../src/eepp/window/backend/null/cwindownull.hpp +../../src/eepp/window/backend/null/cjoysticknull.hpp +../../src/eepp/window/backend/null/cjoystickmanagernull.hpp +../../src/eepp/window/backend/null/cinputnull.hpp +../../src/eepp/window/backend/null/ccursornull.hpp +../../src/eepp/window/backend/null/ccursormanagernull.hpp +../../src/eepp/window/backend/null/cclipboardnull.hpp +../../src/eepp/window/backend/null/cbackendnull.hpp +../../src/eepp/window/backend/null/cwindownull.cpp +../../src/eepp/window/backend/null/cjoysticknull.cpp +../../src/eepp/window/backend/null/cjoystickmanagernull.cpp +../../src/eepp/window/backend/null/cinputnull.cpp +../../src/eepp/window/backend/null/ccursornull.cpp +../../src/eepp/window/backend/null/ccursormanagernull.cpp +../../src/eepp/window/backend/null/cclipboardnull.cpp +../../src/eepp/window/platform/null/cnullimpl.hpp +../../src/eepp/window/platform/null/cnullimpl.cpp +../../src/eepp/window/platform/osx/cosximpl.hpp +../../src/eepp/window/platform/osx/cosximpl.cpp +../../src/eepp/window/platform/win/cwinimpl.hpp +../../src/eepp/window/platform/win/ccursorwin.hpp +../../src/eepp/window/platform/win/cwinimpl.cpp +../../src/eepp/window/platform/win/ccursorwin.cpp +../../src/eepp/window/platform/x11/cx11impl.hpp +../../src/eepp/window/platform/x11/ccursorx11.hpp +../../src/eepp/window/platform/x11/cx11impl.cpp +../../src/eepp/window/platform/x11/ccursorx11.cpp +../../src/eepp/window/platform/platformimpl.hpp diff --git a/ee.osx.config b/projects/osx/ee.config similarity index 100% rename from ee.osx.config rename to projects/osx/ee.config diff --git a/ee.osx.creator b/projects/osx/ee.creator similarity index 100% rename from ee.osx.creator rename to projects/osx/ee.creator diff --git a/projects/osx/ee.files b/projects/osx/ee.files new file mode 100644 index 000000000..4398ff08c --- /dev/null +++ b/projects/osx/ee.files @@ -0,0 +1,470 @@ +../../include/eepp/audio/tsoundmanager.hpp +../../include/eepp/audio/tsoundloader.hpp +../../include/eepp/audio/openal.hpp +../../include/eepp/audio/csoundstream.hpp +../../include/eepp/audio/csoundfileogg.hpp +../../include/eepp/audio/csoundfiledefault.hpp +../../include/eepp/audio/csoundfile.hpp +../../include/eepp/audio/csoundbuffer.hpp +../../include/eepp/audio/csound.hpp +../../include/eepp/audio/cmusic.hpp +../../include/eepp/audio/caudioresource.hpp +../../include/eepp/audio/caudiolistener.hpp +../../include/eepp/audio/caudiodevice.hpp +../../include/eepp/audio/base.hpp +../../src/eepp/audio/openal.cpp +../../src/eepp/audio/csoundstream.cpp +../../src/eepp/audio/csoundfileogg.cpp +../../src/eepp/audio/csoundfiledefault.cpp +../../src/eepp/audio/csoundfile.cpp +../../src/eepp/audio/csoundbuffer.cpp +../../src/eepp/audio/csound.cpp +../../src/eepp/audio/cmusic.cpp +../../src/eepp/audio/caudioresource.cpp +../../src/eepp/audio/caudiolistener.cpp +../../src/eepp/audio/caudiodevice.cpp +../../include/eepp/base/utf.hpp +../../include/eepp/base/string.hpp +../../include/eepp/base/stlcontainers.hpp +../../include/eepp/base/memorymanager.hpp +../../include/eepp/base/debug.hpp +../../include/eepp/base/base.hpp +../../include/eepp/base/allocator.hpp +../../include/eepp/base/utf.inl +../../src/eepp/base/string.cpp +../../src/eepp/base/memorymanager.cpp +../../src/eepp/base/debug.cpp +../../include/eepp/system/tsingleton.hpp +../../include/eepp/system/tresourcemanager.hpp +../../include/eepp/system/tcontainer.hpp +../../include/eepp/system/czip.hpp +../../include/eepp/system/ctimer.hpp +../../include/eepp/system/ctimeelapsed.hpp +../../include/eepp/system/cthread.hpp +../../include/eepp/system/cresourceloader.hpp +../../include/eepp/system/crc4.hpp +../../include/eepp/system/cpak.hpp +../../include/eepp/system/cpackmanager.hpp +../../include/eepp/system/cpack.hpp +../../include/eepp/system/cobjectloader.hpp +../../include/eepp/system/cmutex.hpp +../../include/eepp/system/clog.hpp +../../include/eepp/system/ciostreammemory.hpp +../../include/eepp/system/ciostreamfile.hpp +../../include/eepp/system/ciostream.hpp +../../include/eepp/system/cinifile.hpp +../../include/eepp/system/base.hpp +../../src/eepp/system/czip.cpp +../../src/eepp/system/ctimer.cpp +../../src/eepp/system/ctimeelapsed.cpp +../../src/eepp/system/cthread.cpp +../../src/eepp/system/cresourceloader.cpp +../../src/eepp/system/crc4.cpp +../../src/eepp/system/cpak.cpp +../../src/eepp/system/cpackmanager.cpp +../../src/eepp/system/cpack.cpp +../../src/eepp/system/cobjectloader.cpp +../../src/eepp/system/cmutex.cpp +../../src/eepp/system/clog.cpp +../../src/eepp/system/ciostreammemory.cpp +../../src/eepp/system/ciostreamfile.cpp +../../src/eepp/system/cinifile.cpp +../../src/eepp/system/platform/platformimpl.hpp +../../src/eepp/system/platform/posix/ctimerimpl.hpp +../../src/eepp/system/platform/posix/cthreadimpl.hpp +../../src/eepp/system/platform/posix/cmuteximpl.hpp +../../src/eepp/system/platform/posix/ctimerimpl.cpp +../../src/eepp/system/platform/posix/cthreadimpl.cpp +../../src/eepp/system/platform/posix/cmuteximpl.cpp +../../src/eepp/system/platform/win/ctimerimpl.hpp +../../src/eepp/system/platform/win/cthreadimpl.hpp +../../src/eepp/system/platform/win/cmuteximpl.hpp +../../src/eepp/system/platform/win/ctimerimpl.cpp +../../src/eepp/system/platform/win/cthreadimpl.cpp +../../src/eepp/system/platform/win/cmuteximpl.cpp +../../include/eepp/gaming/maphelper.hpp +../../include/eepp/gaming/ctilelayer.hpp +../../include/eepp/gaming/cobjectlayer.hpp +../../include/eepp/gaming/cmap.hpp +../../include/eepp/gaming/clightmanager.hpp +../../include/eepp/gaming/clight.hpp +../../include/eepp/gaming/clayer.hpp +../../include/eepp/gaming/cisomap.hpp +../../include/eepp/gaming/cgameobjectvirtual.hpp +../../include/eepp/gaming/cgameobjectsprite.hpp +../../include/eepp/gaming/cgameobjectshapeex.hpp +../../include/eepp/gaming/cgameobjectshape.hpp +../../include/eepp/gaming/cgameobject.hpp +../../include/eepp/gaming/base.hpp +../../include/eepp/gaming/mapeditor/cuimapnew.hpp +../../include/eepp/gaming/mapeditor/cuimap.hpp +../../include/eepp/gaming/mapeditor/cuilayernew.hpp +../../include/eepp/gaming/mapeditor/cuigotypenew.hpp +../../include/eepp/gaming/mapeditor/cmapproperties.hpp +../../include/eepp/gaming/mapeditor/cmapeditor.hpp +../../include/eepp/gaming/mapeditor/clayerproperties.hpp +../../include/eepp/gaming/mapeditor/base.hpp +../../src/eepp/gaming/ctilelayer.cpp +../../src/eepp/gaming/cobjectlayer.cpp +../../src/eepp/gaming/cmap.cpp +../../src/eepp/gaming/clightmanager.cpp +../../src/eepp/gaming/clight.cpp +../../src/eepp/gaming/clayer.cpp +../../src/eepp/gaming/cisomap.cpp +../../src/eepp/gaming/cgameobjectvirtual.cpp +../../src/eepp/gaming/cgameobjectsprite.cpp +../../src/eepp/gaming/cgameobjectshapeex.cpp +../../src/eepp/gaming/cgameobjectshape.cpp +../../src/eepp/gaming/cgameobject.cpp +../../src/eepp/gaming/mapeditor/cuimapnew.cpp +../../src/eepp/gaming/mapeditor/cuimap.cpp +../../src/eepp/gaming/mapeditor/cuilayernew.cpp +../../src/eepp/gaming/mapeditor/cuigotypenew.cpp +../../src/eepp/gaming/mapeditor/cmapproperties.cpp +../../src/eepp/gaming/mapeditor/cmapeditor.cpp +../../src/eepp/gaming/mapeditor/clayerproperties.cpp +../../include/eepp/graphics/vbohelper.hpp +../../include/eepp/graphics/renders.hpp +../../include/eepp/graphics/pixelperfect.hpp +../../include/eepp/graphics/packerhelper.hpp +../../include/eepp/graphics/glhelper.hpp +../../include/eepp/graphics/fonthelper.hpp +../../include/eepp/graphics/cvertexbuffervbo.hpp +../../include/eepp/graphics/cvertexbufferogl.hpp +../../include/eepp/graphics/cvertexbuffermanager.hpp +../../include/eepp/graphics/cvertexbuffer.hpp +../../include/eepp/graphics/cttffontloader.hpp +../../include/eepp/graphics/cttffont.hpp +../../include/eepp/graphics/ctexturepackertex.hpp +../../include/eepp/graphics/ctexturepackernode.hpp +../../include/eepp/graphics/ctexturepacker.hpp +../../include/eepp/graphics/ctextureloader.hpp +../../include/eepp/graphics/ctexturegrouploader.hpp +../../include/eepp/graphics/ctexturefontloader.hpp +../../include/eepp/graphics/ctexturefont.hpp +../../include/eepp/graphics/ctexturefactory.hpp +../../include/eepp/graphics/ctexture.hpp +../../include/eepp/graphics/ctextcache.hpp +../../include/eepp/graphics/csprite.hpp +../../include/eepp/graphics/cshapegroupmanager.hpp +../../include/eepp/graphics/cshapegroup.hpp +../../include/eepp/graphics/cshape.hpp +../../include/eepp/graphics/cshaderprogrammanager.hpp +../../include/eepp/graphics/cshaderprogram.hpp +../../include/eepp/graphics/cshader.hpp +../../include/eepp/graphics/cscrollparallax.hpp +../../include/eepp/graphics/cprimitives.hpp +../../include/eepp/graphics/cparticlesystem.hpp +../../include/eepp/graphics/cparticle.hpp +../../include/eepp/graphics/cimage.hpp +../../include/eepp/graphics/cglobalshapegroup.hpp +../../include/eepp/graphics/cglobalbatchrenderer.hpp +../../include/eepp/graphics/cframebufferpbuffer.hpp +../../include/eepp/graphics/cframebuffermanager.hpp +../../include/eepp/graphics/cframebufferfbo.hpp +../../include/eepp/graphics/cframebuffer.hpp +../../include/eepp/graphics/cfontmanager.hpp +../../include/eepp/graphics/cfont.hpp +../../include/eepp/graphics/cconsole.hpp +../../include/eepp/graphics/cbatchrenderer.hpp +../../include/eepp/graphics/base.hpp +../../include/eepp/graphics/renderer/crenderergl3.hpp +../../include/eepp/graphics/renderer/crenderergl.hpp +../../include/eepp/graphics/renderer/cgl.hpp +../../include/eepp/graphics/renderer/base.hpp +../../include/eepp/math/math.hpp +../../include/eepp/math/cmtrand.hpp +../../include/eepp/math/base.hpp +../../src/eepp/math/math.cpp +../../src/eepp/math/cmtrand.cpp +../../include/eepp/physics/settings.hpp +../../include/eepp/physics/physicshelper.hpp +../../include/eepp/physics/moment.hpp +../../include/eepp/physics/cspace.hpp +../../include/eepp/physics/cshapesegment.hpp +../../include/eepp/physics/cshapepolysprite.hpp +../../include/eepp/physics/cshapepoly.hpp +../../include/eepp/physics/cshapecirclesprite.hpp +../../include/eepp/physics/cshapecircle.hpp +../../include/eepp/physics/cshape.hpp +../../include/eepp/physics/cphysicsmanager.hpp +../../include/eepp/physics/cbody.hpp +../../include/eepp/physics/carbiter.hpp +../../include/eepp/physics/base.hpp +../../include/eepp/physics/area.hpp +../../include/eepp/physics/constraints/cslidejoint.hpp +../../include/eepp/physics/constraints/csimplemotor.hpp +../../include/eepp/physics/constraints/crotarylimitjoint.hpp +../../include/eepp/physics/constraints/cratchetjoint.hpp +../../include/eepp/physics/constraints/cpivotjoint.hpp +../../include/eepp/physics/constraints/cpinjoint.hpp +../../include/eepp/physics/constraints/cgroovejoint.hpp +../../include/eepp/physics/constraints/cgearjoint.hpp +../../include/eepp/physics/constraints/cdampedspring.hpp +../../include/eepp/physics/constraints/cdampedrotaryspring.hpp +../../include/eepp/physics/constraints/cconstraint.hpp +../../src/eepp/physics/cspace.cpp +../../src/eepp/physics/cshapesegment.cpp +../../src/eepp/physics/cshapepolysprite.cpp +../../src/eepp/physics/cshapepoly.cpp +../../src/eepp/physics/cshapecirclesprite.cpp +../../src/eepp/physics/cshapecircle.cpp +../../src/eepp/physics/cshape.cpp +../../src/eepp/physics/cphysicsmanager.cpp +../../src/eepp/physics/cbody.cpp +../../src/eepp/physics/carbiter.cpp +../../src/eepp/physics/constraints/cslidejoint.cpp +../../src/eepp/physics/constraints/csimplemotor.cpp +../../src/eepp/physics/constraints/crotarylimitjoint.cpp +../../src/eepp/physics/constraints/cratchetjoint.cpp +../../src/eepp/physics/constraints/cpivotjoint.cpp +../../src/eepp/physics/constraints/cpinjoint.cpp +../../src/eepp/physics/constraints/cgroovejoint.cpp +../../src/eepp/physics/constraints/cgearjoint.cpp +../../src/eepp/physics/constraints/cdampedspring.cpp +../../src/eepp/physics/constraints/cdampedrotaryspring.cpp +../../src/eepp/physics/constraints/cconstraint.cpp +../../include/eepp/ui/uihelper.hpp +../../include/eepp/ui/tuiitemcontainer.hpp +../../include/eepp/ui/cuiwinmenu.hpp +../../include/eepp/ui/cuiwindow.hpp +../../include/eepp/ui/cuitooltip.hpp +../../include/eepp/ui/cuithememanager.hpp +../../include/eepp/ui/cuitheme.hpp +../../include/eepp/ui/cuitextinput.hpp +../../include/eepp/ui/cuitextedit.hpp +../../include/eepp/ui/cuitextbox.hpp +../../include/eepp/ui/cuitabwidget.hpp +../../include/eepp/ui/cuitab.hpp +../../include/eepp/ui/cuisprite.hpp +../../include/eepp/ui/cuispinbox.hpp +../../include/eepp/ui/cuisliderbutton.hpp +../../include/eepp/ui/cuislider.hpp +../../include/eepp/ui/cuiskinstate.hpp +../../include/eepp/ui/cuiskinsimple.hpp +../../include/eepp/ui/cuiskincomplex.hpp +../../include/eepp/ui/cuiskin.hpp +../../include/eepp/ui/cuiseparator.hpp +../../include/eepp/ui/cuiselectbutton.hpp +../../include/eepp/ui/cuiscrollbar.hpp +../../include/eepp/ui/cuiradiobutton.hpp +../../include/eepp/ui/cuipushbutton.hpp +../../include/eepp/ui/cuiprogressbar.hpp +../../include/eepp/ui/cuipopupmenu.hpp +../../include/eepp/ui/cuimessagebox.hpp +../../include/eepp/ui/cuimessage.hpp +../../include/eepp/ui/cuimenusubmenu.hpp +../../include/eepp/ui/cuimenuitem.hpp +../../include/eepp/ui/cuimenucheckbox.hpp +../../include/eepp/ui/cuimenu.hpp +../../include/eepp/ui/cuimanager.hpp +../../include/eepp/ui/cuilistboxitem.hpp +../../include/eepp/ui/cuilistbox.hpp +../../include/eepp/ui/cuigridcell.hpp +../../include/eepp/ui/cuigfx.hpp +../../include/eepp/ui/cuigenericgrid.hpp +../../include/eepp/ui/cuieventmouse.hpp +../../include/eepp/ui/cuieventkey.hpp +../../include/eepp/ui/cuievent.hpp +../../include/eepp/ui/cuidropdownlist.hpp +../../include/eepp/ui/cuidragable.hpp +../../include/eepp/ui/cuicontrolanim.hpp +../../include/eepp/ui/cuicontrol.hpp +../../include/eepp/ui/cuicomplexcontrol.hpp +../../include/eepp/ui/cuicommondialog.hpp +../../include/eepp/ui/cuicombobox.hpp +../../include/eepp/ui/cuicheckbox.hpp +../../include/eepp/ui/cuiborder.hpp +../../include/eepp/ui/cuibackground.hpp +../../include/eepp/ui/cuiaquatheme.hpp +../../include/eepp/ui/base.hpp +../../include/eepp/ui/tools/ctexturegroupshapeeditor.hpp +../../include/eepp/ui/tools/ctexturegroupnew.hpp +../../include/eepp/ui/tools/ctexturegroupeditor.hpp +../../src/eepp/ui/uihelper.cpp +../../src/eepp/ui/cuiwinmenu.cpp +../../src/eepp/ui/cuiwindow.cpp +../../src/eepp/ui/cuitooltip.cpp +../../src/eepp/ui/cuithememanager.cpp +../../src/eepp/ui/cuitheme.cpp +../../src/eepp/ui/cuitextinput.cpp +../../src/eepp/ui/cuitextedit.cpp +../../src/eepp/ui/cuitextbox.cpp +../../src/eepp/ui/cuitabwidget.cpp +../../src/eepp/ui/cuitab.cpp +../../src/eepp/ui/cuisprite.cpp +../../src/eepp/ui/cuispinbox.cpp +../../src/eepp/ui/cuisliderbutton.cpp +../../src/eepp/ui/cuislider.cpp +../../src/eepp/ui/cuiskinstate.cpp +../../src/eepp/ui/cuiskinsimple.cpp +../../src/eepp/ui/cuiskincomplex.cpp +../../src/eepp/ui/cuiskin.cpp +../../src/eepp/ui/cuiseparator.cpp +../../src/eepp/ui/cuiselectbutton.cpp +../../src/eepp/ui/cuiscrollbar.cpp +../../src/eepp/ui/cuiradiobutton.cpp +../../src/eepp/ui/cuipushbutton.cpp +../../src/eepp/ui/cuiprogressbar.cpp +../../src/eepp/ui/cuipopupmenu.cpp +../../src/eepp/ui/cuimessagebox.cpp +../../src/eepp/ui/cuimessage.cpp +../../src/eepp/ui/cuimenusubmenu.cpp +../../src/eepp/ui/cuimenuitem.cpp +../../src/eepp/ui/cuimenucheckbox.cpp +../../src/eepp/ui/cuimenu.cpp +../../src/eepp/ui/cuimanager.cpp +../../src/eepp/ui/cuilistboxitem.cpp +../../src/eepp/ui/cuilistbox.cpp +../../src/eepp/ui/cuigridcell.cpp +../../src/eepp/ui/cuigfx.cpp +../../src/eepp/ui/cuigenericgrid.cpp +../../src/eepp/ui/cuieventmouse.cpp +../../src/eepp/ui/cuieventkey.cpp +../../src/eepp/ui/cuievent.cpp +../../src/eepp/ui/cuidropdownlist.cpp +../../src/eepp/ui/cuidragable.cpp +../../src/eepp/ui/cuicontrolanim.cpp +../../src/eepp/ui/cuicontrol.cpp +../../src/eepp/ui/cuicomplexcontrol.cpp +../../src/eepp/ui/cuicommondialog.cpp +../../src/eepp/ui/cuicombobox.cpp +../../src/eepp/ui/cuicheckbox.cpp +../../src/eepp/ui/cuiborder.cpp +../../src/eepp/ui/cuibackground.cpp +../../src/eepp/ui/cuiaquatheme.cpp +../../src/eepp/ui/tools/ctexturegroupshapeeditor.cpp +../../src/eepp/ui/tools/ctexturegroupnew.cpp +../../src/eepp/ui/tools/ctexturegroupeditor.cpp +../../include/eepp/utils/vector3.hpp +../../include/eepp/utils/vector2.hpp +../../include/eepp/utils/utils.hpp +../../include/eepp/utils/triangle2.hpp +../../include/eepp/utils/string.hpp +../../include/eepp/utils/size.hpp +../../include/eepp/utils/safedatapointer.hpp +../../include/eepp/utils/rect.hpp +../../include/eepp/utils/quad2.hpp +../../include/eepp/utils/polygon2.hpp +../../include/eepp/utils/line2.hpp +../../include/eepp/utils/helper.hpp +../../include/eepp/utils/easing.hpp +../../include/eepp/utils/cwaypoints.hpp +../../include/eepp/utils/cperlinnoise.hpp +../../include/eepp/utils/colors.hpp +../../include/eepp/utils/cinterpolation.hpp +../../include/eepp/utils/base.hpp +../../src/eepp/utils/utils.cpp +../../src/eepp/utils/string.cpp +../../src/eepp/utils/safedatapointer.cpp +../../src/eepp/utils/easing.cpp +../../src/eepp/utils/cwaypoints.cpp +../../src/eepp/utils/cperlinnoise.cpp +../../src/eepp/utils/cinterpolation.cpp +../../include/eepp/window/keycodes.hpp +../../include/eepp/window/joycodes.hpp +../../include/eepp/window/inputhelper.hpp +../../include/eepp/window/inputevent.hpp +../../include/eepp/window/cwindow.hpp +../../include/eepp/window/cview.hpp +../../include/eepp/window/cursorhelper.hpp +../../include/eepp/window/cplatformimpl.hpp +../../include/eepp/window/cjoystickmanager.hpp +../../include/eepp/window/cjoystick.hpp +../../include/eepp/window/cinputtextbuffer.hpp +../../include/eepp/window/cinputfinger.hpp +../../include/eepp/window/cinput.hpp +../../include/eepp/window/cengine.hpp +../../include/eepp/window/ccursormanager.hpp +../../include/eepp/window/ccursor.hpp +../../include/eepp/window/cclipboard.hpp +../../include/eepp/window/cbackend.hpp +../../include/eepp/window/base.hpp +../../src/eepp/window/inputhelper.cpp +../../src/eepp/window/cwindow.cpp +../../src/eepp/window/cview.cpp +../../src/eepp/window/cplatformimpl.cpp +../../src/eepp/window/cjoystickmanager.cpp +../../src/eepp/window/cjoystick.cpp +../../src/eepp/window/cinputtextbuffer.cpp +../../src/eepp/window/cinputfinger.cpp +../../src/eepp/window/cinput.cpp +../../src/eepp/window/cengine.cpp +../../src/eepp/window/ccursormanager.cpp +../../src/eepp/window/ccursor.cpp +../../src/eepp/window/cclipboard.cpp +../../src/eepp/window/backend/SDL/cwindowsdl.hpp +../../src/eepp/window/backend/SDL/cjoysticksdl.hpp +../../src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp +../../src/eepp/window/backend/SDL/cinputsdl.hpp +../../src/eepp/window/backend/SDL/ccursorsdl.hpp +../../src/eepp/window/backend/SDL/ccursormanagersdl.hpp +../../src/eepp/window/backend/SDL/cclipboardsdl.hpp +../../src/eepp/window/backend/SDL/cbackendsdl.hpp +../../src/eepp/window/backend/SDL/base.hpp +../../src/eepp/window/backend/SDL/cwindowsdl.cpp +../../src/eepp/window/backend/SDL/cjoysticksdl.cpp +../../src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp +../../src/eepp/window/backend/SDL/cinputsdl.cpp +../../src/eepp/window/backend/SDL/ccursorsdl.cpp +../../src/eepp/window/backend/SDL/ccursormanagersdl.cpp +../../src/eepp/window/backend/SDL/cclipboardsdl.cpp +../../src/eepp/window/backend/SDL2/cwindowsdl.hpp +../../src/eepp/window/backend/SDL2/cjoysticksdl.hpp +../../src/eepp/window/backend/SDL2/cjoystickmanagersdl.hpp +../../src/eepp/window/backend/SDL2/cinputsdl.hpp +../../src/eepp/window/backend/SDL2/ccursorsdl.hpp +../../src/eepp/window/backend/SDL2/ccursormanagersdl.hpp +../../src/eepp/window/backend/SDL2/cclipboardsdl.hpp +../../src/eepp/window/backend/SDL2/cbackendsdl.hpp +../../src/eepp/window/backend/SDL2/base.hpp +../../src/eepp/window/backend/SDL2/cwindowsdl.cpp +../../src/eepp/window/backend/SDL2/cjoysticksdl.cpp +../../src/eepp/window/backend/SDL2/cjoystickmanagersdl.cpp +../../src/eepp/window/backend/SDL2/cinputsdl.cpp +../../src/eepp/window/backend/SDL2/ccursorsdl.cpp +../../src/eepp/window/backend/SDL2/ccursormanagersdl.cpp +../../src/eepp/window/backend/SDL2/cclipboardsdl.cpp +../../src/eepp/window/backend/allegro5/cwindowal.hpp +../../src/eepp/window/backend/allegro5/cjoystickmanageral.hpp +../../src/eepp/window/backend/allegro5/cjoystickal.hpp +../../src/eepp/window/backend/allegro5/cinputal.hpp +../../src/eepp/window/backend/allegro5/ccursormanageral.hpp +../../src/eepp/window/backend/allegro5/ccursoral.hpp +../../src/eepp/window/backend/allegro5/cclipboardal.hpp +../../src/eepp/window/backend/allegro5/cbackendal.hpp +../../src/eepp/window/backend/allegro5/cwindowal.cpp +../../src/eepp/window/backend/allegro5/cjoystickmanageral.cpp +../../src/eepp/window/backend/allegro5/cjoystickal.cpp +../../src/eepp/window/backend/allegro5/cinputal.cpp +../../src/eepp/window/backend/allegro5/ccursormanageral.cpp +../../src/eepp/window/backend/allegro5/ccursoral.cpp +../../src/eepp/window/backend/allegro5/cclipboardal.cpp +../../src/eepp/window/backend/null/cwindownull.hpp +../../src/eepp/window/backend/null/cjoysticknull.hpp +../../src/eepp/window/backend/null/cjoystickmanagernull.hpp +../../src/eepp/window/backend/null/cinputnull.hpp +../../src/eepp/window/backend/null/ccursornull.hpp +../../src/eepp/window/backend/null/ccursormanagernull.hpp +../../src/eepp/window/backend/null/cclipboardnull.hpp +../../src/eepp/window/backend/null/cbackendnull.hpp +../../src/eepp/window/backend/null/cwindownull.cpp +../../src/eepp/window/backend/null/cjoysticknull.cpp +../../src/eepp/window/backend/null/cjoystickmanagernull.cpp +../../src/eepp/window/backend/null/cinputnull.cpp +../../src/eepp/window/backend/null/ccursornull.cpp +../../src/eepp/window/backend/null/ccursormanagernull.cpp +../../src/eepp/window/backend/null/cclipboardnull.cpp +../../src/eepp/window/platform/null/cnullimpl.hpp +../../src/eepp/window/platform/null/cnullimpl.cpp +../../src/eepp/window/platform/osx/cosximpl.hpp +../../src/eepp/window/platform/osx/cosximpl.cpp +../../src/eepp/window/platform/win/cwinimpl.hpp +../../src/eepp/window/platform/win/ccursorwin.hpp +../../src/eepp/window/platform/win/cwinimpl.cpp +../../src/eepp/window/platform/win/ccursorwin.cpp +../../src/eepp/window/platform/x11/cx11impl.hpp +../../src/eepp/window/platform/x11/ccursorx11.hpp +../../src/eepp/window/platform/x11/cx11impl.cpp +../../src/eepp/window/platform/x11/ccursorx11.cpp +../../src/eepp/window/platform/platformimpl.hpp diff --git a/src/base/base.hpp b/src/base/base.hpp deleted file mode 100644 index ba4024773..000000000 --- a/src/base/base.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef EE_BASE_BASE_HPP -#define EE_BASE_BASE_HPP - -#include "string.hpp" -#include "utf.hpp" -#include "debug.hpp" -#include "memorymanager.hpp" -#include "allocator.hpp" -#include "stlcontainers.hpp" - -#endif diff --git a/src/audio/caudiodevice.cpp b/src/eepp/audio/caudiodevice.cpp similarity index 96% rename from src/audio/caudiodevice.cpp rename to src/eepp/audio/caudiodevice.cpp index b52150b9f..9297cd288 100755 --- a/src/audio/caudiodevice.cpp +++ b/src/eepp/audio/caudiodevice.cpp @@ -1,5 +1,5 @@ -#include "caudiodevice.hpp" -#include "caudiolistener.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/caudiolistener.cpp b/src/eepp/audio/caudiolistener.cpp similarity index 97% rename from src/audio/caudiolistener.cpp rename to src/eepp/audio/caudiolistener.cpp index b8433ab34..1ab9f6653 100755 --- a/src/audio/caudiolistener.cpp +++ b/src/eepp/audio/caudiolistener.cpp @@ -1,4 +1,4 @@ -#include "caudiolistener.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/caudioresource.cpp b/src/eepp/audio/caudioresource.cpp similarity index 80% rename from src/audio/caudioresource.cpp rename to src/eepp/audio/caudioresource.cpp index 75c6b5f6b..df5fa9ee1 100755 --- a/src/audio/caudioresource.cpp +++ b/src/eepp/audio/caudioresource.cpp @@ -1,4 +1,4 @@ -#include "caudioresource.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/cmusic.cpp b/src/eepp/audio/cmusic.cpp similarity index 97% rename from src/audio/cmusic.cpp rename to src/eepp/audio/cmusic.cpp index 7f2fbe2f0..6aff33a1d 100755 --- a/src/audio/cmusic.cpp +++ b/src/eepp/audio/cmusic.cpp @@ -1,5 +1,5 @@ -#include "cmusic.hpp" -#include "../system/cpackmanager.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/csound.cpp b/src/eepp/audio/csound.cpp similarity index 99% rename from src/audio/csound.cpp rename to src/eepp/audio/csound.cpp index 496e1b799..8daaae28a 100755 --- a/src/audio/csound.cpp +++ b/src/eepp/audio/csound.cpp @@ -1,4 +1,4 @@ -#include "csound.hpp" +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundbuffer.cpp b/src/eepp/audio/csoundbuffer.cpp similarity index 97% rename from src/audio/csoundbuffer.cpp rename to src/eepp/audio/csoundbuffer.cpp index 977165c92..1bd68b63f 100755 --- a/src/audio/csoundbuffer.cpp +++ b/src/eepp/audio/csoundbuffer.cpp @@ -1,7 +1,7 @@ -#include "csoundbuffer.hpp" -#include "csound.hpp" -#include "caudiodevice.hpp" -#include "../system/cpackmanager.hpp" +#include +#include +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundfile.cpp b/src/eepp/audio/csoundfile.cpp similarity index 94% rename from src/audio/csoundfile.cpp rename to src/eepp/audio/csoundfile.cpp index 432dc9e66..e2a484e3f 100755 --- a/src/audio/csoundfile.cpp +++ b/src/eepp/audio/csoundfile.cpp @@ -1,8 +1,8 @@ -#include "csoundfile.hpp" -#ifndef EE_NO_SNDFILE -#include "csoundfiledefault.hpp" +#include +#ifdef EE_LIBSNDFILE_ENABLED +#include #endif -#include "csoundfileogg.hpp" +#include namespace EE { namespace Audio { @@ -22,7 +22,7 @@ cSoundFile * cSoundFile::CreateRead( const std::string& Filename ) { cSoundFile * File = NULL; if ( cSoundFileOgg::IsFileSupported( Filename, true ) ) File = eeNew( cSoundFileOgg, () ); - #ifndef EE_NO_SNDFILE + #ifdef EE_LIBSNDFILE_ENABLED else if ( cSoundFileDefault::IsFileSupported( Filename, true ) ) File = eeNew( cSoundFileDefault, () ); #endif @@ -53,7 +53,7 @@ cSoundFile * cSoundFile::CreateRead( const char* Data, std::size_t SizeInMemory cSoundFile * File = NULL; if ( cSoundFileOgg::IsFileSupported( Data, SizeInMemory ) ) File = eeNew( cSoundFileOgg, () ); - #ifndef EE_NO_SNDFILE + #ifdef EE_LIBSNDFILE_ENABLED else if ( cSoundFileDefault::IsFileSupported( Data, SizeInMemory ) ) File = eeNew( cSoundFileDefault, () ); #endif @@ -84,7 +84,7 @@ cSoundFile * cSoundFile::CreateWrite( const std::string& Filename, unsigned int cSoundFile * File = NULL; if ( cSoundFileOgg::IsFileSupported( Filename, false ) ) File = eeNew( cSoundFileOgg, () ); - #ifndef EE_NO_SNDFILE + #ifdef EE_LIBSNDFILE_ENABLED else if ( cSoundFileDefault::IsFileSupported( Filename, false ) ) File = eeNew( cSoundFileDefault, () ); #endif diff --git a/src/audio/csoundfiledefault.cpp b/src/eepp/audio/csoundfiledefault.cpp similarity index 99% rename from src/audio/csoundfiledefault.cpp rename to src/eepp/audio/csoundfiledefault.cpp index 23e05c604..d20db20a9 100755 --- a/src/audio/csoundfiledefault.cpp +++ b/src/eepp/audio/csoundfiledefault.cpp @@ -1,6 +1,6 @@ -#include "csoundfiledefault.hpp" +#include -#ifndef EE_NO_SNDFILE +#ifdef EE_LIBSNDFILE_ENABLED namespace EE { namespace Audio { diff --git a/src/audio/csoundfileogg.cpp b/src/eepp/audio/csoundfileogg.cpp similarity index 97% rename from src/audio/csoundfileogg.cpp rename to src/eepp/audio/csoundfileogg.cpp index c4d3e63f1..86d2fb922 100755 --- a/src/audio/csoundfileogg.cpp +++ b/src/eepp/audio/csoundfileogg.cpp @@ -1,4 +1,5 @@ -#include "csoundfileogg.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/csoundstream.cpp b/src/eepp/audio/csoundstream.cpp similarity index 98% rename from src/audio/csoundstream.cpp rename to src/eepp/audio/csoundstream.cpp index 7640b374b..fa4d3a33d 100755 --- a/src/audio/csoundstream.cpp +++ b/src/eepp/audio/csoundstream.cpp @@ -1,5 +1,5 @@ -#include "csoundstream.hpp" -#include "caudiodevice.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/audio/openal.cpp b/src/eepp/audio/openal.cpp similarity index 94% rename from src/audio/openal.cpp rename to src/eepp/audio/openal.cpp index c0fbe9e12..c03178b0a 100644 --- a/src/audio/openal.cpp +++ b/src/eepp/audio/openal.cpp @@ -1,5 +1,5 @@ -#include "openal.hpp" -#include "caudiodevice.hpp" +#include +#include namespace EE { namespace Audio { diff --git a/src/base/debug.cpp b/src/eepp/base/debug.cpp similarity index 96% rename from src/base/debug.cpp rename to src/eepp/base/debug.cpp index 23f29ea7c..d9a32f6df 100644 --- a/src/base/debug.cpp +++ b/src/eepp/base/debug.cpp @@ -1,5 +1,3 @@ -#include "debug.hpp" - #ifdef EE_COMPILER_MSVC #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -7,7 +5,8 @@ #include #endif -#include "../system/clog.hpp" +#include +#include using namespace EE::System; namespace EE { diff --git a/src/base/memorymanager.cpp b/src/eepp/base/memorymanager.cpp similarity index 97% rename from src/base/memorymanager.cpp rename to src/eepp/base/memorymanager.cpp index d8462c507..e7ed7b24d 100644 --- a/src/base/memorymanager.cpp +++ b/src/eepp/base/memorymanager.cpp @@ -1,9 +1,8 @@ -#include "memorymanager.hpp" #include #include -#include "debug.hpp" - -#include "../system/clog.hpp" +#include +#include +#include using namespace EE::System; namespace EE { diff --git a/src/base/string.cpp b/src/eepp/base/string.cpp similarity index 99% rename from src/base/string.cpp rename to src/eepp/base/string.cpp index ede2b698b..d4f533ae9 100644 --- a/src/base/string.cpp +++ b/src/eepp/base/string.cpp @@ -1,6 +1,6 @@ -#include "string.hpp" -#include "utf.hpp" #include +#include +#include namespace EE { diff --git a/src/gaming/cgameobject.cpp b/src/eepp/gaming/cgameobject.cpp similarity index 97% rename from src/gaming/cgameobject.cpp rename to src/eepp/gaming/cgameobject.cpp index 886bcb5f4..8017f3536 100644 --- a/src/gaming/cgameobject.cpp +++ b/src/eepp/gaming/cgameobject.cpp @@ -1,5 +1,5 @@ -#include "cgameobject.hpp" -#include "ctilelayer.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectshape.cpp b/src/eepp/gaming/cgameobjectshape.cpp similarity index 93% rename from src/gaming/cgameobjectshape.cpp rename to src/eepp/gaming/cgameobjectshape.cpp index d4f2d9410..6fdbeee5a 100644 --- a/src/gaming/cgameobjectshape.cpp +++ b/src/eepp/gaming/cgameobjectshape.cpp @@ -1,8 +1,8 @@ -#include "cgameobjectshape.hpp" -#include "cmap.hpp" -#include "ctilelayer.hpp" -#include "clightmanager.hpp" -#include "../graphics/cshapegroupmanager.hpp" +#include +#include +#include +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectshapeex.cpp b/src/eepp/gaming/cgameobjectshapeex.cpp similarity index 96% rename from src/gaming/cgameobjectshapeex.cpp rename to src/eepp/gaming/cgameobjectshapeex.cpp index da90dd5a8..3a21b46dc 100644 --- a/src/gaming/cgameobjectshapeex.cpp +++ b/src/eepp/gaming/cgameobjectshapeex.cpp @@ -1,6 +1,6 @@ -#include "cgameobjectshapeex.hpp" -#include "cmap.hpp" -#include "ctilelayer.hpp" +#include +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectsprite.cpp b/src/eepp/gaming/cgameobjectsprite.cpp similarity index 95% rename from src/gaming/cgameobjectsprite.cpp rename to src/eepp/gaming/cgameobjectsprite.cpp index ecd6f7f43..3a97f5dab 100644 --- a/src/gaming/cgameobjectsprite.cpp +++ b/src/eepp/gaming/cgameobjectsprite.cpp @@ -1,7 +1,7 @@ -#include "cgameobjectsprite.hpp" -#include "../graphics/cshapegroupmanager.hpp" -#include "cmap.hpp" -#include "ctilelayer.hpp" +#include +#include +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cgameobjectvirtual.cpp b/src/eepp/gaming/cgameobjectvirtual.cpp similarity index 94% rename from src/gaming/cgameobjectvirtual.cpp rename to src/eepp/gaming/cgameobjectvirtual.cpp index d109c0268..065b5c642 100644 --- a/src/gaming/cgameobjectvirtual.cpp +++ b/src/eepp/gaming/cgameobjectvirtual.cpp @@ -1,9 +1,9 @@ -#include "cgameobjectvirtual.hpp" +#include -#include "cmap.hpp" -#include "clayer.hpp" -#include "ctilelayer.hpp" -#include "../graphics/cprimitives.hpp" +#include +#include +#include +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cisomap.cpp b/src/eepp/gaming/cisomap.cpp similarity index 99% rename from src/gaming/cisomap.cpp rename to src/eepp/gaming/cisomap.cpp index e673a8a78..14563c8bb 100755 --- a/src/gaming/cisomap.cpp +++ b/src/eepp/gaming/cisomap.cpp @@ -1,4 +1,4 @@ -#include "cisomap.hpp" +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clayer.cpp b/src/eepp/gaming/clayer.cpp similarity index 96% rename from src/gaming/clayer.cpp rename to src/eepp/gaming/clayer.cpp index 02334433e..5c7f45993 100644 --- a/src/gaming/clayer.cpp +++ b/src/eepp/gaming/clayer.cpp @@ -1,5 +1,5 @@ -#include "clayer.hpp" -#include "cmap.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clight.cpp b/src/eepp/gaming/clight.cpp similarity index 99% rename from src/gaming/clight.cpp rename to src/eepp/gaming/clight.cpp index d75884c6f..d33553fc8 100755 --- a/src/gaming/clight.cpp +++ b/src/eepp/gaming/clight.cpp @@ -1,4 +1,4 @@ -#include "clight.hpp" +#include namespace EE { namespace Gaming { diff --git a/src/gaming/clightmanager.cpp b/src/eepp/gaming/clightmanager.cpp similarity index 98% rename from src/gaming/clightmanager.cpp rename to src/eepp/gaming/clightmanager.cpp index 3f079bf3f..af2373b27 100644 --- a/src/gaming/clightmanager.cpp +++ b/src/eepp/gaming/clightmanager.cpp @@ -1,5 +1,5 @@ -#include "clightmanager.hpp" -#include "cmap.hpp" +#include +#include namespace EE { namespace Gaming { diff --git a/src/gaming/cmap.cpp b/src/eepp/gaming/cmap.cpp similarity index 98% rename from src/gaming/cmap.cpp rename to src/eepp/gaming/cmap.cpp index 327d88560..3fa7d17aa 100644 --- a/src/gaming/cmap.cpp +++ b/src/eepp/gaming/cmap.cpp @@ -1,17 +1,17 @@ -#include "cmap.hpp" -#include "cgameobjectvirtual.hpp" -#include "cgameobjectshape.hpp" -#include "cgameobjectshapeex.hpp" -#include "cgameobjectsprite.hpp" -#include "ctilelayer.hpp" -#include "cobjectlayer.hpp" +#include +#include +#include +#include +#include +#include +#include -#include "../system/cpackmanager.hpp" +#include -#include "../graphics/cprimitives.hpp" -#include "../graphics/cshapegroupmanager.hpp" -#include "../graphics/ctexturegrouploader.hpp" -#include "../ui/cuithememanager.hpp" +#include +#include +#include +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/cobjectlayer.cpp b/src/eepp/gaming/cobjectlayer.cpp similarity index 93% rename from src/gaming/cobjectlayer.cpp rename to src/eepp/gaming/cobjectlayer.cpp index 233b3bbdb..4ece51531 100644 --- a/src/gaming/cobjectlayer.cpp +++ b/src/eepp/gaming/cobjectlayer.cpp @@ -1,8 +1,8 @@ -#include "cobjectlayer.hpp" -#include "cmap.hpp" +#include +#include -#include "../graphics/cglobalbatchrenderer.hpp" -#include "../graphics/renderer/cgl.hpp" +#include +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/ctilelayer.cpp b/src/eepp/gaming/ctilelayer.cpp similarity index 95% rename from src/gaming/ctilelayer.cpp rename to src/eepp/gaming/ctilelayer.cpp index ba1e61f6b..a48dba980 100644 --- a/src/gaming/ctilelayer.cpp +++ b/src/eepp/gaming/ctilelayer.cpp @@ -1,8 +1,8 @@ -#include "ctilelayer.hpp" -#include "cmap.hpp" +#include +#include -#include "../graphics/cglobalbatchrenderer.hpp" -#include "../graphics/renderer/cgl.hpp" +#include +#include using namespace EE::Graphics; namespace EE { namespace Gaming { diff --git a/src/gaming/mapeditor/clayerproperties.cpp b/src/eepp/gaming/mapeditor/clayerproperties.cpp similarity index 99% rename from src/gaming/mapeditor/clayerproperties.cpp rename to src/eepp/gaming/mapeditor/clayerproperties.cpp index 811e22df8..6f55cbd69 100644 --- a/src/gaming/mapeditor/clayerproperties.cpp +++ b/src/eepp/gaming/mapeditor/clayerproperties.cpp @@ -1,4 +1,4 @@ -#include "clayerproperties.hpp" +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/gaming/mapeditor/cmapeditor.cpp b/src/eepp/gaming/mapeditor/cmapeditor.cpp similarity index 97% rename from src/gaming/mapeditor/cmapeditor.cpp rename to src/eepp/gaming/mapeditor/cmapeditor.cpp index 21460d978..ecbb98ffd 100644 --- a/src/gaming/mapeditor/cmapeditor.cpp +++ b/src/eepp/gaming/mapeditor/cmapeditor.cpp @@ -1,29 +1,29 @@ -#include "cmapeditor.hpp" -#include "cuimapnew.hpp" -#include "cuilayernew.hpp" -#include "cuigotypenew.hpp" -#include "cmapproperties.hpp" -#include "clayerproperties.hpp" +#include +#include +#include +#include +#include +#include -#include "../ctilelayer.hpp" -#include "../cobjectlayer.hpp" -#include "../cgameobjectvirtual.hpp" -#include "../cgameobjectshape.hpp" -#include "../cgameobjectshapeex.hpp" -#include "../cgameobjectsprite.hpp" -#include "../../ui/cuimanager.hpp" -#include "../../ui/cuithememanager.hpp" -#include "../../ui/cuiwinmenu.hpp" -#include "../../ui/cuipopupmenu.hpp" -#include "../../ui/cuispinbox.hpp" -#include "../../ui/cuicheckbox.hpp" -#include "../../ui/cuicommondialog.hpp" -#include "../../ui/cuimessagebox.hpp" -#include "../../ui/cuitabwidget.hpp" -#include "../../ui/tools/ctexturegroupeditor.hpp" -#include "../../graphics/cshapegroupmanager.hpp" -#include "../../graphics/cglobalshapegroup.hpp" -#include "../../graphics/ctexturegrouploader.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace EE::Graphics; diff --git a/src/gaming/mapeditor/cmapproperties.cpp b/src/eepp/gaming/mapeditor/cmapproperties.cpp similarity index 99% rename from src/gaming/mapeditor/cmapproperties.cpp rename to src/eepp/gaming/mapeditor/cmapproperties.cpp index 4f2b6999c..e2041ba77 100644 --- a/src/gaming/mapeditor/cmapproperties.cpp +++ b/src/eepp/gaming/mapeditor/cmapproperties.cpp @@ -1,4 +1,4 @@ -#include "cmapproperties.hpp" +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/gaming/mapeditor/cuigotypenew.cpp b/src/eepp/gaming/mapeditor/cuigotypenew.cpp similarity index 96% rename from src/gaming/mapeditor/cuigotypenew.cpp rename to src/eepp/gaming/mapeditor/cuigotypenew.cpp index 524681ccf..3438cfec7 100644 --- a/src/gaming/mapeditor/cuigotypenew.cpp +++ b/src/eepp/gaming/mapeditor/cuigotypenew.cpp @@ -1,5 +1,5 @@ -#include "cuigotypenew.hpp" -#include "../../ui/cuitextinput.hpp" +#include +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/gaming/mapeditor/cuilayernew.cpp b/src/eepp/gaming/mapeditor/cuilayernew.cpp similarity index 97% rename from src/gaming/mapeditor/cuilayernew.cpp rename to src/eepp/gaming/mapeditor/cuilayernew.cpp index 1a7a9ca2e..f06bc362f 100644 --- a/src/gaming/mapeditor/cuilayernew.cpp +++ b/src/eepp/gaming/mapeditor/cuilayernew.cpp @@ -1,5 +1,5 @@ -#include "cuilayernew.hpp" -#include "../../ui/cuitextinput.hpp" +#include +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/gaming/mapeditor/cuimap.cpp b/src/eepp/gaming/mapeditor/cuimap.cpp similarity index 98% rename from src/gaming/mapeditor/cuimap.cpp rename to src/eepp/gaming/mapeditor/cuimap.cpp index b7c330839..865af676e 100644 --- a/src/gaming/mapeditor/cuimap.cpp +++ b/src/eepp/gaming/mapeditor/cuimap.cpp @@ -1,5 +1,5 @@ -#include "cuimap.hpp" -#include "../../ui/cuimanager.hpp" +#include +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/gaming/mapeditor/cuimapnew.cpp b/src/eepp/gaming/mapeditor/cuimapnew.cpp similarity index 98% rename from src/gaming/mapeditor/cuimapnew.cpp rename to src/eepp/gaming/mapeditor/cuimapnew.cpp index 4b2a376c0..2dbc7af6a 100644 --- a/src/gaming/mapeditor/cuimapnew.cpp +++ b/src/eepp/gaming/mapeditor/cuimapnew.cpp @@ -1,7 +1,7 @@ -#include "cuimapnew.hpp" -#include "../../ui/cuispinbox.hpp" -#include "../../ui/cuicheckbox.hpp" -#include "../../ui/cuislider.hpp" +#include +#include +#include +#include namespace EE { namespace Gaming { namespace MapEditor { diff --git a/src/graphics/cbatchrenderer.cpp b/src/eepp/graphics/cbatchrenderer.cpp similarity index 99% rename from src/graphics/cbatchrenderer.cpp rename to src/eepp/graphics/cbatchrenderer.cpp index e31d7bacb..03cf23b79 100755 --- a/src/graphics/cbatchrenderer.cpp +++ b/src/eepp/graphics/cbatchrenderer.cpp @@ -1,6 +1,6 @@ -#include "cbatchrenderer.hpp" -#include "ctexturefactory.hpp" -#include "cglobalbatchrenderer.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cconsole.cpp b/src/eepp/graphics/cconsole.cpp similarity index 98% rename from src/graphics/cconsole.cpp rename to src/eepp/graphics/cconsole.cpp index 594425832..e7bbc3bbb 100755 --- a/src/graphics/cconsole.cpp +++ b/src/eepp/graphics/cconsole.cpp @@ -1,9 +1,9 @@ -#include "cconsole.hpp" -#include "glhelper.hpp" -#include "../audio/caudiolistener.hpp" -#include "../window/cinput.hpp" -#include "../window/cengine.hpp" -#include "../window/ccursormanager.hpp" +#include +#include +#include +#include +#include +#include using namespace EE::Window; diff --git a/src/graphics/cfont.cpp b/src/eepp/graphics/cfont.cpp similarity index 99% rename from src/graphics/cfont.cpp rename to src/eepp/graphics/cfont.cpp index deeabfbff..56460b769 100644 --- a/src/graphics/cfont.cpp +++ b/src/eepp/graphics/cfont.cpp @@ -1,5 +1,5 @@ -#include "cfont.hpp" -#include "cfontmanager.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cfontmanager.cpp b/src/eepp/graphics/cfontmanager.cpp similarity index 86% rename from src/graphics/cfontmanager.cpp rename to src/eepp/graphics/cfontmanager.cpp index f8a8097f1..25e94858f 100644 --- a/src/graphics/cfontmanager.cpp +++ b/src/eepp/graphics/cfontmanager.cpp @@ -1,4 +1,4 @@ -#include "cfontmanager.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cframebuffer.cpp b/src/eepp/graphics/cframebuffer.cpp similarity index 86% rename from src/graphics/cframebuffer.cpp rename to src/eepp/graphics/cframebuffer.cpp index 9f7abf333..e7aa61104 100644 --- a/src/graphics/cframebuffer.cpp +++ b/src/eepp/graphics/cframebuffer.cpp @@ -1,10 +1,10 @@ -#include "cframebuffer.hpp" -#include "ctexturefactory.hpp" -#include "cglobalbatchrenderer.hpp" -#include "../window/cengine.hpp" -#include "cframebufferfbo.hpp" -#include "cframebufferpbuffer.hpp" -#include "cframebuffermanager.hpp" +#include +#include +#include +#include +#include +#include +#include using namespace EE::Graphics::Private; namespace EE { namespace Graphics { diff --git a/src/graphics/cframebufferfbo.cpp b/src/eepp/graphics/cframebufferfbo.cpp similarity index 95% rename from src/graphics/cframebufferfbo.cpp rename to src/eepp/graphics/cframebufferfbo.cpp index e7f885641..3d9d9f3af 100644 --- a/src/graphics/cframebufferfbo.cpp +++ b/src/eepp/graphics/cframebufferfbo.cpp @@ -1,7 +1,7 @@ -#include "cframebufferfbo.hpp" -#include "ctexturefactory.hpp" -#include "../window/cengine.hpp" -#include "glhelper.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cframebuffermanager.cpp b/src/eepp/graphics/cframebuffermanager.cpp similarity index 88% rename from src/graphics/cframebuffermanager.cpp rename to src/eepp/graphics/cframebuffermanager.cpp index 904831a2b..1ffd625c5 100644 --- a/src/graphics/cframebuffermanager.cpp +++ b/src/eepp/graphics/cframebuffermanager.cpp @@ -1,4 +1,4 @@ -#include "cframebuffermanager.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cframebufferpbuffer.cpp b/src/eepp/graphics/cframebufferpbuffer.cpp similarity index 98% rename from src/graphics/cframebufferpbuffer.cpp rename to src/eepp/graphics/cframebufferpbuffer.cpp index e149834c9..dfb5ee88c 100644 --- a/src/graphics/cframebufferpbuffer.cpp +++ b/src/eepp/graphics/cframebufferpbuffer.cpp @@ -1,6 +1,6 @@ -#include "cframebufferpbuffer.hpp" -#include "ctexturefactory.hpp" -#include "../window/cengine.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cglobalbatchrenderer.cpp b/src/eepp/graphics/cglobalbatchrenderer.cpp similarity index 81% rename from src/graphics/cglobalbatchrenderer.cpp rename to src/eepp/graphics/cglobalbatchrenderer.cpp index edac477e5..7acff85e0 100755 --- a/src/graphics/cglobalbatchrenderer.cpp +++ b/src/eepp/graphics/cglobalbatchrenderer.cpp @@ -1,4 +1,4 @@ -#include "cglobalbatchrenderer.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cglobalshapegroup.cpp b/src/eepp/graphics/cglobalshapegroup.cpp similarity index 68% rename from src/graphics/cglobalshapegroup.cpp rename to src/eepp/graphics/cglobalshapegroup.cpp index 9576d2949..8f6592152 100644 --- a/src/graphics/cglobalshapegroup.cpp +++ b/src/eepp/graphics/cglobalshapegroup.cpp @@ -1,5 +1,5 @@ -#include "cglobalshapegroup.hpp" -#include "cshapegroupmanager.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cimage.cpp b/src/eepp/graphics/cimage.cpp similarity index 98% rename from src/graphics/cimage.cpp rename to src/eepp/graphics/cimage.cpp index 22a0de86c..c61da7425 100644 --- a/src/graphics/cimage.cpp +++ b/src/eepp/graphics/cimage.cpp @@ -1,6 +1,6 @@ -#include "cimage.hpp" -#include "../helper/SOIL/image_helper.h" -#include "../helper/SOIL/SOIL.h" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cparticle.cpp b/src/eepp/graphics/cparticle.cpp similarity index 95% rename from src/graphics/cparticle.cpp rename to src/eepp/graphics/cparticle.cpp index 58472c6c0..77b2ea2e6 100755 --- a/src/graphics/cparticle.cpp +++ b/src/eepp/graphics/cparticle.cpp @@ -1,4 +1,4 @@ -#include "cparticle.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cparticlesystem.cpp b/src/eepp/graphics/cparticlesystem.cpp similarity index 98% rename from src/graphics/cparticlesystem.cpp rename to src/eepp/graphics/cparticlesystem.cpp index 9bc10711e..f30c16ef3 100755 --- a/src/graphics/cparticlesystem.cpp +++ b/src/eepp/graphics/cparticlesystem.cpp @@ -1,7 +1,7 @@ -#include "cparticlesystem.hpp" -#include "glhelper.hpp" -#include "ctexturefactory.hpp" -#include "../window/cengine.hpp" +#include +#include +#include +#include using namespace EE::Window; diff --git a/src/graphics/cprimitives.cpp b/src/eepp/graphics/cprimitives.cpp similarity index 99% rename from src/graphics/cprimitives.cpp rename to src/eepp/graphics/cprimitives.cpp index d859e25fa..8615456fb 100755 --- a/src/graphics/cprimitives.cpp +++ b/src/eepp/graphics/cprimitives.cpp @@ -1,5 +1,5 @@ -#include "cprimitives.hpp" -#include "../utils/polygon2.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cscrollparallax.cpp b/src/eepp/graphics/cscrollparallax.cpp similarity index 98% rename from src/graphics/cscrollparallax.cpp rename to src/eepp/graphics/cscrollparallax.cpp index 98519d229..41e08279c 100755 --- a/src/graphics/cscrollparallax.cpp +++ b/src/eepp/graphics/cscrollparallax.cpp @@ -1,4 +1,4 @@ -#include "cscrollparallax.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshader.cpp b/src/eepp/graphics/cshader.cpp similarity index 98% rename from src/graphics/cshader.cpp rename to src/eepp/graphics/cshader.cpp index a84b7641c..1f589eb3d 100644 --- a/src/graphics/cshader.cpp +++ b/src/eepp/graphics/cshader.cpp @@ -1,6 +1,6 @@ -#include "cshader.hpp" -#include "glhelper.hpp" -#include "renderer/crenderergl3.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshaderprogram.cpp b/src/eepp/graphics/cshaderprogram.cpp similarity index 98% rename from src/graphics/cshaderprogram.cpp rename to src/eepp/graphics/cshaderprogram.cpp index 419695aff..d23d5e487 100644 --- a/src/graphics/cshaderprogram.cpp +++ b/src/eepp/graphics/cshaderprogram.cpp @@ -1,7 +1,7 @@ -#include "cshaderprogram.hpp" -#include "cshaderprogrammanager.hpp" -#include "cglobalbatchrenderer.hpp" -#include "glhelper.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshaderprogrammanager.cpp b/src/eepp/graphics/cshaderprogrammanager.cpp similarity index 87% rename from src/graphics/cshaderprogrammanager.cpp rename to src/eepp/graphics/cshaderprogrammanager.cpp index 9ea741bc8..39ef086b8 100644 --- a/src/graphics/cshaderprogrammanager.cpp +++ b/src/eepp/graphics/cshaderprogrammanager.cpp @@ -1,4 +1,4 @@ -#include "cshaderprogrammanager.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshape.cpp b/src/eepp/graphics/cshape.cpp similarity index 99% rename from src/graphics/cshape.cpp rename to src/eepp/graphics/cshape.cpp index d652904f2..8b591bc24 100644 --- a/src/graphics/cshape.cpp +++ b/src/eepp/graphics/cshape.cpp @@ -1,5 +1,5 @@ -#include "cshape.hpp" -#include "ctexturefactory.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshapegroup.cpp b/src/eepp/graphics/cshapegroup.cpp similarity index 97% rename from src/graphics/cshapegroup.cpp rename to src/eepp/graphics/cshapegroup.cpp index 8c5f41099..1ec27aa79 100644 --- a/src/graphics/cshapegroup.cpp +++ b/src/eepp/graphics/cshapegroup.cpp @@ -1,4 +1,4 @@ -#include "cshapegroup.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cshapegroupmanager.cpp b/src/eepp/graphics/cshapegroupmanager.cpp similarity index 98% rename from src/graphics/cshapegroupmanager.cpp rename to src/eepp/graphics/cshapegroupmanager.cpp index 432ccf896..ada8983b5 100644 --- a/src/graphics/cshapegroupmanager.cpp +++ b/src/eepp/graphics/cshapegroupmanager.cpp @@ -1,5 +1,5 @@ -#include "cshapegroupmanager.hpp" -#include "cglobalshapegroup.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/csprite.cpp b/src/eepp/graphics/csprite.cpp similarity index 99% rename from src/graphics/csprite.cpp rename to src/eepp/graphics/csprite.cpp index 76604857a..6f975acdd 100755 --- a/src/graphics/csprite.cpp +++ b/src/eepp/graphics/csprite.cpp @@ -1,7 +1,7 @@ -#include "csprite.hpp" -#include "../window/cengine.hpp" -#include "cglobalshapegroup.hpp" -#include "cshapegroupmanager.hpp" +#include +#include +#include +#include using namespace EE::Window; diff --git a/src/graphics/ctextcache.cpp b/src/eepp/graphics/ctextcache.cpp similarity index 97% rename from src/graphics/ctextcache.cpp rename to src/eepp/graphics/ctextcache.cpp index 0e96651a6..dfb40d81d 100644 --- a/src/graphics/ctextcache.cpp +++ b/src/eepp/graphics/ctextcache.cpp @@ -1,5 +1,5 @@ -#include "ctextcache.hpp" -#include "cfont.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexture.cpp b/src/eepp/graphics/ctexture.cpp similarity index 99% rename from src/graphics/ctexture.cpp rename to src/eepp/graphics/ctexture.cpp index 87a44e69e..ec3f8ad98 100755 --- a/src/graphics/ctexture.cpp +++ b/src/eepp/graphics/ctexture.cpp @@ -1,6 +1,6 @@ -#include "ctexture.hpp" -#include "ctexturefactory.hpp" -#include "cglobalbatchrenderer.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefactory.cpp b/src/eepp/graphics/ctexturefactory.cpp similarity index 98% rename from src/graphics/ctexturefactory.cpp rename to src/eepp/graphics/ctexturefactory.cpp index d9bcb0e4a..a824d4997 100755 --- a/src/graphics/ctexturefactory.cpp +++ b/src/eepp/graphics/ctexturefactory.cpp @@ -1,6 +1,6 @@ -#include "ctexturefactory.hpp" -#include "ctextureloader.hpp" -#include "glhelper.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefont.cpp b/src/eepp/graphics/ctexturefont.cpp similarity index 97% rename from src/graphics/ctexturefont.cpp rename to src/eepp/graphics/ctexturefont.cpp index de9ab6e87..2b89f3363 100755 --- a/src/graphics/ctexturefont.cpp +++ b/src/eepp/graphics/ctexturefont.cpp @@ -1,6 +1,6 @@ -#include "ctexturefont.hpp" -#include "../system/ciostreamfile.hpp" -#include "../system/ciostreammemory.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturefontloader.cpp b/src/eepp/graphics/ctexturefontloader.cpp similarity index 97% rename from src/graphics/ctexturefontloader.cpp rename to src/eepp/graphics/ctexturefontloader.cpp index 4c095ec90..466ff8ae8 100644 --- a/src/graphics/ctexturefontloader.cpp +++ b/src/eepp/graphics/ctexturefontloader.cpp @@ -1,5 +1,5 @@ -#include "ctexturefontloader.hpp" -#include "cfontmanager.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturegrouploader.cpp b/src/eepp/graphics/ctexturegrouploader.cpp similarity index 97% rename from src/graphics/ctexturegrouploader.cpp rename to src/eepp/graphics/ctexturegrouploader.cpp index fec662b36..2c9d3d486 100644 --- a/src/graphics/ctexturegrouploader.cpp +++ b/src/eepp/graphics/ctexturegrouploader.cpp @@ -1,10 +1,10 @@ -#include "ctexturegrouploader.hpp" -#include "cshapegroup.hpp" -#include "cshapegroupmanager.hpp" -#include "ctexturepacker.hpp" -#include "cshapegroup.hpp" -#include "../system/ciostreamfile.hpp" -#include "../system/ciostreammemory.hpp" +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctextureloader.cpp b/src/eepp/graphics/ctextureloader.cpp similarity index 97% rename from src/graphics/ctextureloader.cpp rename to src/eepp/graphics/ctextureloader.cpp index 147b79714..ea2f2491c 100644 --- a/src/graphics/ctextureloader.cpp +++ b/src/eepp/graphics/ctextureloader.cpp @@ -1,7 +1,7 @@ -#include "ctextureloader.hpp" -#include "ctexturefactory.hpp" -#include "glhelper.hpp" -#include "../system/ciostreamfile.hpp" +#include +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturepacker.cpp b/src/eepp/graphics/ctexturepacker.cpp similarity index 99% rename from src/graphics/ctexturepacker.cpp rename to src/eepp/graphics/ctexturepacker.cpp index 2927f85ca..108973028 100644 --- a/src/graphics/ctexturepacker.cpp +++ b/src/eepp/graphics/ctexturepacker.cpp @@ -1,6 +1,6 @@ -#include "ctexturepacker.hpp" -#include "cimage.hpp" -#include "../system/ciostreamfile.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/ctexturepackernode.cpp b/src/eepp/graphics/ctexturepackernode.cpp similarity index 97% rename from src/graphics/ctexturepackernode.cpp rename to src/eepp/graphics/ctexturepackernode.cpp index e4bb8ae9e..c1b04f986 100644 --- a/src/graphics/ctexturepackernode.cpp +++ b/src/eepp/graphics/ctexturepackernode.cpp @@ -1,4 +1,4 @@ -#include "ctexturepackernode.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/ctexturepackertex.cpp b/src/eepp/graphics/ctexturepackertex.cpp similarity index 88% rename from src/graphics/ctexturepackertex.cpp rename to src/eepp/graphics/ctexturepackertex.cpp index c68d9d56c..213adb130 100644 --- a/src/graphics/ctexturepackertex.cpp +++ b/src/eepp/graphics/ctexturepackertex.cpp @@ -1,5 +1,5 @@ -#include "ctexturepackertex.hpp" -#include "../helper/SOIL/stb_image.h" +#include +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cttffont.cpp b/src/eepp/graphics/cttffont.cpp similarity index 99% rename from src/graphics/cttffont.cpp rename to src/eepp/graphics/cttffont.cpp index 51ccaab74..af9ab40d9 100755 --- a/src/graphics/cttffont.cpp +++ b/src/eepp/graphics/cttffont.cpp @@ -1,6 +1,6 @@ -#include "cttffont.hpp" -#include "../system/ciostreamfile.hpp" -#include "../helper/haikuttf/haikuttf.hpp" +#include +#include +#include using namespace HaikuTTF; namespace EE { namespace Graphics { diff --git a/src/graphics/cttffontloader.cpp b/src/eepp/graphics/cttffontloader.cpp similarity index 97% rename from src/graphics/cttffontloader.cpp rename to src/eepp/graphics/cttffontloader.cpp index 023f5c560..5ad30cd4d 100644 --- a/src/graphics/cttffontloader.cpp +++ b/src/eepp/graphics/cttffontloader.cpp @@ -1,5 +1,5 @@ -#include "cttffontloader.hpp" -#include "cfontmanager.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffer.cpp b/src/eepp/graphics/cvertexbuffer.cpp similarity index 94% rename from src/graphics/cvertexbuffer.cpp rename to src/eepp/graphics/cvertexbuffer.cpp index f26daa8c7..21e8c3882 100644 --- a/src/graphics/cvertexbuffer.cpp +++ b/src/eepp/graphics/cvertexbuffer.cpp @@ -1,8 +1,8 @@ -#include "cvertexbuffer.hpp" -#include "cvertexbufferogl.hpp" -#include "cvertexbuffervbo.hpp" -#include "glhelper.hpp" -#include "cvertexbuffermanager.hpp" +#include +#include +#include +#include +#include using namespace EE::Graphics::Private; namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffermanager.cpp b/src/eepp/graphics/cvertexbuffermanager.cpp similarity index 88% rename from src/graphics/cvertexbuffermanager.cpp rename to src/eepp/graphics/cvertexbuffermanager.cpp index 1cdf67e07..416b7da12 100644 --- a/src/graphics/cvertexbuffermanager.cpp +++ b/src/eepp/graphics/cvertexbuffermanager.cpp @@ -1,4 +1,4 @@ -#include "cvertexbuffermanager.hpp" +#include namespace EE { namespace Graphics { namespace Private { diff --git a/src/graphics/cvertexbufferogl.cpp b/src/eepp/graphics/cvertexbufferogl.cpp similarity index 97% rename from src/graphics/cvertexbufferogl.cpp rename to src/eepp/graphics/cvertexbufferogl.cpp index 35ca097a0..6a5ec4e6a 100644 --- a/src/graphics/cvertexbufferogl.cpp +++ b/src/eepp/graphics/cvertexbufferogl.cpp @@ -1,5 +1,5 @@ -#include "cvertexbufferogl.hpp" -#include "glhelper.hpp" +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/cvertexbuffervbo.cpp b/src/eepp/graphics/cvertexbuffervbo.cpp similarity index 98% rename from src/graphics/cvertexbuffervbo.cpp rename to src/eepp/graphics/cvertexbuffervbo.cpp index 74d284383..544b20c0d 100644 --- a/src/graphics/cvertexbuffervbo.cpp +++ b/src/eepp/graphics/cvertexbuffervbo.cpp @@ -1,6 +1,6 @@ -#include "cvertexbuffervbo.hpp" -#include "glhelper.hpp" -#include "renderer/crenderergl3.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/eepp/graphics/glhelper.cpp b/src/eepp/graphics/glhelper.cpp new file mode 100644 index 000000000..47924b00e --- /dev/null +++ b/src/eepp/graphics/glhelper.cpp @@ -0,0 +1,2 @@ +#include + diff --git a/src/graphics/pixelperfect.cpp b/src/eepp/graphics/pixelperfect.cpp similarity index 98% rename from src/graphics/pixelperfect.cpp rename to src/eepp/graphics/pixelperfect.cpp index 6a7b418de..ab0805bae 100644 --- a/src/graphics/pixelperfect.cpp +++ b/src/eepp/graphics/pixelperfect.cpp @@ -1,4 +1,4 @@ -#include "pixelperfect.hpp" +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renderer/cgl.cpp b/src/eepp/graphics/renderer/cgl.cpp similarity index 98% rename from src/graphics/renderer/cgl.cpp rename to src/eepp/graphics/renderer/cgl.cpp index c009866e7..e1404f571 100644 --- a/src/graphics/renderer/cgl.cpp +++ b/src/eepp/graphics/renderer/cgl.cpp @@ -1,6 +1,6 @@ -#include "cgl.hpp" -#include "crenderergl.hpp" -#include "crenderergl3.hpp" +#include +#include +#include namespace EE { namespace Graphics { diff --git a/src/graphics/renderer/crenderergl.cpp b/src/eepp/graphics/renderer/crenderergl.cpp similarity index 99% rename from src/graphics/renderer/crenderergl.cpp rename to src/eepp/graphics/renderer/crenderergl.cpp index a870fbb8b..0bb32f347 100644 --- a/src/graphics/renderer/crenderergl.cpp +++ b/src/eepp/graphics/renderer/crenderergl.cpp @@ -1,4 +1,4 @@ -#include "crenderergl.hpp" +#include /* * Some of this code is based on the implementation of the functions from diff --git a/src/graphics/renderer/crenderergl3.cpp b/src/eepp/graphics/renderer/crenderergl3.cpp similarity index 99% rename from src/graphics/renderer/crenderergl3.cpp rename to src/eepp/graphics/renderer/crenderergl3.cpp index c9e31e5cd..8595d7555 100644 --- a/src/graphics/renderer/crenderergl3.cpp +++ b/src/eepp/graphics/renderer/crenderergl3.cpp @@ -1,4 +1,4 @@ -#include "crenderergl3.hpp" +#include #ifdef EE_GL3_ENABLED diff --git a/src/eepp/helper/PlusCallback/callback.hpp b/src/eepp/helper/PlusCallback/callback.hpp new file mode 100644 index 000000000..24bf04aa2 --- /dev/null +++ b/src/eepp/helper/PlusCallback/callback.hpp @@ -0,0 +1,2489 @@ +/* + * PlusCallback 1.7 + * Copyright (c) 2009-2010 Lewis Van Winkle + * + * 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 __CALLBACK_HPP__ +#define __CALLBACK_HPP__ + +#include + +#if !defined( __ANDROID__ ) && !defined( ANDROID ) + #define EXCEPTIONS_SUPPORTED +#endif + +#ifdef EXCEPTIONS_SUPPORTED + #include + + #define THROW_RUNTIME_ERROR( R ) throw std::runtime_error(unset_call_error); +#else + #include + + #define THROW_RUNTIME_ERROR( R ) printf( "throw std::runtime_error(unset_call_error)" ); return ( R )NULL; +#endif + +//PlusCallback 1.7 +//This library was built on 12.10.2010 to support +//functions with a maximum of 9 parameters. +#define CALLBACK_VERSION 1.7 + + +namespace cb +{ + + static const std::string unset_call_error("Attempting to invoke null callback."); + + + + ///Stores a callback for a function taking 0 parameters. + ///\tparam R Callback function return type. + template + class Callback0 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback0(C* object, R (C::*function)()) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback0(R (*function)()) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback0() + :mCallback(0) + { + } + + Callback0(const Callback0& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback0& operator=(const Callback0& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback0() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)()) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)()) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback0& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback0& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback0 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()() const + { + if (mCallback) + return (*mCallback)(); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call() const + { + if (mCallback) + return (*mCallback)(); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()() = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)()) + :mFunc(function) + {} + + virtual R operator()() + { + return mFunc(); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)()) + :mObj(object), mFunc(function) + {} + + virtual R operator()() + { + return (mObj->*mFunc)(); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback0 Make0(C* object, R (C::*function)()) + { + return Callback0(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback0 Make0(R (*function)()) + { + return Callback0(function); + } + + + ///Stores a callback for a function taking 1 parameters. + ///\tparam R Callback function return type. + template + class Callback1 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback1(C* object, R (C::*function)(T0 t0)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback1(R (*function)(T0 t0)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback1() + :mCallback(0) + { + } + + Callback1(const Callback1& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback1& operator=(const Callback1& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback1() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback1& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback1& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback1 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0) const + { + if (mCallback) + return (*mCallback)(t0); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0) const + { + if (mCallback) + return (*mCallback)(t0); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0)) + :mFunc(function) + {} + + virtual R operator()(T0 t0) + { + return mFunc(t0); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0) + { + return (mObj->*mFunc)(t0); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback1 Make1(C* object, R (C::*function)(T0 t0)) + { + return Callback1(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback1 Make1(R (*function)(T0 t0)) + { + return Callback1(function); + } + + + ///Stores a callback for a function taking 2 parameters. + ///\tparam R Callback function return type. + template + class Callback2 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback2(C* object, R (C::*function)(T0 t0, T1 t1)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback2(R (*function)(T0 t0, T1 t1)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback2() + :mCallback(0) + { + } + + Callback2(const Callback2& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback2& operator=(const Callback2& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback2() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback2& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback2& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback2 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1) const + { + if (mCallback) + return (*mCallback)(t0, t1); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1) const + { + if (mCallback) + return (*mCallback)(t0, t1); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1) + { + return mFunc(t0, t1); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1) + { + return (mObj->*mFunc)(t0, t1); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback2 Make2(C* object, R (C::*function)(T0 t0, T1 t1)) + { + return Callback2(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback2 Make2(R (*function)(T0 t0, T1 t1)) + { + return Callback2(function); + } + + + ///Stores a callback for a function taking 3 parameters. + ///\tparam R Callback function return type. + template + class Callback3 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback3(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback3(R (*function)(T0 t0, T1 t1, T2 t2)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback3() + :mCallback(0) + { + } + + Callback3(const Callback3& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback3& operator=(const Callback3& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback3() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback3& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback3& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback3 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2) + { + return mFunc(t0, t1, t2); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2) + { + return (mObj->*mFunc)(t0, t1, t2); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback3 Make3(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2)) + { + return Callback3(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback3 Make3(R (*function)(T0 t0, T1 t1, T2 t2)) + { + return Callback3(function); + } + + + ///Stores a callback for a function taking 4 parameters. + ///\tparam R Callback function return type. + template + class Callback4 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback4(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback4(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback4() + :mCallback(0) + { + } + + Callback4(const Callback4& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback4& operator=(const Callback4& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback4() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback4& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback4& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback4 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3) + { + return mFunc(t0, t1, t2, t3); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3) + { + return (mObj->*mFunc)(t0, t1, t2, t3); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback4 Make4(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + { + return Callback4(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback4 Make4(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3)) + { + return Callback4(function); + } + + + ///Stores a callback for a function taking 5 parameters. + ///\tparam R Callback function return type. + template + class Callback5 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback5(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback5(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback5() + :mCallback(0) + { + } + + Callback5(const Callback5& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback5& operator=(const Callback5& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback5() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback5& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback5& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback5 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4) + { + return mFunc(t0, t1, t2, t3, t4); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4) + { + return (mObj->*mFunc)(t0, t1, t2, t3, t4); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback5 Make5(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + { + return Callback5(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback5 Make5(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4)) + { + return Callback5(function); + } + + + ///Stores a callback for a function taking 6 parameters. + ///\tparam R Callback function return type. + template + class Callback6 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback6(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback6(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback6() + :mCallback(0) + { + } + + Callback6(const Callback6& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback6& operator=(const Callback6& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback6() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback6& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback6& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback6 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) + { + return mFunc(t0, t1, t2, t3, t4, t5); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) + { + return (mObj->*mFunc)(t0, t1, t2, t3, t4, t5); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback6 Make6(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + { + return Callback6(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback6 Make6(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)) + { + return Callback6(function); + } + + + ///Stores a callback for a function taking 7 parameters. + ///\tparam R Callback function return type. + template + class Callback7 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback7(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback7(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback7() + :mCallback(0) + { + } + + Callback7(const Callback7& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback7& operator=(const Callback7& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback7() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback7& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback7& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback7 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) + { + return mFunc(t0, t1, t2, t3, t4, t5, t6); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) + { + return (mObj->*mFunc)(t0, t1, t2, t3, t4, t5, t6); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback7 Make7(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + { + return Callback7(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback7 Make7(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)) + { + return Callback7(function); + } + + + ///Stores a callback for a function taking 8 parameters. + ///\tparam R Callback function return type. + template + class Callback8 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback8(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback8(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback8() + :mCallback(0) + { + } + + Callback8(const Callback8& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback8& operator=(const Callback8& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback8() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback8& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback8& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback8 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6, t7); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6, t7); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) + { + return mFunc(t0, t1, t2, t3, t4, t5, t6, t7); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) + { + return (mObj->*mFunc)(t0, t1, t2, t3, t4, t5, t6, t7); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback8 Make8(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + { + return Callback8(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback8 Make8(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7)) + { + return Callback8(function); + } + + + ///Stores a callback for a function taking 9 parameters. + ///\tparam R Callback function return type. + template + class Callback9 + { + public: + ///Constructs the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + Callback9(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + :mCallback(new(&mMem) ChildMethod(object, function)) + { + } + + ///Constructs the callback to a free function or static member function. + ///\param function Free function address to call. + Callback9(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + :mCallback(new(&mMem) ChildFree(function)) + { + } + + ///Constructs a callback that can later be set. + Callback9() + :mCallback(0) + { + } + + Callback9(const Callback9& c) + :mCallback(c.mCallback) + { + if (mCallback) + { + memcpy(mMem, c.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + } + + Callback9& operator=(const Callback9& rhs) + { + mCallback = rhs.mCallback; + if (mCallback) + { + memcpy(mMem, rhs.mMem, sizeof(mMem)); + mCallback = reinterpret_cast(&mMem); + } + + return *this; + } + + ~Callback9() + { + } + + ///Sets the callback to a specific object and member function. + ///\param object Pointer to the object to call upon. Care should be taken that this object remains valid as long as the callback may be invoked. + ///\param function Member function address to call. + template + void Reset(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + { + mCallback = new(&mMem) ChildMethod(object, function); + } + + ///Sets the callback to a free function or static member function. + ///\param function Free function address to call. + void Reset(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + { + mCallback = new(&mMem) ChildFree(function); + } + + ///Resests to callback to nothing. + void Reset() + { + mCallback = 0; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator==(const Callback9& rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) == (*(rhs.mCallback)); + else + return mCallback == rhs.mCallback; + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator!=(const Callback9& rhs) const + { + return !(*this == rhs); + } + + ///Note that comparison operators may not work with virtual function callbacks. + bool operator<(const Callback9 rhs) const + { + if (mCallback && rhs.mCallback) + return (*mCallback) < (*(rhs.mCallback)); + else + return mCallback < rhs.mCallback; + } + + ///Returns true if the callback has been set, or false if the callback is not set and is invalid. + bool IsSet() const + { + return 0 != mCallback; + } + + ///Invokes the callback. + R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6, t7, t8); + else + THROW_RUNTIME_ERROR( R ) + } + + ///Invokes the callback. This function can sometimes be more convenient than the operator(), which does the same thing. + R Call(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) const + { + if (mCallback) + return (*mCallback)(t0, t1, t2, t3, t4, t5, t6, t7, t8); + else + THROW_RUNTIME_ERROR( R ) + } + + private: + class Base + { + public: + Base(){} + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) = 0; + virtual bool operator==(const Base& rhs) const = 0; + virtual bool operator<(const Base& rhs) const = 0; + virtual void* Comp() const = 0; //Returns a pointer used in comparisons. + }; + + class ChildFree : public Base + { + public: + ChildFree(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + :mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) + { + return mFunc(t0, t1, t2, t3, t4, t5, t6, t7, t8); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildFree* const r = dynamic_cast(&rhs); + if (r) + return mFunc < r->mFunc; + else + return true; //Free functions will always be less than methods (because comp returns 0). + } + + virtual void* Comp() const + { + return 0; + } + + private: + R (*const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8); + }; + + template + class ChildMethod : public Base + { + public: + ChildMethod(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + :mObj(object), mFunc(function) + {} + + virtual R operator()(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) + { + return (mObj->*mFunc)(t0, t1, t2, t3, t4, t5, t6, t7, t8); + } + + virtual bool operator==(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + return (mObj == r->mObj) && (mFunc == r->mFunc); + else + return false; + } + + virtual bool operator<(const Base& rhs) const + { + const ChildMethod* const r = dynamic_cast*>(&rhs); + if (r) + { + if (mObj != r->mObj) + return mObj < r->mObj; + else + return 0 > memcmp((void*)&mFunc, (void*)&(r->mFunc), sizeof(mFunc)); + } + else + return mObj < rhs.Comp(); + } + + virtual void* Comp() const + { + return mObj; + } + + private: + C* const mObj; + R (C::* const mFunc)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8); + }; + + ///This class is only to find the worst case method pointer size. + class unknown; + + char mMem[sizeof(ChildMethod)]; //Reserve memory for creating useful objects later. + Base* mCallback; + }; + + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback9 Make9(C* object, R (C::*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + { + return Callback9(object, function); + } + + ///Helper function to construct a callback without bothering to specify template parameters. + template + Callback9 Make9(R (*function)(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)) + { + return Callback9(function); + } + +} +#endif /*__CALLBACK_HPP__*/ + diff --git a/src/helper/android/SDL2/include/SDL.h b/src/eepp/helper/SDL2/include/SDL.h similarity index 100% rename from src/helper/android/SDL2/include/SDL.h rename to src/eepp/helper/SDL2/include/SDL.h diff --git a/src/helper/android/SDL2/include/SDL2 b/src/eepp/helper/SDL2/include/SDL2 similarity index 100% rename from src/helper/android/SDL2/include/SDL2 rename to src/eepp/helper/SDL2/include/SDL2 diff --git a/src/helper/android/SDL2/include/SDL_assert.h b/src/eepp/helper/SDL2/include/SDL_assert.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_assert.h rename to src/eepp/helper/SDL2/include/SDL_assert.h diff --git a/src/helper/android/SDL2/include/SDL_atomic.h b/src/eepp/helper/SDL2/include/SDL_atomic.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_atomic.h rename to src/eepp/helper/SDL2/include/SDL_atomic.h diff --git a/src/helper/android/SDL2/include/SDL_audio.h b/src/eepp/helper/SDL2/include/SDL_audio.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_audio.h rename to src/eepp/helper/SDL2/include/SDL_audio.h diff --git a/src/helper/android/SDL2/include/SDL_blendmode.h b/src/eepp/helper/SDL2/include/SDL_blendmode.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_blendmode.h rename to src/eepp/helper/SDL2/include/SDL_blendmode.h diff --git a/src/helper/android/SDL2/include/SDL_clipboard.h b/src/eepp/helper/SDL2/include/SDL_clipboard.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_clipboard.h rename to src/eepp/helper/SDL2/include/SDL_clipboard.h diff --git a/src/helper/android/SDL2/include/SDL_config.h b/src/eepp/helper/SDL2/include/SDL_config.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config.h rename to src/eepp/helper/SDL2/include/SDL_config.h diff --git a/src/helper/android/SDL2/include/SDL_config.h.in b/src/eepp/helper/SDL2/include/SDL_config.h.in similarity index 96% rename from src/helper/android/SDL2/include/SDL_config.h.in rename to src/eepp/helper/SDL2/include/SDL_config.h.in index 0a9f40209..600dbfb00 100644 --- a/src/helper/android/SDL2/include/SDL_config.h.in +++ b/src/eepp/helper/SDL2/include/SDL_config.h.in @@ -257,17 +257,21 @@ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT +#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE #undef SDL_VIDEO_DRIVER_X11_XCURSOR #undef SDL_VIDEO_DRIVER_X11_XINERAMA -#undef SDL_VIDEO_DRIVER_X11_XINPUT +#undef SDL_VIDEO_DRIVER_X11_XINPUT2 +#undef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH #undef SDL_VIDEO_DRIVER_X11_XRANDR #undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER #undef SDL_VIDEO_DRIVER_X11_XSHAPE #undef SDL_VIDEO_DRIVER_X11_XVIDMODE +#undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS +#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY +#undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM #undef SDL_VIDEO_RENDER_D3D #undef SDL_VIDEO_RENDER_OGL diff --git a/src/helper/android/SDL2/include/SDL_config_android.h b/src/eepp/helper/SDL2/include/SDL_config_android.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config_android.h rename to src/eepp/helper/SDL2/include/SDL_config_android.h diff --git a/src/helper/android/SDL2/include/SDL_config_iphoneos.h b/src/eepp/helper/SDL2/include/SDL_config_iphoneos.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config_iphoneos.h rename to src/eepp/helper/SDL2/include/SDL_config_iphoneos.h diff --git a/src/helper/android/SDL2/include/SDL_config_macosx.h b/src/eepp/helper/SDL2/include/SDL_config_macosx.h similarity index 94% rename from src/helper/android/SDL2/include/SDL_config_macosx.h rename to src/eepp/helper/SDL2/include/SDL_config_macosx.h index 4e9ef9ffa..d9d1c1cb6 100644 --- a/src/helper/android/SDL2/include/SDL_config_macosx.h +++ b/src/eepp/helper/SDL2/include/SDL_config_macosx.h @@ -134,16 +134,19 @@ #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_XINPUT "/usr/X11R6/lib/libXi.6.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_XINPUT 1 +#define SDL_VIDEO_DRIVER_X11_XINPUT2 1 +#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 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_SUPPORTS_GENERIC_EVENTS 1 +#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 #ifndef SDL_VIDEO_RENDER_OGL #define SDL_VIDEO_RENDER_OGL 1 diff --git a/src/helper/android/SDL2/include/SDL_config_minimal.h b/src/eepp/helper/SDL2/include/SDL_config_minimal.h similarity index 94% rename from src/helper/android/SDL2/include/SDL_config_minimal.h rename to src/eepp/helper/SDL2/include/SDL_config_minimal.h index 197db64cb..7fef16442 100644 --- a/src/helper/android/SDL2/include/SDL_config_minimal.h +++ b/src/eepp/helper/SDL2/include/SDL_config_minimal.h @@ -33,7 +33,7 @@ #include #include -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) +#if !defined(_STDINT_H_) && !defined(_STDINT_H) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) typedef unsigned int size_t; typedef signed char int8_t; typedef unsigned char uint8_t; @@ -44,7 +44,7 @@ typedef unsigned int uint32_t; typedef signed long long int64_t; typedef unsigned long long uint64_t; typedef unsigned long uintptr_t; -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ +#endif /* if (stdint.h isn't available) */ #ifdef __GNUC__ #define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1 diff --git a/src/helper/android/SDL2/include/SDL_config_nintendods.h b/src/eepp/helper/SDL2/include/SDL_config_nintendods.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config_nintendods.h rename to src/eepp/helper/SDL2/include/SDL_config_nintendods.h diff --git a/src/helper/android/SDL2/include/SDL_config_pandora.h b/src/eepp/helper/SDL2/include/SDL_config_pandora.h similarity index 98% rename from src/helper/android/SDL2/include/SDL_config_pandora.h rename to src/eepp/helper/SDL2/include/SDL_config_pandora.h index a4ce2fb61..69451c4f3 100644 --- a/src/helper/android/SDL2/include/SDL_config_pandora.h +++ b/src/eepp/helper/SDL2/include/SDL_config_pandora.h @@ -117,7 +117,6 @@ #define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_X11 1 -#define SDL_VIDEO_DRIVER_X11_XINPUT 1 #define SDL_VIDEO_DRIVER_PANDORA 1 #define SDL_VIDEO_RENDER_OGL_ES 1 #define SDL_VIDEO_OPENGL_ES 1 diff --git a/src/helper/android/SDL2/include/SDL_config_windows.h b/src/eepp/helper/SDL2/include/SDL_config_windows.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config_windows.h rename to src/eepp/helper/SDL2/include/SDL_config_windows.h diff --git a/src/helper/android/SDL2/include/SDL_config_wiz.h b/src/eepp/helper/SDL2/include/SDL_config_wiz.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_config_wiz.h rename to src/eepp/helper/SDL2/include/SDL_config_wiz.h diff --git a/src/helper/android/SDL2/include/SDL_copying.h b/src/eepp/helper/SDL2/include/SDL_copying.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_copying.h rename to src/eepp/helper/SDL2/include/SDL_copying.h diff --git a/src/helper/android/SDL2/include/SDL_cpuinfo.h b/src/eepp/helper/SDL2/include/SDL_cpuinfo.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_cpuinfo.h rename to src/eepp/helper/SDL2/include/SDL_cpuinfo.h diff --git a/src/helper/android/SDL2/include/SDL_endian.h b/src/eepp/helper/SDL2/include/SDL_endian.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_endian.h rename to src/eepp/helper/SDL2/include/SDL_endian.h diff --git a/src/helper/android/SDL2/include/SDL_error.h b/src/eepp/helper/SDL2/include/SDL_error.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_error.h rename to src/eepp/helper/SDL2/include/SDL_error.h diff --git a/src/helper/android/SDL2/include/SDL_events.h b/src/eepp/helper/SDL2/include/SDL_events.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_events.h rename to src/eepp/helper/SDL2/include/SDL_events.h diff --git a/src/helper/android/SDL2/include/SDL_gesture.h b/src/eepp/helper/SDL2/include/SDL_gesture.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_gesture.h rename to src/eepp/helper/SDL2/include/SDL_gesture.h diff --git a/src/helper/android/SDL2/include/SDL_haptic.h b/src/eepp/helper/SDL2/include/SDL_haptic.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_haptic.h rename to src/eepp/helper/SDL2/include/SDL_haptic.h diff --git a/src/helper/android/SDL2/include/SDL_hints.h b/src/eepp/helper/SDL2/include/SDL_hints.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_hints.h rename to src/eepp/helper/SDL2/include/SDL_hints.h diff --git a/src/helper/android/SDL2/include/SDL_input.h b/src/eepp/helper/SDL2/include/SDL_input.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_input.h rename to src/eepp/helper/SDL2/include/SDL_input.h diff --git a/src/helper/android/SDL2/include/SDL_joystick.h b/src/eepp/helper/SDL2/include/SDL_joystick.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_joystick.h rename to src/eepp/helper/SDL2/include/SDL_joystick.h diff --git a/src/helper/android/SDL2/include/SDL_keyboard.h b/src/eepp/helper/SDL2/include/SDL_keyboard.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_keyboard.h rename to src/eepp/helper/SDL2/include/SDL_keyboard.h diff --git a/src/helper/android/SDL2/include/SDL_keycode.h b/src/eepp/helper/SDL2/include/SDL_keycode.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_keycode.h rename to src/eepp/helper/SDL2/include/SDL_keycode.h diff --git a/src/helper/android/SDL2/include/SDL_loadso.h b/src/eepp/helper/SDL2/include/SDL_loadso.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_loadso.h rename to src/eepp/helper/SDL2/include/SDL_loadso.h diff --git a/src/helper/android/SDL2/include/SDL_log.h b/src/eepp/helper/SDL2/include/SDL_log.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_log.h rename to src/eepp/helper/SDL2/include/SDL_log.h diff --git a/src/helper/android/SDL2/include/SDL_main.h b/src/eepp/helper/SDL2/include/SDL_main.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_main.h rename to src/eepp/helper/SDL2/include/SDL_main.h diff --git a/src/helper/android/SDL2/include/SDL_mouse.h b/src/eepp/helper/SDL2/include/SDL_mouse.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_mouse.h rename to src/eepp/helper/SDL2/include/SDL_mouse.h diff --git a/src/helper/android/SDL2/include/SDL_mutex.h b/src/eepp/helper/SDL2/include/SDL_mutex.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_mutex.h rename to src/eepp/helper/SDL2/include/SDL_mutex.h diff --git a/src/helper/android/SDL1.3/include/SDL_name.h b/src/eepp/helper/SDL2/include/SDL_name.h similarity index 100% rename from src/helper/android/SDL1.3/include/SDL_name.h rename to src/eepp/helper/SDL2/include/SDL_name.h diff --git a/src/helper/android/SDL2/include/SDL_opengl.h b/src/eepp/helper/SDL2/include/SDL_opengl.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_opengl.h rename to src/eepp/helper/SDL2/include/SDL_opengl.h diff --git a/src/helper/android/SDL2/include/SDL_opengles.h b/src/eepp/helper/SDL2/include/SDL_opengles.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_opengles.h rename to src/eepp/helper/SDL2/include/SDL_opengles.h diff --git a/src/helper/android/SDL2/include/SDL_opengles2.h b/src/eepp/helper/SDL2/include/SDL_opengles2.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_opengles2.h rename to src/eepp/helper/SDL2/include/SDL_opengles2.h diff --git a/src/helper/android/SDL2/include/SDL_pixels.h b/src/eepp/helper/SDL2/include/SDL_pixels.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_pixels.h rename to src/eepp/helper/SDL2/include/SDL_pixels.h diff --git a/src/helper/android/SDL2/include/SDL_platform.h b/src/eepp/helper/SDL2/include/SDL_platform.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_platform.h rename to src/eepp/helper/SDL2/include/SDL_platform.h diff --git a/src/helper/android/SDL2/include/SDL_power.h b/src/eepp/helper/SDL2/include/SDL_power.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_power.h rename to src/eepp/helper/SDL2/include/SDL_power.h diff --git a/src/helper/android/SDL2/include/SDL_quit.h b/src/eepp/helper/SDL2/include/SDL_quit.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_quit.h rename to src/eepp/helper/SDL2/include/SDL_quit.h diff --git a/src/helper/android/SDL2/include/SDL_rect.h b/src/eepp/helper/SDL2/include/SDL_rect.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_rect.h rename to src/eepp/helper/SDL2/include/SDL_rect.h diff --git a/src/helper/android/SDL2/include/SDL_render.h b/src/eepp/helper/SDL2/include/SDL_render.h similarity index 93% rename from src/helper/android/SDL2/include/SDL_render.h rename to src/eepp/helper/SDL2/include/SDL_render.h index dbbf83624..1832281ae 100644 --- a/src/helper/android/SDL2/include/SDL_render.h +++ b/src/eepp/helper/SDL2/include/SDL_render.h @@ -104,6 +104,16 @@ typedef enum 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 */ @@ -599,6 +609,27 @@ extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, 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 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 A SFL_Flip 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. diff --git a/src/helper/android/SDL1.3/include/SDL_revision.h b/src/eepp/helper/SDL2/include/SDL_revision.h similarity index 100% rename from src/helper/android/SDL1.3/include/SDL_revision.h rename to src/eepp/helper/SDL2/include/SDL_revision.h diff --git a/src/helper/android/SDL2/include/SDL_rwops.h b/src/eepp/helper/SDL2/include/SDL_rwops.h similarity index 98% rename from src/helper/android/SDL2/include/SDL_rwops.h rename to src/eepp/helper/SDL2/include/SDL_rwops.h index fb03cea49..87715f5ba 100644 --- a/src/helper/android/SDL2/include/SDL_rwops.h +++ b/src/eepp/helper/SDL2/include/SDL_rwops.h @@ -85,11 +85,8 @@ typedef struct SDL_RWops #if defined(ANDROID) struct { - void *fileName; void *fileNameRef; - void *inputStream; void *inputStreamRef; - void *readableByteChannel; void *readableByteChannelRef; void *readMethod; long position; diff --git a/src/helper/android/SDL2/include/SDL_scancode.h b/src/eepp/helper/SDL2/include/SDL_scancode.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_scancode.h rename to src/eepp/helper/SDL2/include/SDL_scancode.h diff --git a/src/helper/android/SDL2/include/SDL_shape.h b/src/eepp/helper/SDL2/include/SDL_shape.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_shape.h rename to src/eepp/helper/SDL2/include/SDL_shape.h diff --git a/src/helper/android/SDL2/include/SDL_stdinc.h b/src/eepp/helper/SDL2/include/SDL_stdinc.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_stdinc.h rename to src/eepp/helper/SDL2/include/SDL_stdinc.h diff --git a/src/helper/android/SDL2/include/SDL_surface.h b/src/eepp/helper/SDL2/include/SDL_surface.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_surface.h rename to src/eepp/helper/SDL2/include/SDL_surface.h diff --git a/src/helper/android/SDL2/include/SDL_syswm.h b/src/eepp/helper/SDL2/include/SDL_syswm.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_syswm.h rename to src/eepp/helper/SDL2/include/SDL_syswm.h diff --git a/src/helper/android/SDL2/include/SDL_thread.h b/src/eepp/helper/SDL2/include/SDL_thread.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_thread.h rename to src/eepp/helper/SDL2/include/SDL_thread.h diff --git a/src/helper/android/SDL2/include/SDL_timer.h b/src/eepp/helper/SDL2/include/SDL_timer.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_timer.h rename to src/eepp/helper/SDL2/include/SDL_timer.h diff --git a/src/helper/android/SDL2/include/SDL_touch.h b/src/eepp/helper/SDL2/include/SDL_touch.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_touch.h rename to src/eepp/helper/SDL2/include/SDL_touch.h diff --git a/src/helper/android/SDL2/include/SDL_types.h b/src/eepp/helper/SDL2/include/SDL_types.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_types.h rename to src/eepp/helper/SDL2/include/SDL_types.h diff --git a/src/helper/android/SDL2/include/SDL_version.h b/src/eepp/helper/SDL2/include/SDL_version.h similarity index 100% rename from src/helper/android/SDL2/include/SDL_version.h rename to src/eepp/helper/SDL2/include/SDL_version.h diff --git a/src/helper/android/SDL2/include/SDL_video.h b/src/eepp/helper/SDL2/include/SDL_video.h similarity index 98% rename from src/helper/android/SDL2/include/SDL_video.h rename to src/eepp/helper/SDL2/include/SDL_video.h index 6b818b60e..878c053f0 100644 --- a/src/helper/android/SDL2/include/SDL_video.h +++ b/src/eepp/helper/SDL2/include/SDL_video.h @@ -182,9 +182,25 @@ typedef enum SDL_GL_ACCELERATED_VISUAL, SDL_GL_RETAINED_BACKING, SDL_GL_CONTEXT_MAJOR_VERSION, - SDL_GL_CONTEXT_MINOR_VERSION + SDL_GL_CONTEXT_MINOR_VERSION, + SDL_GL_CONTEXT_FLAGS, + SDL_GL_CONTEXT_PROFILE_MASK } SDL_GLattr; +typedef enum +{ + SDL_GL_CONTEXT_PROFILE_CORE = 0x0001, + SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002, + SDL_GL_CONTEXT_PROFILE_ES2 = 0x0004 +} 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_GLcontextFlag; + /* Function prototypes */ diff --git a/src/helper/android/SDL2/include/begin_code.h b/src/eepp/helper/SDL2/include/begin_code.h similarity index 100% rename from src/helper/android/SDL2/include/begin_code.h rename to src/eepp/helper/SDL2/include/begin_code.h diff --git a/src/helper/android/SDL2/include/close_code.h b/src/eepp/helper/SDL2/include/close_code.h similarity index 100% rename from src/helper/android/SDL2/include/close_code.h rename to src/eepp/helper/SDL2/include/close_code.h diff --git a/src/helper/android/SDL1.3/include/doxyfile b/src/eepp/helper/SDL2/include/doxyfile similarity index 99% rename from src/helper/android/SDL1.3/include/doxyfile rename to src/eepp/helper/SDL2/include/doxyfile index 103475527..3da0d56e8 100644 --- a/src/helper/android/SDL1.3/include/doxyfile +++ b/src/eepp/helper/SDL2/include/doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = SDL # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.0 +PROJECT_NUMBER = 2.0.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -635,7 +635,7 @@ EXCLUDE = ../doxy \ ../Xcode \ ../VisualC \ ../VisualCE \ - ../Xcode-iPhoneOS + ../Xcode-iOS # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/src/eepp/helper/SDL2/java/src/org/libsdl/app/SDLActivity.java similarity index 63% rename from android-project/src/org/libsdl/app/SDLActivity.java rename to src/eepp/helper/SDL2/java/src/org/libsdl/app/SDLActivity.java index a7f7cba5f..1ea8b1fa6 100644 --- a/android-project/src/org/libsdl/app/SDLActivity.java +++ b/src/eepp/helper/SDL2/java/src/org/libsdl/app/SDLActivity.java @@ -1,6 +1,8 @@ package org.libsdl.app; +import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.opengles.GL10; import javax.microedition.khronos.egl.*; @@ -17,7 +19,6 @@ import android.hardware.*; import android.content.*; import java.lang.*; -import java.lang.Integer; /** @@ -29,15 +30,26 @@ public class SDLActivity extends Activity { private static SDLActivity mSingleton; private static SDLSurface mSurface; + // This is what SDL runs in. It invokes SDL_main(), eventually + private static Thread mSDLThread; + // Audio private static Thread mAudioThread; private static AudioTrack mAudioTrack; - - public static int SCREEN_WIDTH = 569; - public static int SCREEN_HEIGHT = 320; + + // EGL private objects + private static EGLContext mEGLContext; + private static EGLSurface mEGLSurface; + private static EGLDisplay mEGLDisplay; + private static EGLConfig mEGLConfig; + private static int mGLMajor, mGLMinor; // Load the .so static { + System.loadLibrary("SDL2"); + //System.loadLibrary("SDL2_image"); + //System.loadLibrary("SDL2_mixer"); + //System.loadLibrary("SDL2_ttf"); System.loadLibrary("main"); } @@ -53,26 +65,38 @@ public class SDLActivity extends Activity { mSurface = new SDLSurface(getApplication()); setContentView(mSurface); SurfaceHolder holder = mSurface.getHolder(); - holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); - - WindowManager w = getWindowManager(); - Display d = w.getDefaultDisplay(); - - SCREEN_WIDTH = d.getWidth(); - SCREEN_HEIGHT = d.getHeight(); - - Log.v("SDL", "Native screen resolution " + Integer.toString( SCREEN_WIDTH ) + "x" + Integer.toString( SCREEN_HEIGHT ) ); } // Events protected void onPause() { - //Log.v("SDL", "onPause()"); + Log.v("SDL", "onPause()"); super.onPause(); + SDLActivity.nativePause(); } protected void onResume() { - //Log.v("SDL", "onResume()"); + Log.v("SDL", "onResume()"); super.onResume(); + SDLActivity.nativeResume(); + } + + protected void onDestroy() { + super.onDestroy(); + Log.v("SDL", "onDestroy()"); + // Send a quit message to the application + SDLActivity.nativeQuit(); + + // Now wait for the SDL thread to quit + if (mSDLThread != null) { + try { + mSDLThread.join(); + } catch(Exception e) { + Log.v("SDL", "Problem stopping thread: " + e); + } + mSDLThread = null; + + //Log.v("SDL", "Finished waiting for SDL thread"); + } } // Messages from the SDLMain thread @@ -98,10 +122,13 @@ public class SDLActivity extends Activity { // C functions we call public static native void nativeInit(); public static native void nativeQuit(); + public static native void nativePause(); + public static native void nativeResume(); public static native void onNativeResize(int x, int y, int format); public static native void onNativeKeyDown(int keycode); public static native void onNativeKeyUp(int keycode); - public static native void onNativeTouch(int action, float x, + public static native void onNativeTouch(int touchDevId, int pointerFingerId, + int action, float x, float y, float p); public static native void onNativeAccel(float x, float y, float z); public static native void nativeRunAudioThread(); @@ -110,11 +137,11 @@ public class SDLActivity extends Activity { // Java functions called from C public static boolean createGLContext(int majorVersion, int minorVersion) { - return mSurface.initEGL(majorVersion, minorVersion); + return initEGL(majorVersion, minorVersion); } public static void flipBuffers() { - mSurface.flipEGL(); + flipEGL(); } public static void setActivityTitle(String title) { @@ -122,6 +149,142 @@ public class SDLActivity extends Activity { mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title); } + public static Context getContext() { + return mSingleton; + } + + public static void startApp() { + // Start up the C app thread + if (mSDLThread == null) { + mSDLThread = new Thread(new SDLMain(), "SDLThread"); + mSDLThread.start(); + } + else { + SDLActivity.nativeResume(); + } + } + + // EGL functions + public static boolean initEGL(int majorVersion, int minorVersion) { + if (SDLActivity.mEGLDisplay == null) { + //Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion); + + try { + EGL10 egl = (EGL10)EGLContext.getEGL(); + + EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY); + + int[] version = new int[2]; + egl.eglInitialize(dpy, version); + + int EGL_OPENGL_ES_BIT = 1; + int EGL_OPENGL_ES2_BIT = 4; + int renderableType = 0; + if (majorVersion == 2) { + renderableType = EGL_OPENGL_ES2_BIT; + } else if (majorVersion == 1) { + renderableType = EGL_OPENGL_ES_BIT; + } + int[] configSpec = { + //EGL10.EGL_DEPTH_SIZE, 16, + EGL10.EGL_RENDERABLE_TYPE, renderableType, + EGL10.EGL_NONE + }; + EGLConfig[] configs = new EGLConfig[1]; + int[] num_config = new int[1]; + if (!egl.eglChooseConfig(dpy, configSpec, configs, 1, num_config) || num_config[0] == 0) { + Log.e("SDL", "No EGL config available"); + return false; + } + EGLConfig config = configs[0]; + + /*int EGL_CONTEXT_CLIENT_VERSION=0x3098; + int contextAttrs[] = new int[] { EGL_CONTEXT_CLIENT_VERSION, majorVersion, EGL10.EGL_NONE }; + EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, contextAttrs); + + if (ctx == EGL10.EGL_NO_CONTEXT) { + Log.e("SDL", "Couldn't create context"); + return false; + } + SDLActivity.mEGLContext = ctx;*/ + SDLActivity.mEGLDisplay = dpy; + SDLActivity.mEGLConfig = config; + SDLActivity.mGLMajor = majorVersion; + SDLActivity.mGLMinor = minorVersion; + + SDLActivity.createEGLSurface(); + } catch(Exception e) { + Log.v("SDL", e + ""); + for (StackTraceElement s : e.getStackTrace()) { + Log.v("SDL", s.toString()); + } + } + } + else SDLActivity.createEGLSurface(); + + return true; + } + + public static boolean createEGLContext() { + EGL10 egl = (EGL10)EGLContext.getEGL(); + int EGL_CONTEXT_CLIENT_VERSION=0x3098; + int contextAttrs[] = new int[] { EGL_CONTEXT_CLIENT_VERSION, SDLActivity.mGLMajor, EGL10.EGL_NONE }; + SDLActivity.mEGLContext = egl.eglCreateContext(SDLActivity.mEGLDisplay, SDLActivity.mEGLConfig, EGL10.EGL_NO_CONTEXT, contextAttrs); + if (SDLActivity.mEGLContext == EGL10.EGL_NO_CONTEXT) { + Log.e("SDL", "Couldn't create context"); + return false; + } + return true; + } + + public static boolean createEGLSurface() { + if (SDLActivity.mEGLDisplay != null && SDLActivity.mEGLConfig != null) { + EGL10 egl = (EGL10)EGLContext.getEGL(); + if (SDLActivity.mEGLContext == null) createEGLContext(); + + Log.v("SDL", "Creating new EGL Surface"); + EGLSurface surface = egl.eglCreateWindowSurface(SDLActivity.mEGLDisplay, SDLActivity.mEGLConfig, SDLActivity.mSurface, null); + if (surface == EGL10.EGL_NO_SURFACE) { + Log.e("SDL", "Couldn't create surface"); + return false; + } + + if (!egl.eglMakeCurrent(SDLActivity.mEGLDisplay, surface, surface, SDLActivity.mEGLContext)) { + Log.e("SDL", "Old EGL Context doesnt work, trying with a new one"); + createEGLContext(); + if (!egl.eglMakeCurrent(SDLActivity.mEGLDisplay, surface, surface, SDLActivity.mEGLContext)) { + Log.e("SDL", "Failed making EGL Context current"); + return false; + } + } + SDLActivity.mEGLSurface = surface; + return true; + } + return false; + } + + // EGL buffer flip + public static void flipEGL() { + try { + EGL10 egl = (EGL10)EGLContext.getEGL(); + + egl.eglWaitNative(EGL10.EGL_CORE_NATIVE_ENGINE, null); + + // drawing here + + egl.eglWaitGL(); + + egl.eglSwapBuffers(SDLActivity.mEGLDisplay, SDLActivity.mEGLSurface); + + + } catch(Exception e) { + Log.v("SDL", "flipEGL(): " + e); + for (StackTraceElement s : e.getStackTrace()) { + Log.v("SDL", s.toString()); + } + } + } + // Audio private static Object buf; @@ -242,14 +405,6 @@ class SDLMain implements Runnable { class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnKeyListener, View.OnTouchListener, SensorEventListener { - // This is what SDL runs in. It invokes SDL_main(), eventually - private Thread mSDLThread; - - // EGL private objects - private EGLContext mEGLContext; - private EGLSurface mEGLSurface; - private EGLDisplay mEGLDisplay; - // Sensors private static SensorManager mSensorManager; @@ -269,37 +424,23 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, // Called when we have a valid drawing surface public void surfaceCreated(SurfaceHolder holder) { - //Log.v("SDL", "surfaceCreated()"); - + Log.v("SDL", "surfaceCreated()"); + holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); + SDLActivity.createEGLSurface(); enableSensor(Sensor.TYPE_ACCELEROMETER, true); } // Called when we lose the surface public void surfaceDestroyed(SurfaceHolder holder) { - //Log.v("SDL", "surfaceDestroyed()"); - - // Send a quit message to the application - SDLActivity.nativeQuit(); - - // Now wait for the SDL thread to quit - if (mSDLThread != null) { - try { - mSDLThread.join(); - } catch(Exception e) { - Log.v("SDL", "Problem stopping thread: " + e); - } - mSDLThread = null; - - //Log.v("SDL", "Finished waiting for SDL thread"); - } - + Log.v("SDL", "surfaceDestroyed()"); + SDLActivity.nativePause(); enableSensor(Sensor.TYPE_ACCELEROMETER, false); } // Called when the surface is resized public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - //Log.v("SDL", "surfaceChanged()"); + Log.v("SDL", "surfaceChanged()"); int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default switch (format) { @@ -345,105 +486,17 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, Log.v("SDL", "pixel format unknown " + format); break; } - SDLActivity.onNativeResize(width, height, sdlFormat); + Log.v("SDL", "Window size:" + width + "x"+height); - // Now start up the C app thread - if (mSDLThread == null) { - mSDLThread = new Thread(new SDLMain(), "SDLThread"); - mSDLThread.start(); - } + SDLActivity.startApp(); } // unused public void onDraw(Canvas canvas) {} - // EGL functions - public boolean initEGL(int majorVersion, int minorVersion) { - Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion); - try { - EGL10 egl = (EGL10)EGLContext.getEGL(); - - EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY); - - int[] version = new int[2]; - egl.eglInitialize(dpy, version); - - int EGL_OPENGL_ES_BIT = 1; - int EGL_OPENGL_ES2_BIT = 4; - int renderableType = 0; - if (majorVersion == 2) { - renderableType = EGL_OPENGL_ES2_BIT; - } else if (majorVersion == 1) { - renderableType = EGL_OPENGL_ES_BIT; - } - int[] configSpec = { - //EGL10.EGL_DEPTH_SIZE, 16, - EGL10.EGL_RENDERABLE_TYPE, renderableType, - EGL10.EGL_NONE - }; - EGLConfig[] configs = new EGLConfig[1]; - int[] num_config = new int[1]; - if (!egl.eglChooseConfig(dpy, configSpec, configs, 1, num_config) || num_config[0] == 0) { - Log.e("SDL", "No EGL config available"); - return false; - } - EGLConfig config = configs[0]; - - EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, null); - if (ctx == EGL10.EGL_NO_CONTEXT) { - Log.e("SDL", "Couldn't create context"); - return false; - } - - EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null); - if (surface == EGL10.EGL_NO_SURFACE) { - Log.e("SDL", "Couldn't create surface"); - return false; - } - - if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) { - Log.e("SDL", "Couldn't make context current"); - return false; - } - - mEGLContext = ctx; - mEGLDisplay = dpy; - mEGLSurface = surface; - - } catch(Exception e) { - Log.v("SDL", e + ""); - for (StackTraceElement s : e.getStackTrace()) { - Log.v("SDL", s.toString()); - } - } - - return true; - } - - // EGL buffer flip - public void flipEGL() { - try { - EGL10 egl = (EGL10)EGLContext.getEGL(); - - egl.eglWaitNative(EGL10.EGL_NATIVE_RENDERABLE, null); - - // drawing here - - egl.eglWaitGL(); - - egl.eglSwapBuffers(mEGLDisplay, mEGLSurface); - - - } catch(Exception e) { - Log.v("SDL", "flipEGL(): " + e); - for (StackTraceElement s : e.getStackTrace()) { - Log.v("SDL", s.toString()); - } - } - } // Key events public boolean onKey(View v, int keyCode, KeyEvent event) { @@ -464,16 +517,34 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, // Touch events public boolean onTouch(View v, MotionEvent event) { - - int action = event.getAction(); - float x = event.getX(); - float y = event.getY(); - float p = event.getPressure(); + { + final int touchDevId = event.getDeviceId(); + final int pointerCount = event.getPointerCount(); + // touchId, pointerId, action, x, y, pressure + int actionPointerIndex = event.getActionIndex(); + int pointerFingerId = event.getPointerId(actionPointerIndex); + int action = event.getActionMasked(); - // TODO: Anything else we need to pass? - SDLActivity.onNativeTouch(action, x, y, p); - return true; - } + float x = event.getX(actionPointerIndex); + float y = event.getY(actionPointerIndex); + float p = event.getPressure(actionPointerIndex); + + if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) { + // TODO send motion to every pointer if its position has + // changed since prev event. + for (int i = 0; i < pointerCount; i++) { + pointerFingerId = event.getPointerId(i); + x = event.getX(i); + y = event.getY(i); + p = event.getPressure(i); + SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); + } + } else { + SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); + } + } + return true; + } // Sensor events public void enableSensor(int sensortype, boolean enabled) { @@ -494,9 +565,9 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, public void onSensorChanged(SensorEvent event) { if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) { - SDLActivity.onNativeAccel(event.values[0], - event.values[1], - event.values[2]); + SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH, + event.values[1] / SensorManager.GRAVITY_EARTH, + event.values[2] / SensorManager.GRAVITY_EARTH); } } diff --git a/src/helper/android/SDL2/src/SDL.c b/src/eepp/helper/SDL2/src/SDL.c similarity index 100% rename from src/helper/android/SDL2/src/SDL.c rename to src/eepp/helper/SDL2/src/SDL.c diff --git a/src/helper/android/SDL2/src/SDL_assert.c b/src/eepp/helper/SDL2/src/SDL_assert.c similarity index 99% rename from src/helper/android/SDL2/src/SDL_assert.c rename to src/eepp/helper/SDL2/src/SDL_assert.c index 97a19bc71..7eebfe1c6 100755 --- a/src/helper/android/SDL2/src/SDL_assert.c +++ b/src/eepp/helper/SDL2/src/SDL_assert.c @@ -255,9 +255,9 @@ static void SDL_GenerateAssertionReport(void) static void SDL_ExitProcess(int exitcode) { #ifdef __WIN32__ - ExitProcess(42); + ExitProcess(exitcode); #else - _exit(42); + _exit(exitcode); #endif } diff --git a/src/helper/android/SDL2/src/SDL_assert_c.h b/src/eepp/helper/SDL2/src/SDL_assert_c.h similarity index 100% rename from src/helper/android/SDL2/src/SDL_assert_c.h rename to src/eepp/helper/SDL2/src/SDL_assert_c.h diff --git a/src/helper/android/SDL2/src/SDL_error.c b/src/eepp/helper/SDL2/src/SDL_error.c similarity index 100% rename from src/helper/android/SDL2/src/SDL_error.c rename to src/eepp/helper/SDL2/src/SDL_error.c diff --git a/src/helper/android/SDL2/src/SDL_error_c.h b/src/eepp/helper/SDL2/src/SDL_error_c.h similarity index 100% rename from src/helper/android/SDL2/src/SDL_error_c.h rename to src/eepp/helper/SDL2/src/SDL_error_c.h diff --git a/src/helper/android/SDL2/src/SDL_fatal.c b/src/eepp/helper/SDL2/src/SDL_fatal.c similarity index 100% rename from src/helper/android/SDL2/src/SDL_fatal.c rename to src/eepp/helper/SDL2/src/SDL_fatal.c diff --git a/src/helper/android/SDL2/src/SDL_fatal.h b/src/eepp/helper/SDL2/src/SDL_fatal.h similarity index 100% rename from src/helper/android/SDL2/src/SDL_fatal.h rename to src/eepp/helper/SDL2/src/SDL_fatal.h diff --git a/src/helper/android/SDL2/src/SDL_hints.c b/src/eepp/helper/SDL2/src/SDL_hints.c similarity index 100% rename from src/helper/android/SDL2/src/SDL_hints.c rename to src/eepp/helper/SDL2/src/SDL_hints.c diff --git a/src/helper/android/SDL2/src/SDL_hints_c.h b/src/eepp/helper/SDL2/src/SDL_hints_c.h similarity index 100% rename from src/helper/android/SDL2/src/SDL_hints_c.h rename to src/eepp/helper/SDL2/src/SDL_hints_c.h diff --git a/src/helper/android/SDL2/src/SDL_log.c b/src/eepp/helper/SDL2/src/SDL_log.c similarity index 100% rename from src/helper/android/SDL2/src/SDL_log.c rename to src/eepp/helper/SDL2/src/SDL_log.c diff --git a/src/helper/android/SDL2/src/atomic/SDL_atomic.c b/src/eepp/helper/SDL2/src/atomic/SDL_atomic.c similarity index 100% rename from src/helper/android/SDL2/src/atomic/SDL_atomic.c rename to src/eepp/helper/SDL2/src/atomic/SDL_atomic.c diff --git a/src/helper/android/SDL2/src/atomic/SDL_spinlock.c b/src/eepp/helper/SDL2/src/atomic/SDL_spinlock.c similarity index 100% rename from src/helper/android/SDL2/src/atomic/SDL_spinlock.c rename to src/eepp/helper/SDL2/src/atomic/SDL_spinlock.c diff --git a/src/helper/android/SDL2/src/audio/SDL_audio.c b/src/eepp/helper/SDL2/src/audio/SDL_audio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audio.c rename to src/eepp/helper/SDL2/src/audio/SDL_audio.c diff --git a/src/helper/android/SDL2/src/audio/SDL_audio_c.h b/src/eepp/helper/SDL2/src/audio/SDL_audio_c.h similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audio_c.h rename to src/eepp/helper/SDL2/src/audio/SDL_audio_c.h diff --git a/src/helper/android/SDL2/src/audio/SDL_audiocvt.c b/src/eepp/helper/SDL2/src/audio/SDL_audiocvt.c similarity index 99% rename from src/helper/android/SDL2/src/audio/SDL_audiocvt.c rename to src/eepp/helper/SDL2/src/audio/SDL_audiocvt.c index 870d8cd28..b069543e0 100755 --- a/src/helper/android/SDL2/src/audio/SDL_audiocvt.c +++ b/src/eepp/helper/SDL2/src/audio/SDL_audiocvt.c @@ -25,12 +25,9 @@ #include "SDL_audio.h" #include "SDL_audio_c.h" -/* #define DEBUG_CONVERT */ +#include "SDL_assert.h" -/* !!! FIXME */ -#ifndef assert -#define assert(x) -#endif +/* #define DEBUG_CONVERT */ /* Effectively mix right and left channels into a single channel */ static void SDLCALL @@ -881,9 +878,9 @@ SDL_FindFrequencyMultiple(const int src_rate, const int dst_rate) int lo, hi; int div; - assert(src_rate != 0); - assert(dst_rate != 0); - assert(src_rate != dst_rate); + SDL_assert(src_rate != 0); + SDL_assert(dst_rate != 0); + SDL_assert(src_rate != dst_rate); if (src_rate < dst_rate) { lo = src_rate; diff --git a/src/helper/android/SDL2/src/audio/SDL_audiodev.c b/src/eepp/helper/SDL2/src/audio/SDL_audiodev.c similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audiodev.c rename to src/eepp/helper/SDL2/src/audio/SDL_audiodev.c diff --git a/src/helper/android/SDL2/src/audio/SDL_audiodev_c.h b/src/eepp/helper/SDL2/src/audio/SDL_audiodev_c.h similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audiodev_c.h rename to src/eepp/helper/SDL2/src/audio/SDL_audiodev_c.h diff --git a/src/helper/android/SDL2/src/audio/SDL_audiomem.h b/src/eepp/helper/SDL2/src/audio/SDL_audiomem.h similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audiomem.h rename to src/eepp/helper/SDL2/src/audio/SDL_audiomem.h diff --git a/src/helper/android/SDL2/src/audio/SDL_audiotypecvt.c b/src/eepp/helper/SDL2/src/audio/SDL_audiotypecvt.c similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_audiotypecvt.c rename to src/eepp/helper/SDL2/src/audio/SDL_audiotypecvt.c diff --git a/src/helper/android/SDL2/src/audio/SDL_mixer.c b/src/eepp/helper/SDL2/src/audio/SDL_mixer.c similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_mixer.c rename to src/eepp/helper/SDL2/src/audio/SDL_mixer.c diff --git a/src/helper/android/SDL2/src/audio/SDL_sysaudio.h b/src/eepp/helper/SDL2/src/audio/SDL_sysaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_sysaudio.h rename to src/eepp/helper/SDL2/src/audio/SDL_sysaudio.h diff --git a/src/helper/android/SDL2/src/audio/SDL_wave.c b/src/eepp/helper/SDL2/src/audio/SDL_wave.c similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_wave.c rename to src/eepp/helper/SDL2/src/audio/SDL_wave.c diff --git a/src/helper/android/SDL2/src/audio/SDL_wave.h b/src/eepp/helper/SDL2/src/audio/SDL_wave.h similarity index 100% rename from src/helper/android/SDL2/src/audio/SDL_wave.h rename to src/eepp/helper/SDL2/src/audio/SDL_wave.h diff --git a/src/helper/android/SDL2/src/audio/alsa/SDL_alsa_audio.c b/src/eepp/helper/SDL2/src/audio/alsa/SDL_alsa_audio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/alsa/SDL_alsa_audio.c rename to src/eepp/helper/SDL2/src/audio/alsa/SDL_alsa_audio.c diff --git a/src/helper/android/SDL2/src/audio/alsa/SDL_alsa_audio.h b/src/eepp/helper/SDL2/src/audio/alsa/SDL_alsa_audio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/alsa/SDL_alsa_audio.h rename to src/eepp/helper/SDL2/src/audio/alsa/SDL_alsa_audio.h diff --git a/src/helper/android/SDL2/src/audio/android/SDL_androidaudio.c b/src/eepp/helper/SDL2/src/audio/android/SDL_androidaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/android/SDL_androidaudio.c rename to src/eepp/helper/SDL2/src/audio/android/SDL_androidaudio.c diff --git a/src/helper/android/SDL2/src/audio/android/SDL_androidaudio.h b/src/eepp/helper/SDL2/src/audio/android/SDL_androidaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/android/SDL_androidaudio.h rename to src/eepp/helper/SDL2/src/audio/android/SDL_androidaudio.h diff --git a/src/helper/android/SDL2/src/audio/arts/SDL_artsaudio.c b/src/eepp/helper/SDL2/src/audio/arts/SDL_artsaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/arts/SDL_artsaudio.c rename to src/eepp/helper/SDL2/src/audio/arts/SDL_artsaudio.c diff --git a/src/helper/android/SDL2/src/audio/arts/SDL_artsaudio.h b/src/eepp/helper/SDL2/src/audio/arts/SDL_artsaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/arts/SDL_artsaudio.h rename to src/eepp/helper/SDL2/src/audio/arts/SDL_artsaudio.h diff --git a/src/helper/android/SDL2/src/audio/baudio/SDL_beaudio.cc b/src/eepp/helper/SDL2/src/audio/baudio/SDL_beaudio.cc similarity index 100% rename from src/helper/android/SDL2/src/audio/baudio/SDL_beaudio.cc rename to src/eepp/helper/SDL2/src/audio/baudio/SDL_beaudio.cc diff --git a/src/helper/android/SDL2/src/audio/baudio/SDL_beaudio.h b/src/eepp/helper/SDL2/src/audio/baudio/SDL_beaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/baudio/SDL_beaudio.h rename to src/eepp/helper/SDL2/src/audio/baudio/SDL_beaudio.h diff --git a/src/helper/android/SDL2/src/audio/bsd/SDL_bsdaudio.c b/src/eepp/helper/SDL2/src/audio/bsd/SDL_bsdaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/bsd/SDL_bsdaudio.c rename to src/eepp/helper/SDL2/src/audio/bsd/SDL_bsdaudio.c diff --git a/src/helper/android/SDL2/src/audio/bsd/SDL_bsdaudio.h b/src/eepp/helper/SDL2/src/audio/bsd/SDL_bsdaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/bsd/SDL_bsdaudio.h rename to src/eepp/helper/SDL2/src/audio/bsd/SDL_bsdaudio.h diff --git a/src/helper/android/SDL2/src/audio/coreaudio/SDL_coreaudio.c b/src/eepp/helper/SDL2/src/audio/coreaudio/SDL_coreaudio.c similarity index 99% rename from src/helper/android/SDL2/src/audio/coreaudio/SDL_coreaudio.c rename to src/eepp/helper/SDL2/src/audio/coreaudio/SDL_coreaudio.c index dfcbe3899..53d3a08f1 100755 --- a/src/helper/android/SDL2/src/audio/coreaudio/SDL_coreaudio.c +++ b/src/eepp/helper/SDL2/src/audio/coreaudio/SDL_coreaudio.c @@ -23,6 +23,7 @@ #include "../SDL_audio_c.h" #include "../SDL_sysaudio.h" #include "SDL_coreaudio.h" +#include "SDL_assert.h" #define DEBUG_COREAUDIO 0 @@ -268,8 +269,8 @@ outputCallback(void *inRefCon, any input format in OpenAudio, and leave the conversion to CoreAudio. */ /* - assert(!this->convert.needed); - assert(this->spec.channels == ioData->mNumberChannels); + SDL_assert(!this->convert.needed); + SDL_assert(this->spec.channels == ioData->mNumberChannels); */ for (i = 0; i < ioData->mNumberBuffers; i++) { diff --git a/src/helper/android/SDL2/src/audio/coreaudio/SDL_coreaudio.h b/src/eepp/helper/SDL2/src/audio/coreaudio/SDL_coreaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/coreaudio/SDL_coreaudio.h rename to src/eepp/helper/SDL2/src/audio/coreaudio/SDL_coreaudio.h diff --git a/src/helper/android/SDL2/src/audio/directsound/SDL_directsound.c b/src/eepp/helper/SDL2/src/audio/directsound/SDL_directsound.c similarity index 100% rename from src/helper/android/SDL2/src/audio/directsound/SDL_directsound.c rename to src/eepp/helper/SDL2/src/audio/directsound/SDL_directsound.c diff --git a/src/helper/android/SDL2/src/audio/directsound/SDL_directsound.h b/src/eepp/helper/SDL2/src/audio/directsound/SDL_directsound.h similarity index 100% rename from src/helper/android/SDL2/src/audio/directsound/SDL_directsound.h rename to src/eepp/helper/SDL2/src/audio/directsound/SDL_directsound.h diff --git a/src/helper/android/SDL2/src/audio/directsound/directx.h b/src/eepp/helper/SDL2/src/audio/directsound/directx.h similarity index 100% rename from src/helper/android/SDL2/src/audio/directsound/directx.h rename to src/eepp/helper/SDL2/src/audio/directsound/directx.h diff --git a/src/helper/android/SDL2/src/audio/disk/SDL_diskaudio.c b/src/eepp/helper/SDL2/src/audio/disk/SDL_diskaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/disk/SDL_diskaudio.c rename to src/eepp/helper/SDL2/src/audio/disk/SDL_diskaudio.c diff --git a/src/helper/android/SDL2/src/audio/disk/SDL_diskaudio.h b/src/eepp/helper/SDL2/src/audio/disk/SDL_diskaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/disk/SDL_diskaudio.h rename to src/eepp/helper/SDL2/src/audio/disk/SDL_diskaudio.h diff --git a/src/helper/android/SDL2/src/audio/dsp/SDL_dspaudio.c b/src/eepp/helper/SDL2/src/audio/dsp/SDL_dspaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/dsp/SDL_dspaudio.c rename to src/eepp/helper/SDL2/src/audio/dsp/SDL_dspaudio.c diff --git a/src/helper/android/SDL2/src/audio/dsp/SDL_dspaudio.h b/src/eepp/helper/SDL2/src/audio/dsp/SDL_dspaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/dsp/SDL_dspaudio.h rename to src/eepp/helper/SDL2/src/audio/dsp/SDL_dspaudio.h diff --git a/src/helper/android/SDL2/src/audio/dummy/SDL_dummyaudio.c b/src/eepp/helper/SDL2/src/audio/dummy/SDL_dummyaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/dummy/SDL_dummyaudio.c rename to src/eepp/helper/SDL2/src/audio/dummy/SDL_dummyaudio.c diff --git a/src/helper/android/SDL2/src/audio/dummy/SDL_dummyaudio.h b/src/eepp/helper/SDL2/src/audio/dummy/SDL_dummyaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/dummy/SDL_dummyaudio.h rename to src/eepp/helper/SDL2/src/audio/dummy/SDL_dummyaudio.h diff --git a/src/helper/android/SDL2/src/audio/esd/SDL_esdaudio.c b/src/eepp/helper/SDL2/src/audio/esd/SDL_esdaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/esd/SDL_esdaudio.c rename to src/eepp/helper/SDL2/src/audio/esd/SDL_esdaudio.c diff --git a/src/helper/android/SDL2/src/audio/esd/SDL_esdaudio.h b/src/eepp/helper/SDL2/src/audio/esd/SDL_esdaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/esd/SDL_esdaudio.h rename to src/eepp/helper/SDL2/src/audio/esd/SDL_esdaudio.h diff --git a/src/helper/android/SDL2/src/audio/fusionsound/SDL_fsaudio.c b/src/eepp/helper/SDL2/src/audio/fusionsound/SDL_fsaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/fusionsound/SDL_fsaudio.c rename to src/eepp/helper/SDL2/src/audio/fusionsound/SDL_fsaudio.c diff --git a/src/helper/android/SDL2/src/audio/fusionsound/SDL_fsaudio.h b/src/eepp/helper/SDL2/src/audio/fusionsound/SDL_fsaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/fusionsound/SDL_fsaudio.h rename to src/eepp/helper/SDL2/src/audio/fusionsound/SDL_fsaudio.h diff --git a/src/helper/android/SDL2/src/audio/nas/SDL_nasaudio.c b/src/eepp/helper/SDL2/src/audio/nas/SDL_nasaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/nas/SDL_nasaudio.c rename to src/eepp/helper/SDL2/src/audio/nas/SDL_nasaudio.c diff --git a/src/helper/android/SDL2/src/audio/nas/SDL_nasaudio.h b/src/eepp/helper/SDL2/src/audio/nas/SDL_nasaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/nas/SDL_nasaudio.h rename to src/eepp/helper/SDL2/src/audio/nas/SDL_nasaudio.h diff --git a/src/helper/android/SDL2/src/audio/nds/SDL_ndsaudio.c b/src/eepp/helper/SDL2/src/audio/nds/SDL_ndsaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/nds/SDL_ndsaudio.c rename to src/eepp/helper/SDL2/src/audio/nds/SDL_ndsaudio.c diff --git a/src/helper/android/SDL2/src/audio/nds/SDL_ndsaudio.h b/src/eepp/helper/SDL2/src/audio/nds/SDL_ndsaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/nds/SDL_ndsaudio.h rename to src/eepp/helper/SDL2/src/audio/nds/SDL_ndsaudio.h diff --git a/src/helper/android/SDL2/src/audio/paudio/SDL_paudio.c b/src/eepp/helper/SDL2/src/audio/paudio/SDL_paudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/paudio/SDL_paudio.c rename to src/eepp/helper/SDL2/src/audio/paudio/SDL_paudio.c diff --git a/src/helper/android/SDL2/src/audio/paudio/SDL_paudio.h b/src/eepp/helper/SDL2/src/audio/paudio/SDL_paudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/paudio/SDL_paudio.h rename to src/eepp/helper/SDL2/src/audio/paudio/SDL_paudio.h diff --git a/src/helper/android/SDL2/src/audio/pulseaudio/SDL_pulseaudio.c b/src/eepp/helper/SDL2/src/audio/pulseaudio/SDL_pulseaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/pulseaudio/SDL_pulseaudio.c rename to src/eepp/helper/SDL2/src/audio/pulseaudio/SDL_pulseaudio.c diff --git a/src/helper/android/SDL2/src/audio/pulseaudio/SDL_pulseaudio.h b/src/eepp/helper/SDL2/src/audio/pulseaudio/SDL_pulseaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/pulseaudio/SDL_pulseaudio.h rename to src/eepp/helper/SDL2/src/audio/pulseaudio/SDL_pulseaudio.h diff --git a/src/helper/android/SDL2/src/audio/qsa/SDL_qsa_audio.c b/src/eepp/helper/SDL2/src/audio/qsa/SDL_qsa_audio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/qsa/SDL_qsa_audio.c rename to src/eepp/helper/SDL2/src/audio/qsa/SDL_qsa_audio.c diff --git a/src/helper/android/SDL2/src/audio/qsa/SDL_qsa_audio.h b/src/eepp/helper/SDL2/src/audio/qsa/SDL_qsa_audio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/qsa/SDL_qsa_audio.h rename to src/eepp/helper/SDL2/src/audio/qsa/SDL_qsa_audio.h diff --git a/src/helper/android/SDL2/src/audio/sdlgenaudiocvt.pl b/src/eepp/helper/SDL2/src/audio/sdlgenaudiocvt.pl similarity index 100% rename from src/helper/android/SDL2/src/audio/sdlgenaudiocvt.pl rename to src/eepp/helper/SDL2/src/audio/sdlgenaudiocvt.pl diff --git a/src/helper/android/SDL2/src/audio/sun/SDL_sunaudio.c b/src/eepp/helper/SDL2/src/audio/sun/SDL_sunaudio.c similarity index 100% rename from src/helper/android/SDL2/src/audio/sun/SDL_sunaudio.c rename to src/eepp/helper/SDL2/src/audio/sun/SDL_sunaudio.c diff --git a/src/helper/android/SDL2/src/audio/sun/SDL_sunaudio.h b/src/eepp/helper/SDL2/src/audio/sun/SDL_sunaudio.h similarity index 100% rename from src/helper/android/SDL2/src/audio/sun/SDL_sunaudio.h rename to src/eepp/helper/SDL2/src/audio/sun/SDL_sunaudio.h diff --git a/src/helper/android/SDL2/src/audio/winmm/SDL_winmm.c b/src/eepp/helper/SDL2/src/audio/winmm/SDL_winmm.c similarity index 100% rename from src/helper/android/SDL2/src/audio/winmm/SDL_winmm.c rename to src/eepp/helper/SDL2/src/audio/winmm/SDL_winmm.c diff --git a/src/helper/android/SDL2/src/audio/winmm/SDL_winmm.h b/src/eepp/helper/SDL2/src/audio/winmm/SDL_winmm.h similarity index 100% rename from src/helper/android/SDL2/src/audio/winmm/SDL_winmm.h rename to src/eepp/helper/SDL2/src/audio/winmm/SDL_winmm.h diff --git a/src/helper/android/SDL2/src/audio/xaudio2/SDL_xaudio2.c b/src/eepp/helper/SDL2/src/audio/xaudio2/SDL_xaudio2.c similarity index 100% rename from src/helper/android/SDL2/src/audio/xaudio2/SDL_xaudio2.c rename to src/eepp/helper/SDL2/src/audio/xaudio2/SDL_xaudio2.c diff --git a/src/helper/android/SDL2/src/core/android/SDL_android.cpp b/src/eepp/helper/SDL2/src/core/android/SDL_android.cpp similarity index 92% rename from src/helper/android/SDL2/src/core/android/SDL_android.cpp rename to src/eepp/helper/SDL2/src/core/android/SDL_android.cpp index 00700c244..7367532b5 100755 --- a/src/helper/android/SDL2/src/core/android/SDL_android.cpp +++ b/src/eepp/helper/SDL2/src/core/android/SDL_android.cpp @@ -20,6 +20,7 @@ */ #include "SDL_config.h" #include "SDL_stdinc.h" +#include "SDL_assert.h" #ifdef __ANDROID__ @@ -205,6 +206,41 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativeRunAudioThread( /******************************************************************************* Functions called by SDL into Java *******************************************************************************/ + +class LocalReferenceHolder +{ +private: + static int s_active; + +public: + static bool IsActive() { + return s_active > 0; + } + +public: + LocalReferenceHolder() : m_env(NULL) { } + ~LocalReferenceHolder() { + if (m_env) { + m_env->PopLocalFrame(NULL); + --s_active; + } + } + + bool init(JNIEnv *env, jint capacity = 16) { + if (env->PushLocalFrame(capacity) < 0) { + SDL_SetError("Failed to allocate enough JVM local references"); + return false; + } + ++s_active; + m_env = env; + return true; + } + +protected: + JNIEnv *m_env; +}; +int LocalReferenceHolder::s_active; + extern "C" SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion) { if (mEnv->CallStaticBooleanMethod(mActivityClass, midCreateGLContext, majorVersion, minorVersion)) { @@ -225,7 +261,9 @@ extern "C" void Android_JNI_SetActivityTitle(const char *title) mid = mEnv->GetStaticMethodID(mActivityClass,"setActivityTitle","(Ljava/lang/String;)V"); if (mid) { - mEnv->CallStaticVoidMethod(mActivityClass, mid, mEnv->NewStringUTF(title)); + jstring jtitle = reinterpret_cast(mEnv->NewStringUTF(title)); + mEnv->CallStaticVoidMethod(mActivityClass, mid, jtitle); + mEnv->DeleteLocalRef(jtitle); } } @@ -353,6 +391,8 @@ extern "C" void Android_JNI_CloseAudioDevice() // Test for an exception and call SDL_SetError with its detail if one occurs static bool Android_JNI_ExceptionOccurred() { + SDL_assert(LocalReferenceHolder::IsActive()); + jthrowable exception = mEnv->ExceptionOccurred(); if (exception != NULL) { jmethodID mid; @@ -375,16 +415,11 @@ static bool Android_JNI_ExceptionOccurred() exceptionMessage, 0); SDL_SetError("%s: %s", exceptionNameUTF8, exceptionMessageUTF8); mEnv->ReleaseStringUTFChars(exceptionMessage, exceptionMessageUTF8); - mEnv->DeleteLocalRef(exceptionMessage); } else { SDL_SetError("%s", exceptionNameUTF8); } mEnv->ReleaseStringUTFChars(exceptionName, exceptionNameUTF8); - mEnv->DeleteLocalRef(exceptionName); - mEnv->DeleteLocalRef(classClass); - mEnv->DeleteLocalRef(exceptionClass); - mEnv->DeleteLocalRef(exception); return true; } @@ -394,6 +429,7 @@ static bool Android_JNI_ExceptionOccurred() static int Android_JNI_FileOpen(SDL_RWops* ctx) { + LocalReferenceHolder refs; int result = 0; jmethodID mid; @@ -404,16 +440,11 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx) jobject readableByteChannel; jstring fileNameJString; - bool allocatedLocalFrame = false; - - if (mEnv->PushLocalFrame(16) < 0) { - SDL_SetError("Failed to allocate enough JVM local references"); + if (!refs.init(mEnv)) { goto failure; - } else { - allocatedLocalFrame = true; } - fileNameJString = (jstring)ctx->hidden.androidio.fileName; + fileNameJString = (jstring)ctx->hidden.androidio.fileNameRef; // context = SDLActivity.getContext(); mid = mEnv->GetStaticMethodID(mActivityClass, @@ -433,7 +464,6 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx) goto failure; } - ctx->hidden.androidio.inputStream = inputStream; ctx->hidden.androidio.inputStreamRef = mEnv->NewGlobalRef(inputStream); // Despite all the visible documentation on [Asset]InputStream claiming @@ -461,7 +491,6 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx) goto failure; } - ctx->hidden.androidio.readableByteChannel = readableByteChannel; ctx->hidden.androidio.readableByteChannelRef = mEnv->NewGlobalRef(readableByteChannel); @@ -481,10 +510,11 @@ failure: if(ctx->hidden.androidio.inputStreamRef != NULL) { mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.inputStreamRef); } - } - if (allocatedLocalFrame) { - mEnv->PopLocalFrame(NULL); + if(ctx->hidden.androidio.readableByteChannelRef != NULL) { + mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.readableByteChannelRef); + } + } return result; @@ -493,15 +523,19 @@ failure: extern "C" int Android_JNI_FileOpen(SDL_RWops* ctx, const char* fileName, const char*) { + LocalReferenceHolder refs; + + if (!refs.init(mEnv)) { + return -1; + } + if (!ctx) { return -1; } jstring fileNameJString = mEnv->NewStringUTF(fileName); - ctx->hidden.androidio.fileName = fileNameJString; ctx->hidden.androidio.fileNameRef = mEnv->NewGlobalRef(fileNameJString); ctx->hidden.androidio.inputStreamRef = NULL; - mEnv->DeleteLocalRef(fileNameJString); return Android_JNI_FileOpen(ctx); } @@ -509,10 +543,15 @@ extern "C" int Android_JNI_FileOpen(SDL_RWops* ctx, extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, size_t size, size_t maxnum) { + LocalReferenceHolder refs; int bytesRemaining = size * maxnum; int bytesRead = 0; - jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannel; + if (!refs.init(mEnv)) { + return -1; + } + + jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannelRef; jmethodID readMethod = (jmethodID)ctx->hidden.androidio.readMethod; jobject byteBuffer = mEnv->NewDirectByteBuffer(buffer, bytesRemaining); @@ -521,7 +560,6 @@ extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, int result = mEnv->CallIntMethod(readableByteChannel, readMethod, byteBuffer); if (Android_JNI_ExceptionOccurred()) { - mEnv->DeleteLocalRef(byteBuffer); return 0; } @@ -534,8 +572,6 @@ extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, ctx->hidden.androidio.position += result; } - mEnv->DeleteLocalRef(byteBuffer); - return bytesRead / size; } @@ -548,14 +584,20 @@ extern "C" size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer, static int Android_JNI_FileClose(SDL_RWops* ctx, bool release) { + LocalReferenceHolder refs; int result = 0; + if (!refs.init(mEnv)) { + SDL_SetError("Failed to allocate enough JVM local references"); + return -1; + } + if (ctx) { if (release) { mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.fileNameRef); } - jobject inputStream = (jobject)ctx->hidden.androidio.inputStream; + jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef; // inputStream.close(); jmethodID mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), @@ -602,7 +644,7 @@ extern "C" long Android_JNI_FileSeek(SDL_RWops* ctx, long offset, int whence) } long movement = newPosition - ctx->hidden.androidio.position; - jobject inputStream = (jobject)ctx->hidden.androidio.inputStream; + jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef; if (movement > 0) { unsigned char buffer[1024]; diff --git a/src/helper/android/SDL2/src/core/android/SDL_android.h b/src/eepp/helper/SDL2/src/core/android/SDL_android.h similarity index 100% rename from src/helper/android/SDL2/src/core/android/SDL_android.h rename to src/eepp/helper/SDL2/src/core/android/SDL_android.h diff --git a/src/helper/android/SDL2/src/core/windows/SDL_windows.c b/src/eepp/helper/SDL2/src/core/windows/SDL_windows.c similarity index 100% rename from src/helper/android/SDL2/src/core/windows/SDL_windows.c rename to src/eepp/helper/SDL2/src/core/windows/SDL_windows.c diff --git a/src/helper/android/SDL2/src/core/windows/SDL_windows.h b/src/eepp/helper/SDL2/src/core/windows/SDL_windows.h similarity index 100% rename from src/helper/android/SDL2/src/core/windows/SDL_windows.h rename to src/eepp/helper/SDL2/src/core/windows/SDL_windows.h diff --git a/src/helper/android/SDL2/src/cpuinfo/SDL_cpuinfo.c b/src/eepp/helper/SDL2/src/cpuinfo/SDL_cpuinfo.c similarity index 100% rename from src/helper/android/SDL2/src/cpuinfo/SDL_cpuinfo.c rename to src/eepp/helper/SDL2/src/cpuinfo/SDL_cpuinfo.c diff --git a/src/helper/android/SDL2/src/events/SDL_clipboardevents.c b/src/eepp/helper/SDL2/src/events/SDL_clipboardevents.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_clipboardevents.c rename to src/eepp/helper/SDL2/src/events/SDL_clipboardevents.c diff --git a/src/helper/android/SDL2/src/events/SDL_clipboardevents_c.h b/src/eepp/helper/SDL2/src/events/SDL_clipboardevents_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_clipboardevents_c.h rename to src/eepp/helper/SDL2/src/events/SDL_clipboardevents_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_dropevents.c b/src/eepp/helper/SDL2/src/events/SDL_dropevents.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_dropevents.c rename to src/eepp/helper/SDL2/src/events/SDL_dropevents.c diff --git a/src/helper/android/SDL2/src/events/SDL_dropevents_c.h b/src/eepp/helper/SDL2/src/events/SDL_dropevents_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_dropevents_c.h rename to src/eepp/helper/SDL2/src/events/SDL_dropevents_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_events.c b/src/eepp/helper/SDL2/src/events/SDL_events.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_events.c rename to src/eepp/helper/SDL2/src/events/SDL_events.c diff --git a/src/helper/android/SDL2/src/events/SDL_events_c.h b/src/eepp/helper/SDL2/src/events/SDL_events_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_events_c.h rename to src/eepp/helper/SDL2/src/events/SDL_events_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_gesture.c b/src/eepp/helper/SDL2/src/events/SDL_gesture.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_gesture.c rename to src/eepp/helper/SDL2/src/events/SDL_gesture.c diff --git a/src/helper/android/SDL2/src/events/SDL_gesture_c.h b/src/eepp/helper/SDL2/src/events/SDL_gesture_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_gesture_c.h rename to src/eepp/helper/SDL2/src/events/SDL_gesture_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_keyboard.c b/src/eepp/helper/SDL2/src/events/SDL_keyboard.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_keyboard.c rename to src/eepp/helper/SDL2/src/events/SDL_keyboard.c diff --git a/src/helper/android/SDL2/src/events/SDL_keyboard_c.h b/src/eepp/helper/SDL2/src/events/SDL_keyboard_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_keyboard_c.h rename to src/eepp/helper/SDL2/src/events/SDL_keyboard_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_mouse.c b/src/eepp/helper/SDL2/src/events/SDL_mouse.c similarity index 96% rename from src/helper/android/SDL2/src/events/SDL_mouse.c rename to src/eepp/helper/SDL2/src/events/SDL_mouse.c index 8a2c55c09..ff20a79ed 100755 --- a/src/helper/android/SDL2/src/events/SDL_mouse.c +++ b/src/eepp/helper/SDL2/src/events/SDL_mouse.c @@ -323,9 +323,13 @@ SDL_SetRelativeMouseMode(SDL_bool enabled) /* Set the relative mode */ mouse->relative_mode = enabled; - if (!enabled) { + if (enabled) { + /* Save the expected mouse position */ + mouse->original_x = mouse->x; + mouse->original_y = mouse->y; + } else if (mouse->focus) { /* Restore the expected mouse position */ - SDL_WarpMouseInWindow(mouse->focus, mouse->x, mouse->y); + SDL_WarpMouseInWindow(mouse->focus, mouse->original_x, mouse->original_y); } /* Flush pending mouse motion */ @@ -465,7 +469,11 @@ SDL_SetCursor(SDL_Cursor * cursor) } mouse->cur_cursor = cursor; } else { - cursor = mouse->cur_cursor; + if (mouse->focus) { + cursor = mouse->cur_cursor; + } else { + cursor = mouse->def_cursor; + } } if (cursor && mouse->cursor_shown && !mouse->relative_mode) { diff --git a/src/helper/android/SDL2/src/events/SDL_mouse_c.h b/src/eepp/helper/SDL2/src/events/SDL_mouse_c.h similarity index 96% rename from src/helper/android/SDL2/src/events/SDL_mouse_c.h rename to src/eepp/helper/SDL2/src/events/SDL_mouse_c.h index 9562e0756..d571ddabd 100755 --- a/src/helper/android/SDL2/src/events/SDL_mouse_c.h +++ b/src/eepp/helper/SDL2/src/events/SDL_mouse_c.h @@ -60,6 +60,8 @@ typedef struct int last_x, last_y; /* the last reported x and y coordinates */ Uint8 buttonstate; SDL_bool relative_mode; + /* the x and y coordinates when relative mode was activated */ + int original_x, original_y; SDL_Cursor *cursors; SDL_Cursor *def_cursor; diff --git a/src/helper/android/SDL2/src/events/SDL_quit.c b/src/eepp/helper/SDL2/src/events/SDL_quit.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_quit.c rename to src/eepp/helper/SDL2/src/events/SDL_quit.c diff --git a/src/helper/android/SDL2/src/events/SDL_sysevents.h b/src/eepp/helper/SDL2/src/events/SDL_sysevents.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_sysevents.h rename to src/eepp/helper/SDL2/src/events/SDL_sysevents.h diff --git a/src/helper/android/SDL2/src/events/SDL_touch.c b/src/eepp/helper/SDL2/src/events/SDL_touch.c similarity index 97% rename from src/helper/android/SDL2/src/events/SDL_touch.c rename to src/eepp/helper/SDL2/src/events/SDL_touch.c index fec2d548f..2e9cd10a7 100755 --- a/src/helper/android/SDL2/src/events/SDL_touch.c +++ b/src/eepp/helper/SDL2/src/events/SDL_touch.c @@ -141,6 +141,7 @@ SDL_AddTouch(const SDL_Touch * touch, char *name) SDL_touchPads[index]->xres = (1<<(16-1)); SDL_touchPads[index]->yres = (1<<(16-1)); + SDL_touchPads[index]->pressureres = (1<<(16-1)); //Do I want this here? Probably SDL_GestureAddTouch(SDL_touchPads[index]); @@ -329,7 +330,7 @@ SDL_SendFingerDown(SDL_TouchID id, SDL_FingerID fingerid, SDL_bool down, //scale to Integer coordinates x = (Uint16)((xin+touch->x_min)*(touch->xres)/(touch->native_xres)); y = (Uint16)((yin+touch->y_min)*(touch->yres)/(touch->native_yres)); - pressure = (Uint16)((yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); + pressure = (Uint16)((pressurein+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); finger = SDL_GetFinger(touch,fingerid); if(down) { @@ -357,6 +358,8 @@ SDL_SendFingerDown(SDL_TouchID id, SDL_FingerID fingerid, SDL_bool down, event.tfinger.touchId = id; event.tfinger.x = x; event.tfinger.y = y; + event.tfinger.dx = 0; + event.tfinger.dy = 0; event.tfinger.pressure = pressure; event.tfinger.state = touch->buttonstate; event.tfinger.windowID = touch->focus ? touch->focus->id : 0; @@ -384,6 +387,7 @@ SDL_SendFingerDown(SDL_TouchID id, SDL_FingerID fingerid, SDL_bool down, event.tfinger.y = finger->y; event.tfinger.dx = 0; event.tfinger.dy = 0; + event.tfinger.pressure = pressure; if(SDL_DelFinger(touch,fingerid) < 0) return 0; posted = (SDL_PushEvent(&event) > 0); @@ -412,7 +416,7 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, int relative, //scale to Integer coordinates x = (Uint16)((xin+touch->x_min)*(touch->xres)/(touch->native_xres)); y = (Uint16)((yin+touch->y_min)*(touch->yres)/(touch->native_yres)); - pressure = (Uint16)((yin+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); + pressure = (Uint16)((pressurein+touch->pressure_min)*(touch->pressureres)/(touch->native_pressureres)); if(touch->flush_motion) { return 0; } diff --git a/src/helper/android/SDL2/src/events/SDL_touch_c.h b/src/eepp/helper/SDL2/src/events/SDL_touch_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_touch_c.h rename to src/eepp/helper/SDL2/src/events/SDL_touch_c.h diff --git a/src/helper/android/SDL2/src/events/SDL_windowevents.c b/src/eepp/helper/SDL2/src/events/SDL_windowevents.c similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_windowevents.c rename to src/eepp/helper/SDL2/src/events/SDL_windowevents.c diff --git a/src/helper/android/SDL2/src/events/SDL_windowevents_c.h b/src/eepp/helper/SDL2/src/events/SDL_windowevents_c.h similarity index 100% rename from src/helper/android/SDL2/src/events/SDL_windowevents_c.h rename to src/eepp/helper/SDL2/src/events/SDL_windowevents_c.h diff --git a/src/helper/android/SDL2/src/events/blank_cursor.h b/src/eepp/helper/SDL2/src/events/blank_cursor.h similarity index 100% rename from src/helper/android/SDL2/src/events/blank_cursor.h rename to src/eepp/helper/SDL2/src/events/blank_cursor.h diff --git a/src/helper/android/SDL2/src/events/default_cursor.h b/src/eepp/helper/SDL2/src/events/default_cursor.h similarity index 100% rename from src/helper/android/SDL2/src/events/default_cursor.h rename to src/eepp/helper/SDL2/src/events/default_cursor.h diff --git a/src/helper/android/SDL2/src/events/nds/SDL_ndsgesture.c b/src/eepp/helper/SDL2/src/events/nds/SDL_ndsgesture.c similarity index 100% rename from src/helper/android/SDL2/src/events/nds/SDL_ndsgesture.c rename to src/eepp/helper/SDL2/src/events/nds/SDL_ndsgesture.c diff --git a/src/helper/android/SDL2/src/events/scancodes_darwin.h b/src/eepp/helper/SDL2/src/events/scancodes_darwin.h similarity index 100% rename from src/helper/android/SDL2/src/events/scancodes_darwin.h rename to src/eepp/helper/SDL2/src/events/scancodes_darwin.h diff --git a/src/helper/android/SDL2/src/events/scancodes_linux.h b/src/eepp/helper/SDL2/src/events/scancodes_linux.h similarity index 100% rename from src/helper/android/SDL2/src/events/scancodes_linux.h rename to src/eepp/helper/SDL2/src/events/scancodes_linux.h diff --git a/src/helper/android/SDL2/src/events/scancodes_windows.h b/src/eepp/helper/SDL2/src/events/scancodes_windows.h similarity index 100% rename from src/helper/android/SDL2/src/events/scancodes_windows.h rename to src/eepp/helper/SDL2/src/events/scancodes_windows.h diff --git a/src/helper/android/SDL2/src/events/scancodes_xfree86.h b/src/eepp/helper/SDL2/src/events/scancodes_xfree86.h similarity index 100% rename from src/helper/android/SDL2/src/events/scancodes_xfree86.h rename to src/eepp/helper/SDL2/src/events/scancodes_xfree86.h diff --git a/src/helper/android/SDL2/src/file/SDL_rwops.c b/src/eepp/helper/SDL2/src/file/SDL_rwops.c similarity index 100% rename from src/helper/android/SDL2/src/file/SDL_rwops.c rename to src/eepp/helper/SDL2/src/file/SDL_rwops.c diff --git a/src/helper/android/SDL1.3/src/file/cocoa/SDL_rwopsbundlesupport.h b/src/eepp/helper/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.h similarity index 100% rename from src/helper/android/SDL1.3/src/file/cocoa/SDL_rwopsbundlesupport.h rename to src/eepp/helper/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.h diff --git a/src/helper/android/SDL1.3/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/eepp/helper/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.m similarity index 100% rename from src/helper/android/SDL1.3/src/file/cocoa/SDL_rwopsbundlesupport.m rename to src/eepp/helper/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.m diff --git a/src/helper/android/SDL2/src/haptic/SDL_haptic.c b/src/eepp/helper/SDL2/src/haptic/SDL_haptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/SDL_haptic.c rename to src/eepp/helper/SDL2/src/haptic/SDL_haptic.c diff --git a/src/helper/android/SDL2/src/haptic/SDL_haptic_c.h b/src/eepp/helper/SDL2/src/haptic/SDL_haptic_c.h similarity index 100% rename from src/helper/android/SDL2/src/haptic/SDL_haptic_c.h rename to src/eepp/helper/SDL2/src/haptic/SDL_haptic_c.h diff --git a/src/helper/android/SDL2/src/haptic/SDL_syshaptic.h b/src/eepp/helper/SDL2/src/haptic/SDL_syshaptic.h similarity index 100% rename from src/helper/android/SDL2/src/haptic/SDL_syshaptic.h rename to src/eepp/helper/SDL2/src/haptic/SDL_syshaptic.h diff --git a/src/helper/android/SDL2/src/haptic/darwin/SDL_syshaptic.c b/src/eepp/helper/SDL2/src/haptic/darwin/SDL_syshaptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/darwin/SDL_syshaptic.c rename to src/eepp/helper/SDL2/src/haptic/darwin/SDL_syshaptic.c diff --git a/src/helper/android/SDL2/src/haptic/dummy/SDL_syshaptic.c b/src/eepp/helper/SDL2/src/haptic/dummy/SDL_syshaptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/dummy/SDL_syshaptic.c rename to src/eepp/helper/SDL2/src/haptic/dummy/SDL_syshaptic.c diff --git a/src/helper/android/SDL2/src/haptic/linux/SDL_syshaptic.c b/src/eepp/helper/SDL2/src/haptic/linux/SDL_syshaptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/linux/SDL_syshaptic.c rename to src/eepp/helper/SDL2/src/haptic/linux/SDL_syshaptic.c diff --git a/src/helper/android/SDL2/src/haptic/nds/SDL_syshaptic.c b/src/eepp/helper/SDL2/src/haptic/nds/SDL_syshaptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/nds/SDL_syshaptic.c rename to src/eepp/helper/SDL2/src/haptic/nds/SDL_syshaptic.c diff --git a/src/helper/android/SDL2/src/haptic/windows/SDL_syshaptic.c b/src/eepp/helper/SDL2/src/haptic/windows/SDL_syshaptic.c similarity index 100% rename from src/helper/android/SDL2/src/haptic/windows/SDL_syshaptic.c rename to src/eepp/helper/SDL2/src/haptic/windows/SDL_syshaptic.c diff --git a/src/helper/android/SDL2/src/joystick/SDL_joystick.c b/src/eepp/helper/SDL2/src/joystick/SDL_joystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/SDL_joystick.c rename to src/eepp/helper/SDL2/src/joystick/SDL_joystick.c diff --git a/src/helper/android/SDL2/src/joystick/SDL_joystick_c.h b/src/eepp/helper/SDL2/src/joystick/SDL_joystick_c.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/SDL_joystick_c.h rename to src/eepp/helper/SDL2/src/joystick/SDL_joystick_c.h diff --git a/src/helper/android/SDL2/src/joystick/SDL_sysjoystick.h b/src/eepp/helper/SDL2/src/joystick/SDL_sysjoystick.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/SDL_sysjoystick.h rename to src/eepp/helper/SDL2/src/joystick/SDL_sysjoystick.h diff --git a/src/helper/android/SDL2/src/joystick/android/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/android/SDL_sysjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/android/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/android/SDL_sysjoystick.c diff --git a/src/helper/android/SDL2/src/joystick/beos/SDL_bejoystick.cc b/src/eepp/helper/SDL2/src/joystick/beos/SDL_bejoystick.cc similarity index 100% rename from src/helper/android/SDL2/src/joystick/beos/SDL_bejoystick.cc rename to src/eepp/helper/SDL2/src/joystick/beos/SDL_bejoystick.cc diff --git a/src/helper/android/SDL2/src/joystick/bsd/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/bsd/SDL_sysjoystick.c similarity index 99% rename from src/helper/android/SDL2/src/joystick/bsd/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/bsd/SDL_sysjoystick.c index d1c31bbf3..f46896c25 100755 --- a/src/helper/android/SDL2/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/eepp/helper/SDL2/src/joystick/bsd/SDL_sysjoystick.c @@ -149,7 +149,7 @@ static char *joydevnames[MAX_JOYS]; static int report_alloc(struct report *, struct report_desc *, int); static void report_free(struct report *); -#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__) +#if defined(USBHID_UCR_DATA) #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data) diff --git a/src/helper/android/SDL2/src/joystick/darwin/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/darwin/SDL_sysjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/darwin/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/darwin/SDL_sysjoystick.c diff --git a/src/helper/android/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h b/src/eepp/helper/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h rename to src/eepp/helper/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h diff --git a/src/helper/android/SDL2/src/joystick/dummy/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/dummy/SDL_sysjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/dummy/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/dummy/SDL_sysjoystick.c diff --git a/src/helper/android/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.h b/src/eepp/helper/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.h rename to src/eepp/helper/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.h diff --git a/src/helper/android/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.m b/src/eepp/helper/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.m similarity index 100% rename from src/helper/android/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.m rename to src/eepp/helper/SDL2/src/joystick/iphoneos/SDLUIAccelerationDelegate.m diff --git a/src/helper/android/SDL2/src/joystick/iphoneos/SDL_sysjoystick.m b/src/eepp/helper/SDL2/src/joystick/iphoneos/SDL_sysjoystick.m similarity index 100% rename from src/helper/android/SDL2/src/joystick/iphoneos/SDL_sysjoystick.m rename to src/eepp/helper/SDL2/src/joystick/iphoneos/SDL_sysjoystick.m diff --git a/src/helper/android/SDL2/src/joystick/linux/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/linux/SDL_sysjoystick.c similarity index 99% rename from src/helper/android/SDL2/src/joystick/linux/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/linux/SDL_sysjoystick.c index 1017f22f4..934ca0549 100755 --- a/src/helper/android/SDL2/src/joystick/linux/SDL_sysjoystick.c +++ b/src/eepp/helper/SDL2/src/joystick/linux/SDL_sysjoystick.c @@ -1117,6 +1117,10 @@ EV_HandleEvents(SDL_Joystick * joystick) } break; case EV_ABS: + if (code >= ABS_MISC) { + break; + } + switch (code) { case ABS_HAT0X: case ABS_HAT0Y: diff --git a/src/helper/android/SDL2/src/joystick/linux/SDL_sysjoystick_c.h b/src/eepp/helper/SDL2/src/joystick/linux/SDL_sysjoystick_c.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/linux/SDL_sysjoystick_c.h rename to src/eepp/helper/SDL2/src/joystick/linux/SDL_sysjoystick_c.h diff --git a/src/helper/android/SDL2/src/joystick/nds/SDL_sysjoystick.c b/src/eepp/helper/SDL2/src/joystick/nds/SDL_sysjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/nds/SDL_sysjoystick.c rename to src/eepp/helper/SDL2/src/joystick/nds/SDL_sysjoystick.c diff --git a/src/helper/android/SDL2/src/joystick/windows/SDL_dxjoystick.c b/src/eepp/helper/SDL2/src/joystick/windows/SDL_dxjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/windows/SDL_dxjoystick.c rename to src/eepp/helper/SDL2/src/joystick/windows/SDL_dxjoystick.c diff --git a/src/helper/android/SDL2/src/joystick/windows/SDL_dxjoystick_c.h b/src/eepp/helper/SDL2/src/joystick/windows/SDL_dxjoystick_c.h similarity index 100% rename from src/helper/android/SDL2/src/joystick/windows/SDL_dxjoystick_c.h rename to src/eepp/helper/SDL2/src/joystick/windows/SDL_dxjoystick_c.h diff --git a/src/helper/android/SDL2/src/joystick/windows/SDL_mmjoystick.c b/src/eepp/helper/SDL2/src/joystick/windows/SDL_mmjoystick.c similarity index 100% rename from src/helper/android/SDL2/src/joystick/windows/SDL_mmjoystick.c rename to src/eepp/helper/SDL2/src/joystick/windows/SDL_mmjoystick.c diff --git a/src/helper/android/SDL2/src/libm/e_atan2.c b/src/eepp/helper/SDL2/src/libm/e_atan2.c similarity index 100% rename from src/helper/android/SDL2/src/libm/e_atan2.c rename to src/eepp/helper/SDL2/src/libm/e_atan2.c diff --git a/src/helper/android/SDL2/src/libm/e_log.c b/src/eepp/helper/SDL2/src/libm/e_log.c similarity index 100% rename from src/helper/android/SDL2/src/libm/e_log.c rename to src/eepp/helper/SDL2/src/libm/e_log.c diff --git a/src/helper/android/SDL2/src/libm/e_pow.c b/src/eepp/helper/SDL2/src/libm/e_pow.c similarity index 100% rename from src/helper/android/SDL2/src/libm/e_pow.c rename to src/eepp/helper/SDL2/src/libm/e_pow.c diff --git a/src/helper/android/SDL2/src/libm/e_rem_pio2.c b/src/eepp/helper/SDL2/src/libm/e_rem_pio2.c similarity index 100% rename from src/helper/android/SDL2/src/libm/e_rem_pio2.c rename to src/eepp/helper/SDL2/src/libm/e_rem_pio2.c diff --git a/src/helper/android/SDL2/src/libm/e_sqrt.c b/src/eepp/helper/SDL2/src/libm/e_sqrt.c similarity index 100% rename from src/helper/android/SDL2/src/libm/e_sqrt.c rename to src/eepp/helper/SDL2/src/libm/e_sqrt.c diff --git a/src/helper/android/SDL2/src/libm/k_cos.c b/src/eepp/helper/SDL2/src/libm/k_cos.c similarity index 100% rename from src/helper/android/SDL2/src/libm/k_cos.c rename to src/eepp/helper/SDL2/src/libm/k_cos.c diff --git a/src/helper/android/SDL2/src/libm/k_rem_pio2.c b/src/eepp/helper/SDL2/src/libm/k_rem_pio2.c similarity index 100% rename from src/helper/android/SDL2/src/libm/k_rem_pio2.c rename to src/eepp/helper/SDL2/src/libm/k_rem_pio2.c diff --git a/src/helper/android/SDL2/src/libm/k_sin.c b/src/eepp/helper/SDL2/src/libm/k_sin.c similarity index 100% rename from src/helper/android/SDL2/src/libm/k_sin.c rename to src/eepp/helper/SDL2/src/libm/k_sin.c diff --git a/src/helper/android/SDL2/src/libm/math_libm.h b/src/eepp/helper/SDL2/src/libm/math_libm.h similarity index 100% rename from src/helper/android/SDL2/src/libm/math_libm.h rename to src/eepp/helper/SDL2/src/libm/math_libm.h diff --git a/src/helper/android/SDL1.3/src/libm/math_private.h b/src/eepp/helper/SDL2/src/libm/math_private.h similarity index 100% rename from src/helper/android/SDL1.3/src/libm/math_private.h rename to src/eepp/helper/SDL2/src/libm/math_private.h diff --git a/src/helper/android/SDL2/src/libm/s_atan.c b/src/eepp/helper/SDL2/src/libm/s_atan.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_atan.c rename to src/eepp/helper/SDL2/src/libm/s_atan.c diff --git a/src/helper/android/SDL2/src/libm/s_copysign.c b/src/eepp/helper/SDL2/src/libm/s_copysign.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_copysign.c rename to src/eepp/helper/SDL2/src/libm/s_copysign.c diff --git a/src/helper/android/SDL2/src/libm/s_cos.c b/src/eepp/helper/SDL2/src/libm/s_cos.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_cos.c rename to src/eepp/helper/SDL2/src/libm/s_cos.c diff --git a/src/helper/android/SDL2/src/libm/s_fabs.c b/src/eepp/helper/SDL2/src/libm/s_fabs.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_fabs.c rename to src/eepp/helper/SDL2/src/libm/s_fabs.c diff --git a/src/helper/android/SDL2/src/libm/s_floor.c b/src/eepp/helper/SDL2/src/libm/s_floor.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_floor.c rename to src/eepp/helper/SDL2/src/libm/s_floor.c diff --git a/src/helper/android/SDL2/src/libm/s_scalbn.c b/src/eepp/helper/SDL2/src/libm/s_scalbn.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_scalbn.c rename to src/eepp/helper/SDL2/src/libm/s_scalbn.c diff --git a/src/helper/android/SDL2/src/libm/s_sin.c b/src/eepp/helper/SDL2/src/libm/s_sin.c similarity index 100% rename from src/helper/android/SDL2/src/libm/s_sin.c rename to src/eepp/helper/SDL2/src/libm/s_sin.c diff --git a/src/helper/android/SDL2/src/loadso/beos/SDL_sysloadso.c b/src/eepp/helper/SDL2/src/loadso/beos/SDL_sysloadso.c similarity index 100% rename from src/helper/android/SDL2/src/loadso/beos/SDL_sysloadso.c rename to src/eepp/helper/SDL2/src/loadso/beos/SDL_sysloadso.c diff --git a/src/helper/android/SDL2/src/loadso/dlopen/SDL_sysloadso.c b/src/eepp/helper/SDL2/src/loadso/dlopen/SDL_sysloadso.c similarity index 100% rename from src/helper/android/SDL2/src/loadso/dlopen/SDL_sysloadso.c rename to src/eepp/helper/SDL2/src/loadso/dlopen/SDL_sysloadso.c diff --git a/src/helper/android/SDL2/src/loadso/dummy/SDL_sysloadso.c b/src/eepp/helper/SDL2/src/loadso/dummy/SDL_sysloadso.c similarity index 100% rename from src/helper/android/SDL2/src/loadso/dummy/SDL_sysloadso.c rename to src/eepp/helper/SDL2/src/loadso/dummy/SDL_sysloadso.c diff --git a/src/helper/android/SDL2/src/loadso/windows/SDL_sysloadso.c b/src/eepp/helper/SDL2/src/loadso/windows/SDL_sysloadso.c similarity index 100% rename from src/helper/android/SDL2/src/loadso/windows/SDL_sysloadso.c rename to src/eepp/helper/SDL2/src/loadso/windows/SDL_sysloadso.c diff --git a/src/helper/android/SDL2/src/main/android/SDL_android_main.cpp b/src/eepp/helper/SDL2/src/main/android/SDL_android_main.cpp similarity index 100% rename from src/helper/android/SDL2/src/main/android/SDL_android_main.cpp rename to src/eepp/helper/SDL2/src/main/android/SDL_android_main.cpp diff --git a/src/helper/android/SDL2/src/main/beos/SDL_BApp.h b/src/eepp/helper/SDL2/src/main/beos/SDL_BApp.h similarity index 100% rename from src/helper/android/SDL2/src/main/beos/SDL_BApp.h rename to src/eepp/helper/SDL2/src/main/beos/SDL_BApp.h diff --git a/src/helper/android/SDL2/src/main/beos/SDL_BeApp.cc b/src/eepp/helper/SDL2/src/main/beos/SDL_BeApp.cc similarity index 100% rename from src/helper/android/SDL2/src/main/beos/SDL_BeApp.cc rename to src/eepp/helper/SDL2/src/main/beos/SDL_BeApp.cc diff --git a/src/helper/android/SDL2/src/main/beos/SDL_BeApp.h b/src/eepp/helper/SDL2/src/main/beos/SDL_BeApp.h similarity index 100% rename from src/helper/android/SDL2/src/main/beos/SDL_BeApp.h rename to src/eepp/helper/SDL2/src/main/beos/SDL_BeApp.h diff --git a/src/helper/android/SDL2/src/main/dummy/SDL_dummy_main.c b/src/eepp/helper/SDL2/src/main/dummy/SDL_dummy_main.c similarity index 100% rename from src/helper/android/SDL2/src/main/dummy/SDL_dummy_main.c rename to src/eepp/helper/SDL2/src/main/dummy/SDL_dummy_main.c diff --git a/src/helper/android/SDL2/src/main/windows/SDL_windows_main.c b/src/eepp/helper/SDL2/src/main/windows/SDL_windows_main.c similarity index 100% rename from src/helper/android/SDL2/src/main/windows/SDL_windows_main.c rename to src/eepp/helper/SDL2/src/main/windows/SDL_windows_main.c diff --git a/src/helper/android/SDL2/src/main/windows/version.rc b/src/eepp/helper/SDL2/src/main/windows/version.rc similarity index 100% rename from src/helper/android/SDL2/src/main/windows/version.rc rename to src/eepp/helper/SDL2/src/main/windows/version.rc diff --git a/src/helper/android/SDL2/src/power/SDL_power.c b/src/eepp/helper/SDL2/src/power/SDL_power.c similarity index 100% rename from src/helper/android/SDL2/src/power/SDL_power.c rename to src/eepp/helper/SDL2/src/power/SDL_power.c diff --git a/src/helper/android/SDL2/src/power/beos/SDL_syspower.c b/src/eepp/helper/SDL2/src/power/beos/SDL_syspower.c similarity index 100% rename from src/helper/android/SDL2/src/power/beos/SDL_syspower.c rename to src/eepp/helper/SDL2/src/power/beos/SDL_syspower.c diff --git a/src/helper/android/SDL2/src/power/linux/SDL_syspower.c b/src/eepp/helper/SDL2/src/power/linux/SDL_syspower.c similarity index 100% rename from src/helper/android/SDL2/src/power/linux/SDL_syspower.c rename to src/eepp/helper/SDL2/src/power/linux/SDL_syspower.c diff --git a/src/helper/android/SDL2/src/power/macosx/SDL_syspower.c b/src/eepp/helper/SDL2/src/power/macosx/SDL_syspower.c similarity index 100% rename from src/helper/android/SDL2/src/power/macosx/SDL_syspower.c rename to src/eepp/helper/SDL2/src/power/macosx/SDL_syspower.c diff --git a/src/helper/android/SDL2/src/power/nds/SDL_syspower.c b/src/eepp/helper/SDL2/src/power/nds/SDL_syspower.c similarity index 100% rename from src/helper/android/SDL2/src/power/nds/SDL_syspower.c rename to src/eepp/helper/SDL2/src/power/nds/SDL_syspower.c diff --git a/src/helper/android/SDL2/src/power/uikit/SDL_syspower.h b/src/eepp/helper/SDL2/src/power/uikit/SDL_syspower.h similarity index 100% rename from src/helper/android/SDL2/src/power/uikit/SDL_syspower.h rename to src/eepp/helper/SDL2/src/power/uikit/SDL_syspower.h diff --git a/src/helper/android/SDL2/src/power/uikit/SDL_syspower.m b/src/eepp/helper/SDL2/src/power/uikit/SDL_syspower.m similarity index 100% rename from src/helper/android/SDL2/src/power/uikit/SDL_syspower.m rename to src/eepp/helper/SDL2/src/power/uikit/SDL_syspower.m diff --git a/src/helper/android/SDL2/src/power/windows/SDL_syspower.c b/src/eepp/helper/SDL2/src/power/windows/SDL_syspower.c similarity index 100% rename from src/helper/android/SDL2/src/power/windows/SDL_syspower.c rename to src/eepp/helper/SDL2/src/power/windows/SDL_syspower.c diff --git a/src/helper/android/SDL2/src/render/SDL_render.c b/src/eepp/helper/SDL2/src/render/SDL_render.c similarity index 95% rename from src/helper/android/SDL2/src/render/SDL_render.c rename to src/eepp/helper/SDL2/src/render/SDL_render.c index 01dd0a1d8..168ad61df 100755 --- a/src/helper/android/SDL2/src/render/SDL_render.c +++ b/src/eepp/helper/SDL2/src/render/SDL_render.c @@ -1231,6 +1231,62 @@ SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, &real_dstrect); } + +int +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) +{ + SDL_Window *window; + SDL_Rect real_srcrect, real_dstrect; + SDL_Point real_center; + + CHECK_RENDERER_MAGIC(renderer, -1); + CHECK_TEXTURE_MAGIC(texture, -1); + + if (renderer != texture->renderer) { + SDL_SetError("Texture was not created with this renderer"); + return -1; + } + if (!renderer->RenderCopyEx) { + SDL_SetError("Renderer does not support RenderCopyEx"); + return -1; + } + + window = renderer->window; + + real_srcrect.x = 0; + real_srcrect.y = 0; + real_srcrect.w = texture->w; + real_srcrect.h = texture->h; + if (srcrect) { + if (!SDL_IntersectRect(srcrect, &real_srcrect, &real_srcrect)) { + return 0; + } + } + + /* We don't intersect the dstrect with the viewport as RenderCopy does because of potential rotation clipping issues... TODO: should we? */ + if (dstrect) real_dstrect = *dstrect; + else { + real_srcrect.x = 0; + real_srcrect.y = 0; + real_srcrect.w = renderer->viewport.w; + real_srcrect.h = renderer->viewport.h; + } + + if (texture->native) { + texture = texture->native; + } + + if(center) real_center = *center; + else { + real_center.x = real_dstrect.w/2; + real_center.y = real_dstrect.h/2; + } + + return renderer->RenderCopyEx(renderer, texture, &real_srcrect, &real_dstrect, angle, &real_center, flip); +} + int SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch) diff --git a/src/helper/android/SDL2/src/render/SDL_sysrender.h b/src/eepp/helper/SDL2/src/render/SDL_sysrender.h similarity index 95% rename from src/helper/android/SDL2/src/render/SDL_sysrender.h rename to src/eepp/helper/SDL2/src/render/SDL_sysrender.h index 89fa5005f..0a54ff72b 100755 --- a/src/helper/android/SDL2/src/render/SDL_sysrender.h +++ b/src/eepp/helper/SDL2/src/render/SDL_sysrender.h @@ -88,6 +88,9 @@ struct SDL_Renderer int count); int (*RenderCopy) (SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * srcrect, const SDL_Rect * dstrect); + int (*RenderCopyEx) (SDL_Renderer * renderer, SDL_Texture * texture, + const SDL_Rect * srcquad, const SDL_Rect * dstrect, + const double angle, const SDL_Point *center, const SDL_RendererFlip flip); int (*RenderReadPixels) (SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch); void (*RenderPresent) (SDL_Renderer * renderer); diff --git a/src/helper/android/SDL2/src/render/SDL_yuv_mmx.c b/src/eepp/helper/SDL2/src/render/SDL_yuv_mmx.c similarity index 100% rename from src/helper/android/SDL2/src/render/SDL_yuv_mmx.c rename to src/eepp/helper/SDL2/src/render/SDL_yuv_mmx.c diff --git a/src/helper/android/SDL2/src/render/SDL_yuv_sw.c b/src/eepp/helper/SDL2/src/render/SDL_yuv_sw.c similarity index 100% rename from src/helper/android/SDL2/src/render/SDL_yuv_sw.c rename to src/eepp/helper/SDL2/src/render/SDL_yuv_sw.c diff --git a/src/helper/android/SDL2/src/render/SDL_yuv_sw_c.h b/src/eepp/helper/SDL2/src/render/SDL_yuv_sw_c.h similarity index 100% rename from src/helper/android/SDL2/src/render/SDL_yuv_sw_c.h rename to src/eepp/helper/SDL2/src/render/SDL_yuv_sw_c.h diff --git a/src/helper/android/SDL2/src/render/direct3d/SDL_render_d3d.c b/src/eepp/helper/SDL2/src/render/direct3d/SDL_render_d3d.c similarity index 80% rename from src/helper/android/SDL2/src/render/direct3d/SDL_render_d3d.c rename to src/eepp/helper/SDL2/src/render/direct3d/SDL_render_d3d.c index e058144d1..b0d8b4bc2 100755 --- a/src/helper/android/SDL2/src/render/direct3d/SDL_render_d3d.c +++ b/src/eepp/helper/SDL2/src/render/direct3d/SDL_render_d3d.c @@ -29,12 +29,97 @@ #include "SDL_loadso.h" #include "SDL_syswm.h" #include "../SDL_sysrender.h" +#include "stdio.h" #if SDL_VIDEO_RENDER_D3D #define D3D_DEBUG_INFO #include #endif + +typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK; +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; + +DEFINE_GUID(IID_ID3DXMatrixStack, +0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85); + +#undef INTERFACE +#define INTERFACE ID3DXMatrixStack + +DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(Pop)(THIS) PURE; + STDMETHOD(Push)(THIS) PURE; + STDMETHOD(LoadIdentity)(THIS) PURE; + STDMETHOD(LoadMatrix)(THIS_ CONST D3DXMATRIX* pM ) PURE; + STDMETHOD(MultMatrix)(THIS_ CONST D3DXMATRIX* pM ) PURE; + STDMETHOD(MultMatrixLocal)(THIS_ CONST D3DXMATRIX* pM ) PURE; + STDMETHOD(RotateAxis)(THIS_ CONST D3DXVECTOR3* pV, FLOAT Angle) PURE; + STDMETHOD(RotateAxisLocal)(THIS_ CONST D3DXVECTOR3* pV, FLOAT Angle) PURE; + STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; + STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT Yaw, FLOAT Pitch, FLOAT Roll) PURE; + STDMETHOD(Scale)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; + STDMETHOD(ScaleLocal)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; + STDMETHOD(Translate)(THIS_ FLOAT x, FLOAT y, FLOAT z ) PURE; + STDMETHOD(TranslateLocal)(THIS_ FLOAT x, FLOAT y, FLOAT z) PURE; + STDMETHOD_(D3DXMATRIX*, GetTop)(THIS) PURE; +}; + +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DXMatrixStack_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DXMatrixStack_Release(p) (p)->lpVtbl->Release(p) +#define ID3DXMatrixStack_Pop(p) (p)->lpVtbl->Pop(p) +#define ID3DXMatrixStack_Push(p) (p)->lpVtbl->Push(p) +#define ID3DXMatrixStack_LoadIdentity(p) (p)->lpVtbl->LoadIdentity(p) +#define ID3DXMatrixStack_LoadMatrix(p,a) (p)->lpVtbl->LoadMatrix(p,a) +#define ID3DXMatrixStack_MultMatrix(p,a) (p)->lpVtbl->MultMatrix(p,a) +#define ID3DXMatrixStack_MultMatrixLocal(p,a) (p)->lpVtbl->MultMatrixLocal(p,a) +#define ID3DXMatrixStack_RotateAxis(p,a,b) (p)->lpVtbl->RotateAxis(p,a,b) +#define ID3DXMatrixStack_RotateAxisLocal(p,a,b) (p)->lpVtbl->RotateAxisLocal(p,a,b) +#define ID3DXMatrixStack_RotateYawPitchRoll(p,a,b,c) (p)->lpVtbl->RotateYawPitchRoll(p,a,b,c) +#define ID3DXMatrixStack_RotateYawPitchRollLocal(p,a,b,c) (p)->lpVtbl->RotateYawPitchRollLocal(p,a,b,c) +#define ID3DXMatrixStack_Scale(p,a,b,c) (p)->lpVtbl->Scale(p,a,b,c) +#define ID3DXMatrixStack_ScaleLocal(p,a,b,c) (p)->lpVtbl->ScaleLocal(p,a,b,c) +#define ID3DXMatrixStack_Translate(p,a,b,c) (p)->lpVtbl->Translate(p,a,b,c) +#define ID3DXMatrixStack_TranslateLocal(p,a,b,c) (p)->lpVtbl->TranslateLocal(p,a,b,c) +#define ID3DXMatrixStack_GetTop(p) (p)->lpVtbl->GetTop(p) +#else +#define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define ID3DXMatrixStack_AddRef(p) (p)->AddRef() +#define ID3DXMatrixStack_Release(p) (p)->Release() +#define ID3DXMatrixStack_Pop(p) (p)->Pop() +#define ID3DXMatrixStack_Push(p) (p)->Push() +#define ID3DXMatrixStack_LoadIdentity(p) (p)->LoadIdentity() +#define ID3DXMatrixStack_LoadMatrix(p,a) (p)->LoadMatrix(a) +#define ID3DXMatrixStack_MultMatrix(p,a) (p)->MultMatrix(a) +#define ID3DXMatrixStack_MultMatrixLocal(p,a) (p)->MultMatrixLocal(a) +#define ID3DXMatrixStack_RotateAxis(p,a,b) (p)->RotateAxis(a,b) +#define ID3DXMatrixStack_RotateAxisLocal(p,a,b) (p)->RotateAxisLocal(a,b) +#define ID3DXMatrixStack_RotateYawPitchRoll(p,a,b,c) (p)->RotateYawPitchRollLocal(a,b,c) +#define ID3DXMatrixStack_Scale(p,a,b,c) (p)->Scale(a,b,c) +#define ID3DXMatrixStack_ScaleLocal(p,a,b,c) (p)->ScaleLocal(a,b,c) +#define ID3DXMatrixStack_Translate(p,a,b,c) (p)->Translate(a,b,c) +#define ID3DXMatrixStack_TranslateLocal(p,a,b,c) (p)->TranslateLocal(a,b,c) +#define ID3DXMatrixStack_GetTop(p) (p)->GetTop() +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); + +#ifdef __cplusplus +} +#endif + #ifdef ASSEMBLE_SHADER /////////////////////////////////////////////////////////////////////////// // ID3DXBuffer: @@ -110,6 +195,9 @@ static int D3D_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); static int D3D_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * srcrect, const SDL_Rect * dstrect); +static int D3D_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); static int D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch); static void D3D_RenderPresent(SDL_Renderer * renderer); @@ -141,6 +229,8 @@ typedef struct D3DTEXTUREFILTERTYPE scaleMode; IDirect3DSurface9 *defaultRenderTarget; IDirect3DSurface9 *currentRenderTarget; + void* d3dxDLL; + ID3DXMatrixStack *matrixStack; } D3D_RenderData; typedef struct @@ -347,6 +437,8 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) int w, h; SDL_DisplayMode fullscreen_mode; D3DMATRIX matrix; + int d3dxVersion; + char d3dxDLLFile[50]; renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer)); if (!renderer) { @@ -375,8 +467,28 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) SDL_UnloadObject(data->d3dDLL); data->d3dDLL = NULL; } + + for (d3dxVersion=50;d3dxVersion>0;d3dxVersion--) { + SDL_snprintf(d3dxDLLFile, 49, "D3DX9_%02d.dll", d3dxVersion); + data->d3dxDLL = SDL_LoadObject(d3dxDLLFile); + if (data->d3dxDLL) { + HRESULT (WINAPI *D3DXCreateMatrixStack) (DWORD Flags, LPD3DXMATRIXSTACK* ppStack); + D3DXCreateMatrixStack = (HRESULT (WINAPI *) (DWORD, LPD3DXMATRIXSTACK*)) SDL_LoadFunction(data->d3dxDLL, "D3DXCreateMatrixStack"); + if (D3DXCreateMatrixStack) { + D3DXCreateMatrixStack(0, &data->matrixStack); + break; + } + } + } + + if (!data->matrixStack) { + if (data->d3dxDLL) SDL_UnloadObject(data->d3dxDLL); + } } - if (!data->d3d) { + + + + if (!data->d3d || !data->matrixStack) { SDL_free(renderer); SDL_free(data); SDL_SetError("Unable to create Direct3D interface"); @@ -395,6 +507,7 @@ D3D_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->RenderDrawLines = D3D_RenderDrawLines; renderer->RenderFillRects = D3D_RenderFillRects; renderer->RenderCopy = D3D_RenderCopy; + renderer->RenderCopyEx = D3D_RenderCopyEx; renderer->RenderReadPixels = D3D_RenderReadPixels; renderer->RenderPresent = D3D_RenderPresent; renderer->DestroyTexture = D3D_DestroyTexture; @@ -1126,6 +1239,135 @@ D3D_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, return 0; } + +static int +D3D_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) +{ + D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata; + D3D_TextureData *texturedata = (D3D_TextureData *) texture->driverdata; + LPDIRECT3DPIXELSHADER9 shader = NULL; + float minx, miny, maxx, maxy; + float minu, maxu, minv, maxv; + float centerx, centery; + DWORD color; + Vertex vertices[4]; + HRESULT result; + + if (D3D_ActivateRenderer(renderer) < 0) { + return -1; + } + + centerx = (float)center->x; + centery = (float)center->y; + + if (flip & SDL_FLIP_HORIZONTAL) { + minx = (float) dstrect->w - centerx - 0.5f; + maxx = (float) -centerx - 0.5f; + } + else { + minx = (float) -centerx - 0.5f; + maxx = (float) dstrect->w - centerx - 0.5f; + } + + if (flip & SDL_FLIP_VERTICAL) { + miny = (float) dstrect->h - centery - 0.5f; + maxy = (float) -centery - 0.5f; + } + else { + miny = (float) -centery - 0.5f; + maxy = (float) dstrect->h - centery - 0.5f; + } + + minu = (float) srcrect->x / texture->w; + maxu = (float) (srcrect->x + srcrect->w) / texture->w; + minv = (float) srcrect->y / texture->h; + maxv = (float) (srcrect->y + srcrect->h) / texture->h; + + color = D3DCOLOR_ARGB(texture->a, texture->r, texture->g, texture->b); + + vertices[0].x = minx; + vertices[0].y = miny; + vertices[0].z = 0.0f; + vertices[0].color = color; + vertices[0].u = minu; + vertices[0].v = minv; + + vertices[1].x = maxx; + vertices[1].y = miny; + vertices[1].z = 0.0f; + vertices[1].color = color; + vertices[1].u = maxu; + vertices[1].v = minv; + + vertices[2].x = maxx; + vertices[2].y = maxy; + vertices[2].z = 0.0f; + vertices[2].color = color; + vertices[2].u = maxu; + vertices[2].v = maxv; + + vertices[3].x = minx; + vertices[3].y = maxy; + vertices[3].z = 0.0f; + vertices[3].color = color; + vertices[3].u = minu; + vertices[3].v = maxv; + + D3D_SetBlendMode(data, texture->blendMode); + + // Rotate and translate + ID3DXMatrixStack_Push(data->matrixStack); + ID3DXMatrixStack_LoadIdentity(data->matrixStack); + ID3DXMatrixStack_RotateYawPitchRoll(data->matrixStack, 0.0, 0.0, M_PI * (float) angle / 180.0f); + ID3DXMatrixStack_Translate(data->matrixStack, (float)dstrect->x + centerx, (float)dstrect->y + centery, (float)0.0); + IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)ID3DXMatrixStack_GetTop(data->matrixStack)); + + if (texturedata->scaleMode != data->scaleMode) { + IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MINFILTER, + texturedata->scaleMode); + IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MAGFILTER, + texturedata->scaleMode); + data->scaleMode = texturedata->scaleMode; + } + + result = + IDirect3DDevice9_SetTexture(data->device, 0, (IDirect3DBaseTexture9 *) + texturedata->texture); + if (FAILED(result)) { + D3D_SetError("SetTexture()", result); + return -1; + } + if (shader) { + result = IDirect3DDevice9_SetPixelShader(data->device, shader); + if (FAILED(result)) { + D3D_SetError("SetShader()", result); + return -1; + } + } + result = + IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_TRIANGLEFAN, 2, + vertices, sizeof(*vertices)); + if (FAILED(result)) { + D3D_SetError("DrawPrimitiveUP()", result); + return -1; + } + if (shader) { + result = IDirect3DDevice9_SetPixelShader(data->device, NULL); + if (FAILED(result)) { + D3D_SetError("SetShader()", result); + return -1; + } + } + ID3DXMatrixStack_Pop(data->matrixStack); + ID3DXMatrixStack_Push(data->matrixStack); + ID3DXMatrixStack_LoadIdentity(data->matrixStack); + IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)ID3DXMatrixStack_GetTop(data->matrixStack)); + ID3DXMatrixStack_Pop(data->matrixStack); + return 0; +} + static int D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch) diff --git a/src/helper/android/SDL1.3/src/render/mmx.h b/src/eepp/helper/SDL2/src/render/mmx.h similarity index 100% rename from src/helper/android/SDL1.3/src/render/mmx.h rename to src/eepp/helper/SDL2/src/render/mmx.h diff --git a/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.c b/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.c new file mode 100644 index 000000000..7ba9be072 --- /dev/null +++ b/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.c @@ -0,0 +1,315 @@ +/* + * Note: The Nintendo DS port to SDL uses excerpts from the libGL2D, + * with permission of the original author. The following is mostly his + * code/comments. + * + * + * Easy GL2D + * + * Relminator 2010 + * Richard Eric M. Lope BSN RN + * + * http://rel.betterwebber.com + * + * A very small and simple DS rendering lib using the 3d core to render 2D stuff + */ +#include "SDL_config.h" + +#if SDL_VIDEO_RENDER_NDS + +#include "SDL_libgl2D.h" + +/* + * Our static global variable used for Depth values since we cannot + * disable depth testing in the DS hardware This value is incremented + * for every draw call. */ +v16 g_depth; +int gCurrentTexture; + +/* + * !!! PRIVATE !!! Set orthographic projection at 1:1 correspondence + * to screen coords glOrtho expects f32 values but if we use the + * standard f32 values, we need to rescale either every vert or the + * modelview matrix by the same amount to make it work. That's gonna + * give us lots of overflows and headaches. So we "scale down" and + * use an all integer value. + */ +void SetOrtho(void) +{ + glMatrixMode(GL_PROJECTION); // set matrixmode to projection + glLoadIdentity(); // reset + glOrthof32(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1 << 12, 1 << 12); // downscale projection matrix +} + +/* + * Initializes GL in 2D mode Also initializes GL in 3d mode so that we + * could combine 2D and 3D later Almost a direct copy from the DS + * example files + */ +void glScreen2D(void) +{ + // initialize gl + glInit(); + + // enable textures + glEnable(GL_TEXTURE_2D); + + // enable antialiasing + glEnable(GL_ANTIALIAS); + + // setup the rear plane + glClearColor(0, 0, 0, 31); // BG must be opaque for AA to work + glClearPolyID(63); // BG must have a unique polygon ID for AA to work + + glClearDepth(GL_MAX_DEPTH); + + // this should work the same as the normal gl call + glViewport(0,0,255,191); + + // any floating point gl call is being converted to fixed prior to being implemented + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + gluPerspective(70, 256.0 / 192.0, 1, 200); + + gluLookAt( 0.0, 0.0, 1.0, //camera possition + 0.0, 0.0, 0.0, //look at + 0.0, 1.0, 0.0); //up + + glMaterialf(GL_AMBIENT, RGB15(31,31,31)); + glMaterialf(GL_DIFFUSE, RGB15(31,31,31)); + glMaterialf(GL_SPECULAR, BIT(15) | RGB15(31,31,31)); + glMaterialf(GL_EMISSION, RGB15(31,31,31)); + + // ds uses a table for shinyness..this generates a half-ass one + glMaterialShinyness(); + + // not a real gl function and will likely change + glPolyFmt(POLY_ALPHA(31) | POLY_CULL_BACK); +} + +/* + * Sets up OpenGL for 2d rendering Call this before drawing any of + * GL2D's drawing or sprite functions. + */ +void glBegin2D(void) +{ + // save 3d perpective projection matrix + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + + // save 3d modelview matrix for safety + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + + + // what?!! No glDisable(GL_DEPTH_TEST)?!!!!!! + glEnable(GL_BLEND); + glEnable(GL_TEXTURE_2D); + glDisable(GL_ANTIALIAS); // disable AA + glDisable(GL_OUTLINE); // disable edge-marking + + glColor(0x7FFF); // max color + + glPolyFmt(POLY_ALPHA(31) | POLY_CULL_NONE); // no culling + + SetOrtho(); + + glMatrixMode(GL_TEXTURE); // reset texture matrix just in case we did some funky stuff with it + glLoadIdentity(); + + glMatrixMode(GL_MODELVIEW); // reset modelview matrix. No need to scale up by << 12 + glLoadIdentity(); + + gCurrentTexture = 0; // set current texture to 0 + g_depth = 0; // set depth to 0. We need this var since we cannot disable depth testing +} + +/* + * Issue this after drawing 2d so that we don't mess the matrix stack. + * The complement of glBegin2D. + */ +void glEnd2D(void) +{ + // restore 3d matrices and set current matrix to modelview + glMatrixMode(GL_PROJECTION); + glPopMatrix(1); + glMatrixMode(GL_MODELVIEW); + glPopMatrix(1); +} + +/* + * Draws a pixel + * Parameters: + * x,y -> First coordinate of the line + * color -> RGB15/ARGB16 color + */ +void glPutPixel(int x, int y, int color) +{ + glBindTexture(0, 0); + glColor(color); + glBegin(GL_TRIANGLES); + gxVertex3i(x, y, g_depth); + gxVertex2i(x, y); + gxVertex2i(x, y); + glEnd(); + glColor(0x7FFF); + g_depth++; + gCurrentTexture = 0; +} + +/* + * Draws a line + * Parameters: + * x1,y1 -> First coordinate of the line + * x2,y2 -> Second coordinate of the line + * color -> RGB15/ARGB16 color + */ +void glLine(int x1, int y1, int x2, int y2, int color) +{ + x2++; + y2++; + + glBindTexture(0, 0); + glColor(color); + glBegin(GL_TRIANGLES); + gxVertex3i(x1, y1, g_depth); + gxVertex2i(x2, y2); + gxVertex2i(x2, y2); + glEnd(); + glColor(0x7FFF); + g_depth++; + gCurrentTexture = 0; +} + +/* + * Draws a Filled Box + * Parameters: + * x1,y1 -> Top-left corner of the box + * x2,y2 -> Bottom-Right corner of the box + * color -> RGB15/ARGB16 color +*/ +void glBoxFilled(int x1, int y1, int x2, int y2, int color) +{ + x2++; + y2++; + + glBindTexture(0, 0); + glColor(color); + glBegin(GL_QUADS); + gxVertex3i(x1, y1, g_depth); // use 3i for first vertex so that we increment HW depth + gxVertex2i(x1, y2); // no need for 3 vertices as 2i would share last depth call + gxVertex2i(x2, y2); + gxVertex2i(x2, y1); + glEnd(); + glColor(0x7FFF); + g_depth++; + gCurrentTexture = 0; +} + +/* + * + * Create a tile. + * Very rigid and prone to human error. + * + * Parameters: + * *sprite -> pointer to a glImage + * texture_width -> width/height of the texture; + * texture_height -> valid sizes are enumerated in GL_TEXTURE_TYPE_ENUM (see glTexImage2d) + * sprite_width + * sprite_height -> width/height of the picture in the texture. + * type -> The format of the texture (see glTexImage2d) + * param -> parameters for the texture (see glTexImage2d) + */ +int glLoadTile(glImage *sprite, + int texture_width, + int texture_height, + int sprite_width, + int sprite_height, + GL_TEXTURE_TYPE_ENUM type, + int param, + int pallette_width, + const u16 *palette, + const uint8 *texture) +{ + int textureID; + + glGenTextures(1, &textureID); + glBindTexture(0, textureID); + glTexImage2D(0, 0, type, texture_width, texture_height, 0, param, texture); + glColorTableEXT(0, 0, pallette_width, 0, 0, palette); + + sprite->width = sprite_width; + sprite->height = sprite_height; + sprite->textureID = textureID; + + return textureID; +} + +/* + * I made this since the scale wrappers are either the vectorized mode + * or does not permit you to scale only the axis you want to + * scale. Needed for sprite scaling. + */ +static inline void gxScalef32(s32 x, s32 y, s32 z) +{ + MATRIX_SCALE = x; + MATRIX_SCALE = y; + MATRIX_SCALE = z; +} + +/* + * I this made for future naming conflicts. + */ +static inline void gxTranslate3f32(int32 x, int32 y, int32 z) +{ + MATRIX_TRANSLATE = x; + MATRIX_TRANSLATE = y; + MATRIX_TRANSLATE = z; +} + +/* + * Draws an axis exclusive scaled sprite + * Parameters: + * x -> x position of the sprite + * y -> y position of the sprite + * scaleX -> 20.12 FP X axis scale value (1 << 12 is normal) + * scaleY -> 20.12 FP Y axis scale value (1 << 12 is normal) + * flipmode -> mode for flipping (see GL_FLIP_MODE enum) + * *spr -> pointer to a glImage + */ +void glSpriteScaleXY(int x, int y, s32 scaleX, s32 scaleY, int flipmode, const glImage *spr) +{ + const int x1 = 0; + const int y1 = 0; + const int x2 = spr->width; + const int y2 = spr->height; + const int u1 = ((flipmode & GL_FLIP_H) ? spr->width-1 : 0); + const int u2 = ((flipmode & GL_FLIP_H) ? 0 : spr->width-1); + const int v1 = ((flipmode & GL_FLIP_V) ? spr->height-1 : 0); + const int v2 = ((flipmode & GL_FLIP_V) ? 0 : spr->height-1); + + if (spr->textureID != gCurrentTexture) + { + glBindTexture(GL_TEXTURE_2D, spr->textureID); + gCurrentTexture = spr->textureID; + } + + glPushMatrix(); + + gxTranslate3f32(x, y, 0); + gxScalef32(scaleX, scaleY, 1 << 12); + + glBegin(GL_QUADS); + + gxTexcoord2i(u1, v1); gxVertex3i(x1, y1, g_depth); + gxTexcoord2i(u1, v2); gxVertex2i(x1, y2); + gxTexcoord2i(u2, v2); gxVertex2i(x2, y2); + gxTexcoord2i(u2, v1); gxVertex2i(x2, y1); + + glEnd(); + + glPopMatrix(1); + g_depth++; +} + +#endif /* SDL_VIDEO_RENDER_NDS */ diff --git a/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.h b/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.h new file mode 100644 index 000000000..4d56f0e89 --- /dev/null +++ b/src/eepp/helper/SDL2/src/render/nds/SDL_libgl2D.h @@ -0,0 +1,154 @@ +/* + * Note: The Nintendo DS port to SDL uses excerpts from the libGL2D, + * with permission of the original author. The following is mostly his + * code/comments. + * + * + * Easy GL2D + * + * Relminator 2010 + * Richard Eric M. Lope BSN RN + * + * http://rel.betterwebber.com + * + * A very small and simple DS rendering lib using the 3d core to render 2D stuff + */ +#include "SDL_config.h" + +#if SDL_VIDEO_RENDER_NDS + +#include + +/* LibGL extension(s) */ +static inline void gxTexcoord2i(t16 u, t16 v) +{ + GFX_TEX_COORD = (v << 20) | ((u << 4) & 0xFFFF); +} + +static inline void gxVertex3i(v16 x, v16 y, v16 z) +{ + GFX_VERTEX16 = (y << 16) | (x & 0xFFFF); + GFX_VERTEX16 = ((uint32)(uint16)z); +} + +static inline void gxVertex2i(v16 x, v16 y) +{ + GFX_VERTEX_XY = (y << 16) | (x & 0xFFFF); +} + +/* + * Enums selecting flipping mode. + * + * These enums are bits for flipping the sprites. + * You can "|" (or) GL_FLIP_V and GL_FLIP_H to flip + * both ways. + */ +typedef enum +{ + GL_FLIP_NONE = (1 << 0), /* No flipping */ + GL_FLIP_V = (1 << 1), /* Sprite is rendered vertically flipped */ + GL_FLIP_H = (1 << 2), /* Sprite is rendered horizontally flipped */ +} GL_FLIP_MODE; + +/* Struct for out GL-Based Images. */ +typedef struct +{ + int width; /* Width of the Sprite */ + int height; /* Height of the Sprite */ + int textureID; /* Texture handle (used in glDeleteTextures()) + The texture handle in VRAM (returned by glGenTextures()) + ie. This references the actual texture stored in VRAM. */ +} glImage; + +extern v16 g_depth; +extern int gCurrentTexture; + +/* + * Draws an Axis Exclusive Scaled Sprite + * Parameters: + * x X position of the sprite. + * y Y position of the sprite. + * scaleX 20.12 fixed-point X-Axis scale value (1 << 12 is normal). + * scaleY 20.12 fixed-point Y-Axis scale value (1 << 12 is normal). + * flipmode mode for flipping (see GL_FLIP_MODE enum). + * *spr pointer to a glImage. +*/ +void glSpriteScaleXY(int x, int y, s32 scaleX, s32 scaleY, int flipmode, const glImage *spr); + +/* Initializes our Tileset (like glInitSpriteset()) but without the use of Texture Packer auto-generated files. + * Can only be used when tiles in a tilset are of the same dimensions. + * Parameters: + * *sprite Pointer to an array of glImage. + * tile_wid Width of each tile in the texture. + * tile_hei Height of each tile in the texture. + * bmp_wid Width of of the texture or tileset. + * bmp_hei height of of the texture or tileset. + * type The format of the texture (see glTexImage2d()). + * sizeX The horizontal size of the texture; valid sizes are enumerated in GL_TEXTURE_TYPE_ENUM (see glTexImage2d()). + * sizeY The vertical size of the texture; valid sizes are enumerated in GL_TEXTURE_TYPE_ENUM (see glTexImage2d()). + * param parameters for the texture (see glTexImage2d()). + * pallette_width Length of the palette. Valid values are 4, 16, 32, 256 (if 0, then palette is removed from currently bound texture). + * *palette Pointer to the palette data to load (if NULL, then palette is removed from currently bound texture). + * *texture Pointer to the texture data to load. +*/ +int glLoadTile(glImage *sprite, + int texture_width, + int texture_height, + int sprite_width, + int sprite_height, + GL_TEXTURE_TYPE_ENUM type, + int param, + int pallette_width, + const u16 *palette, + const uint8 *texture); + +/* Initializes GL in 2D mode */ +void glScreen2D(void); + +/* + * Sets up OpenGL for 2d rendering. + * + * Call this before drawing any of GL2D's drawing or sprite functions. + */ +void glBegin2D(void); + +/* + * Issue this after drawing 2d so that we don't mess the matrix stack. + * + * The complement of glBegin2D(). + */ +void glEnd2D(void); + +/* + * Draws a Pixel + * x X position of the pixel. + * y Y position of the pixel. + * color RGB15/ARGB16 color. + */ +void glPutPixel(int x, int y, int color); + +/* + * Draws a Line + * x1,y1 Top-Left coordinate of the line. + * x2,y2 Bottom-Right coordinate of the line. + * color RGB15/ARGB16 color. + */ +void glLine(int x1, int y1, int x2, int y2, int color); + +/* + * Draws a Box + * x1,y1 Top-Left coordinate of the box. + * x2,y2 Bottom-Right coordinate of the box. + * color RGB15/ARGB16 color. +*/ +void glBox(int x1, int y1, int x2, int y2, int color); + +/* + * Draws a Filled Box + * x1,y1 Top-Left coordinate of the box. + * x2,y2 Bottom-Right coordinate of the box. + * color RGB15/ARGB16 color. + */ +void glBoxFilled(int x1, int y1, int x2, int y2, int color); + +#endif /* SDL_VIDEO_RENDER_NDS */ diff --git a/src/helper/android/SDL2/src/render/nds/SDL_ndsrender.c b/src/eepp/helper/SDL2/src/render/nds/SDL_ndsrender.c similarity index 81% rename from src/helper/android/SDL2/src/render/nds/SDL_ndsrender.c rename to src/eepp/helper/SDL2/src/render/nds/SDL_ndsrender.c index 337004d5b..4666bb031 100755 --- a/src/helper/android/SDL2/src/render/nds/SDL_ndsrender.c +++ b/src/eepp/helper/SDL2/src/render/nds/SDL_ndsrender.c @@ -26,7 +26,7 @@ #include #include -#include +#include "SDL_libgl2D.h" #include "SDL_video.h" #include "../../video/SDL_sysvideo.h" @@ -34,6 +34,36 @@ #include "../SDL_sysrender.h" #include "SDL_log.h" +/* Draws a partial sprite. Based on glSprite. */ +static void glSpritePartial(const SDL_Rect * srcrect, int x, int y, int flipmode, const glImage *spr) +{ + int x1 = x; + int y1 = y; + int x2 = x + srcrect->w; + int y2 = y + srcrect->h; + + int u1 = srcrect->x + ((flipmode & GL_FLIP_H) ? spr->width-1 : 0); + int u2 = srcrect->x + ((flipmode & GL_FLIP_H) ? 0 : srcrect->h); + int v1 = srcrect->y + ((flipmode & GL_FLIP_V) ? spr->height-1 : 0); + int v2 = srcrect->y + ((flipmode & GL_FLIP_V) ? 0 : srcrect->h); + + if (spr->textureID != gCurrentTexture) { + glBindTexture(GL_TEXTURE_2D, spr->textureID); + gCurrentTexture = spr->textureID; + } + + glBegin(GL_QUADS); + + gxTexcoord2i(u1, v1); gxVertex3i(x1, y1, g_depth); + gxTexcoord2i(u1, v2); gxVertex2i(x1, y2); + gxTexcoord2i(u2, v2); gxVertex2i(x2, y2); + gxTexcoord2i(u2, v1); gxVertex2i(x2, y1); + + glEnd(); + + g_depth++; +} + /* SDL NDS renderer implementation */ extern SDL_RenderDriver NDS_RenderDriver; @@ -49,7 +79,6 @@ typedef struct glImage image[1]; } NDS_TextureData; - static int NDS_UpdateViewport(SDL_Renderer *renderer) { /* Nothing to do. */ @@ -70,9 +99,9 @@ NDS_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, dest_y = dstrect->y-SCREEN_HEIGHT; } - if (texture->w == dstrect->w && texture->h == dstrect->h) { + if (srcrect->w == dstrect->w && srcrect->h == dstrect->h) { /* No scaling */ - glSprite(dstrect->x, dest_y, GL_FLIP_NONE, txdat->image); + glSpritePartial(srcrect, dstrect->x, dest_y, GL_FLIP_NONE, txdat->image); } else { /* Convert the scaling proportion into a 20.12 value. */ s32 scale_w = divf32(dstrect->w << 12, texture->w << 12); @@ -153,15 +182,42 @@ static int NDS_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * rect, const void *pixels, int pitch) { NDS_TextureData *txdat = (NDS_TextureData *) texture->driverdata; + char *new_pixels = NULL; + const int gl_w = get_gltexture_size(rect->w); + const int gl_h = get_gltexture_size(rect->h); + const int w = 1 << (3+gl_w); /* Texture sizes must be a power of 2. */ + const int h = 1 << (3+gl_h); /* Texture sizes must be a power of 2. */ - glLoadTileSet(txdat->image, - rect->w, rect->h, + if (w != rect->w || h != rect->h) { + /* Allocate a temporary surface and copy pixels into it while + * enlarging the pitch. */ + const char *src; + char *dst; + int new_pitch = 2 * w; + int i; + + new_pixels = malloc(2 * w * h); + if (!new_pixels) + return SDL_ENOMEM; + + src = pixels; + dst = new_pixels; + for (i=0; ih; i++) { + memcpy(dst, src, pitch); + src += pitch; + dst += new_pitch; + } + } + + glLoadTile(txdat->image, + gl_w, gl_h, rect->w, rect->h, texture->format == SDL_PIXELFORMAT_ABGR1555 ? GL_RGBA : GL_RGB, - get_gltexture_size(rect->w), - get_gltexture_size(rect->h), TEXGEN_OFF, 0, NULL, - pixels); + new_pixels? new_pixels : pixels); + + if (new_pixels) + free(new_pixels); return 0; } @@ -193,7 +249,6 @@ static int NDS_RenderClear(SDL_Renderer *renderer) static void NDS_RenderPresent(SDL_Renderer * renderer) { NDS_RenderData *data = (NDS_RenderData *) renderer->driverdata; - static int frame =0; glEnd2D(); @@ -324,18 +379,20 @@ NDS_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->info = NDS_RenderDriver.info; renderer->info.flags = SDL_RENDERER_ACCELERATED; - renderer->UpdateViewport = NDS_UpdateViewport; - renderer->CreateTexture = NDS_CreateTexture; - renderer->DestroyTexture = NDS_DestroyTexture; - renderer->RenderCopy = NDS_RenderCopy; + renderer->CreateTexture = NDS_CreateTexture; renderer->UpdateTexture = NDS_UpdateTexture; renderer->LockTexture = NDS_LockTexture; renderer->UnlockTexture = NDS_UnlockTexture; + renderer->UpdateViewport = NDS_UpdateViewport; renderer->RenderClear = NDS_RenderClear; - renderer->RenderPresent = NDS_RenderPresent; renderer->RenderDrawPoints = NDS_RenderDrawPoints; renderer->RenderDrawLines = NDS_RenderDrawLines; renderer->RenderFillRects = NDS_RenderFillRects; + renderer->RenderCopy = NDS_RenderCopy; + /* renderer->RenderReadPixels = NDS_RenderReadPixels; - todo ? */ + renderer->RenderPresent = NDS_RenderPresent; + renderer->DestroyTexture = NDS_DestroyTexture; + /* renderer->DestroyRenderer = NDS_DestroyRenderer; - todo ? */ renderer->driverdata = data; diff --git a/src/helper/android/SDL2/src/render/opengl/SDL_glfuncs.h b/src/eepp/helper/SDL2/src/render/opengl/SDL_glfuncs.h similarity index 99% rename from src/helper/android/SDL2/src/render/opengl/SDL_glfuncs.h rename to src/eepp/helper/SDL2/src/render/opengl/SDL_glfuncs.h index b76f97145..ea3644ac1 100644 --- a/src/helper/android/SDL2/src/render/opengl/SDL_glfuncs.h +++ b/src/eepp/helper/SDL2/src/render/opengl/SDL_glfuncs.h @@ -279,14 +279,14 @@ SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units)) SDL_PROC_UNUSED(void, glPolygonStipple, (const GLubyte * mask)) SDL_PROC_UNUSED(void, glPopAttrib, (void)) SDL_PROC_UNUSED(void, glPopClientAttrib, (void)) -SDL_PROC_UNUSED(void, glPopMatrix, (void)) +SDL_PROC(void, glPopMatrix, (void)) SDL_PROC_UNUSED(void, glPopName, (void)) SDL_PROC_UNUSED(void, glPrioritizeTextures, (GLsizei n, const GLuint * textures, const GLclampf * priorities)) SDL_PROC_UNUSED(void, glPushAttrib, (GLbitfield mask)) SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask)) -SDL_PROC_UNUSED(void, glPushMatrix, (void)) +SDL_PROC(void, glPushMatrix, (void)) SDL_PROC_UNUSED(void, glPushName, (GLuint name)) SDL_PROC_UNUSED(void, glRasterPos2d, (GLdouble x, GLdouble y)) SDL_PROC_UNUSED(void, glRasterPos2dv, (const GLdouble * v)) @@ -331,7 +331,7 @@ SDL_PROC_UNUSED(void, glRects, (GLshort x1, GLshort y1, GLshort x2, GLshort y2)) SDL_PROC_UNUSED(void, glRectsv, (const GLshort * v1, const GLshort * v2)) SDL_PROC_UNUSED(GLint, glRenderMode, (GLenum mode)) -SDL_PROC_UNUSED(void, glRotated, +SDL_PROC(void, glRotated, (GLdouble angle, GLdouble x, GLdouble y, GLdouble z)) SDL_PROC_UNUSED(void, glRotatef, (GLfloat angle, GLfloat x, GLfloat y, GLfloat z)) @@ -419,7 +419,7 @@ SDL_PROC(void, glTexSubImage2D, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels)) SDL_PROC_UNUSED(void, glTranslated, (GLdouble x, GLdouble y, GLdouble z)) -SDL_PROC_UNUSED(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z)) +SDL_PROC(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z)) SDL_PROC_UNUSED(void, glVertex2d, (GLdouble x, GLdouble y)) SDL_PROC_UNUSED(void, glVertex2dv, (const GLdouble * v)) SDL_PROC(void, glVertex2f, (GLfloat x, GLfloat y)) diff --git a/src/helper/android/SDL2/src/render/opengl/SDL_render_gl.c b/src/eepp/helper/SDL2/src/render/opengl/SDL_render_gl.c similarity index 92% rename from src/helper/android/SDL2/src/render/opengl/SDL_render_gl.c rename to src/eepp/helper/SDL2/src/render/opengl/SDL_render_gl.c index 816ceb7cc..34c4b0c2d 100755 --- a/src/helper/android/SDL2/src/render/opengl/SDL_render_gl.c +++ b/src/eepp/helper/SDL2/src/render/opengl/SDL_render_gl.c @@ -65,6 +65,9 @@ static int GL_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); static int GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * srcrect, const SDL_Rect * dstrect); +static int GL_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); static int GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch); static void GL_RenderPresent(SDL_Renderer * renderer); @@ -314,6 +317,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->RenderDrawLines = GL_RenderDrawLines; renderer->RenderFillRects = GL_RenderFillRects; renderer->RenderCopy = GL_RenderCopy; + renderer->RenderCopyEx = GL_RenderCopyEx; renderer->RenderReadPixels = GL_RenderReadPixels; renderer->RenderPresent = GL_RenderPresent; renderer->DestroyTexture = GL_DestroyTexture; @@ -1018,6 +1022,96 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, return 0; } +static int +GL_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) +{ + GL_RenderData *data = (GL_RenderData *) renderer->driverdata; + GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata; + GLfloat minx, miny, maxx, maxy; + GLfloat centerx, centery; + GLfloat minu, maxu, minv, maxv; + GL_ActivateRenderer(renderer); + + data->glEnable(texturedata->type); + if (texturedata->yuv) { + data->glActiveTextureARB(GL_TEXTURE2_ARB); + data->glBindTexture(texturedata->type, texturedata->vtexture); + + data->glActiveTextureARB(GL_TEXTURE1_ARB); + data->glBindTexture(texturedata->type, texturedata->utexture); + + data->glActiveTextureARB(GL_TEXTURE0_ARB); + } + data->glBindTexture(texturedata->type, texturedata->texture); + + if (texture->modMode) { + GL_SetColor(data, texture->r, texture->g, texture->b, texture->a); + } else { + GL_SetColor(data, 255, 255, 255, 255); + } + + GL_SetBlendMode(data, texture->blendMode); + + if (texturedata->yuv) { + GL_SetShader(data, SHADER_YV12); + } else { + GL_SetShader(data, SHADER_RGB); + } + + centerx = (GLfloat)center->x; + centery = (GLfloat)center->y; + + if (flip & SDL_FLIP_HORIZONTAL) { + minx = (GLfloat) dstrect->w - centerx; + maxx = -centerx; + } + else { + minx = -centerx; + maxx = (GLfloat) dstrect->w - centerx; + } + + if (flip & SDL_FLIP_VERTICAL) { + miny = (GLfloat) dstrect->h - centery; + maxy = -centery; + } + else { + miny = -centery; + maxy = (GLfloat) dstrect->h - centery; + } + + minu = (GLfloat) srcrect->x / texture->w; + minu *= texturedata->texw; + maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w; + maxu *= texturedata->texw; + minv = (GLfloat) srcrect->y / texture->h; + minv *= texturedata->texh; + maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h; + maxv *= texturedata->texh; + + // Translate to flip, rotate, translate to position + data->glPushMatrix(); + data->glTranslatef((GLfloat)dstrect->x + centerx, (GLfloat)dstrect->y + centery, (GLfloat)0.0); + data->glRotated(angle, (GLdouble)0.0, (GLdouble)0.0, (GLdouble)1.0); + + data->glBegin(GL_TRIANGLE_STRIP); + data->glTexCoord2f(minu, minv); + data->glVertex2f(minx, miny); + data->glTexCoord2f(maxu, minv); + data->glVertex2f(maxx, miny); + data->glTexCoord2f(minu, maxv); + data->glVertex2f(minx, maxy); + data->glTexCoord2f(maxu, maxv); + data->glVertex2f(maxx, maxy); + data->glEnd(); + data->glPopMatrix(); + + data->glDisable(texturedata->type); + + return 0; +} + static int GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch) diff --git a/src/helper/android/SDL2/src/render/opengl/SDL_shaders_gl.c b/src/eepp/helper/SDL2/src/render/opengl/SDL_shaders_gl.c similarity index 100% rename from src/helper/android/SDL2/src/render/opengl/SDL_shaders_gl.c rename to src/eepp/helper/SDL2/src/render/opengl/SDL_shaders_gl.c diff --git a/src/helper/android/SDL2/src/render/opengl/SDL_shaders_gl.h b/src/eepp/helper/SDL2/src/render/opengl/SDL_shaders_gl.h similarity index 100% rename from src/helper/android/SDL2/src/render/opengl/SDL_shaders_gl.h rename to src/eepp/helper/SDL2/src/render/opengl/SDL_shaders_gl.h diff --git a/src/helper/android/SDL2/src/render/opengles/SDL_glesfuncs.h b/src/eepp/helper/SDL2/src/render/opengles/SDL_glesfuncs.h similarity index 97% rename from src/helper/android/SDL2/src/render/opengles/SDL_glesfuncs.h rename to src/eepp/helper/SDL2/src/render/opengles/SDL_glesfuncs.h index 4f2b2ce34..aab15a18a 100644 --- a/src/helper/android/SDL2/src/render/opengles/SDL_glesfuncs.h +++ b/src/eepp/helper/SDL2/src/render/opengles/SDL_glesfuncs.h @@ -11,6 +11,7 @@ SDL_PROC(void, glDrawTexiOES, (GLint, GLint, GLint, GLint, GLint)) SDL_PROC(void, glEnable, (GLenum)) SDL_PROC(void, glEnableClientState, (GLenum)) SDL_PROC(void, glFinish, (void)) +SDL_PROC(void, glGenFramebuffersOES, (GLsizei, GLuint *)) SDL_PROC(void, glGenTextures, (GLsizei, GLuint *)) SDL_PROC(GLenum, glGetError, (void)) SDL_PROC(void, glGetIntegerv, (GLenum, GLint *)) diff --git a/src/helper/android/SDL2/src/render/opengles/SDL_render_gles.c b/src/eepp/helper/SDL2/src/render/opengles/SDL_render_gles.c similarity index 90% rename from src/helper/android/SDL2/src/render/opengles/SDL_render_gles.c rename to src/eepp/helper/SDL2/src/render/opengles/SDL_render_gles.c index 54344b435..51a12e8dc 100755 --- a/src/helper/android/SDL2/src/render/opengles/SDL_render_gles.c +++ b/src/eepp/helper/SDL2/src/render/opengles/SDL_render_gles.c @@ -71,6 +71,9 @@ static int GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * dstrect); static int GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch); +static int GLES_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); static void GLES_RenderPresent(SDL_Renderer * renderer); static void GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture); @@ -111,6 +114,7 @@ typedef struct #undef SDL_PROC SDL_bool GL_OES_framebuffer_object_supported; GLES_FBOList *framebuffers; + GLuint window_framebuffer; SDL_bool useDrawTexture; SDL_bool GL_OES_draw_texture_supported; @@ -206,7 +210,7 @@ GLES_GetFBO(GLES_RenderData *data, Uint32 w, Uint32 h) result = SDL_malloc(sizeof(GLES_FBOList)); result->w = w; result->h = h; - glGenFramebuffersOES(1, &result->FBO); + data->glGenFramebuffersOES(1, &result->FBO); result->next = data->framebuffers; data->framebuffers = result; } @@ -303,6 +307,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) renderer->RenderFillRects = GLES_RenderFillRects; renderer->RenderCopy = GLES_RenderCopy; renderer->RenderReadPixels = GLES_RenderReadPixels; + renderer->RenderCopyEx = GLES_RenderCopyEx; renderer->RenderPresent = GLES_RenderPresent; renderer->DestroyTexture = GLES_DestroyTexture; renderer->DestroyRenderer = GLES_DestroyRenderer; @@ -348,14 +353,20 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) } #endif + value = 0; data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value); renderer->info.max_texture_width = value; + value = 0; data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value); renderer->info.max_texture_height = value; if (SDL_GL_ExtensionSupported("GL_OES_framebuffer_object")) { data->GL_OES_framebuffer_object_supported = SDL_TRUE; renderer->info.flags |= SDL_RENDERER_TARGETTEXTURE; + + value = 0; + data->glGetIntegerv(GL_FRAMEBUFFER_BINDING_OES, &value); + data->window_framebuffer = (GLuint)value; } data->framebuffers = NULL; @@ -586,7 +597,7 @@ GLES_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture) GLES_ActivateRenderer(renderer); if (texture == NULL) { - data->glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0); + data->glBindFramebufferOES(GL_FRAMEBUFFER_OES, data->window_framebuffer); return 0; } @@ -951,6 +962,98 @@ GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, return status; } +static int +GLES_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) +{ + + GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; + GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata; + int minx, miny, maxx, maxy; + GLfloat minu, maxu, minv, maxv; + GLfloat centerx, centery; + + GLES_ActivateRenderer(renderer); + + data->glEnable(GL_TEXTURE_2D); + + data->glBindTexture(texturedata->type, texturedata->texture); + + if (texture->modMode) { + GLES_SetColor(data, texture->r, texture->g, texture->b, texture->a); + } else { + GLES_SetColor(data, 255, 255, 255, 255); + } + + GLES_SetBlendMode(data, texture->blendMode); + + GLES_SetTexCoords(data, SDL_TRUE); + + centerx = (GLfloat)center->x; + centery = (GLfloat)center->y; + + // Rotate and translate + data->glPushMatrix(); + data->glTranslatef((GLfloat)dstrect->x + centerx, (GLfloat)dstrect->y + centery, (GLfloat)0.0); + data->glRotatef((GLfloat)angle, (GLfloat)0.0, (GLfloat)0.0, (GLfloat)1.0); + + if (flip & SDL_FLIP_HORIZONTAL) { + minx = (GLfloat) dstrect->w - centerx; + maxx = -centerx; + } + else { + minx = -centerx; + maxx = dstrect->w - centerx; + } + + if (flip & SDL_FLIP_VERTICAL) { + miny = dstrect->h - centery; + maxy = -centery; + } + else { + miny = -centery; + maxy = dstrect->h - centery; + } + + minu = (GLfloat) srcrect->x / texture->w; + minu *= texturedata->texw; + maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w; + maxu *= texturedata->texw; + minv = (GLfloat) srcrect->y / texture->h; + minv *= texturedata->texh; + maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h; + maxv *= texturedata->texh; + + GLshort vertices[8]; + GLfloat texCoords[8]; + + vertices[0] = minx; + vertices[1] = miny; + vertices[2] = maxx; + vertices[3] = miny; + vertices[4] = minx; + vertices[5] = maxy; + vertices[6] = maxx; + vertices[7] = maxy; + + texCoords[0] = minu; + texCoords[1] = minv; + texCoords[2] = maxu; + texCoords[3] = minv; + texCoords[4] = minu; + texCoords[5] = maxv; + texCoords[6] = maxu; + texCoords[7] = maxv; + data->glVertexPointer(2, GL_SHORT, 0, vertices); + data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords); + data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + data->glPopMatrix(); + data->glDisable(GL_TEXTURE_2D); + + return 0; +} + static void GLES_RenderPresent(SDL_Renderer * renderer) { diff --git a/src/helper/android/SDL2/src/render/opengles2/SDL_gles2funcs.h b/src/eepp/helper/SDL2/src/render/opengles2/SDL_gles2funcs.h similarity index 97% rename from src/helper/android/SDL2/src/render/opengles2/SDL_gles2funcs.h rename to src/eepp/helper/SDL2/src/render/opengles2/SDL_gles2funcs.h index e64528a46..7b7d5e17d 100644 --- a/src/helper/android/SDL2/src/render/opengles2/SDL_gles2funcs.h +++ b/src/eepp/helper/SDL2/src/render/opengles2/SDL_gles2funcs.h @@ -17,6 +17,7 @@ SDL_PROC(void, glDrawArrays, (GLenum, GLint, GLsizei)) SDL_PROC(void, glEnable, (GLenum)) SDL_PROC(void, glEnableVertexAttribArray, (GLuint)) SDL_PROC(void, glFinish, (void)) +SDL_PROC(void, glGenFramebuffers, (GLsizei, GLuint *)) SDL_PROC(void, glGenTextures, (GLsizei, GLuint *)) SDL_PROC(void, glGetBooleanv, (GLenum, GLboolean *)) SDL_PROC(const GLubyte *, glGetString, (GLenum)) diff --git a/src/helper/android/SDL2/src/render/opengles2/SDL_render_gles2.c b/src/eepp/helper/SDL2/src/render/opengles2/SDL_render_gles2.c similarity index 85% rename from src/helper/android/SDL2/src/render/opengles2/SDL_render_gles2.c rename to src/eepp/helper/SDL2/src/render/opengles2/SDL_render_gles2.c index 19e44db50..946f1eeca 100755 --- a/src/helper/android/SDL2/src/render/opengles2/SDL_render_gles2.c +++ b/src/eepp/helper/SDL2/src/render/opengles2/SDL_render_gles2.c @@ -112,7 +112,9 @@ typedef struct GLES2_ProgramCache typedef enum { GLES2_ATTRIBUTE_POSITION = 0, - GLES2_ATTRIBUTE_TEXCOORD = 1 + GLES2_ATTRIBUTE_TEXCOORD = 1, + GLES2_ATTRIBUTE_ANGLE = 2, + GLES2_ATTRIBUTE_CENTER = 3, } GLES2_Attribute; typedef enum @@ -145,6 +147,7 @@ typedef struct GLES2_DriverContext #include "SDL_gles2funcs.h" #undef SDL_PROC GLES2_FBOList *framebuffers; + GLuint window_framebuffer; int shader_format_count; GLenum *shader_formats; @@ -210,7 +213,7 @@ GLES2_GetFBO(GLES2_DriverContext *data, Uint32 w, Uint32 h) result = SDL_malloc(sizeof(GLES2_FBOList)); result->w = w; result->h = h; - glGenFramebuffers(1, &result->FBO); + data->glGenFramebuffers(1, &result->FBO); result->next = data->framebuffers; data->framebuffers = result; } @@ -266,6 +269,10 @@ GLES2_UpdateViewport(SDL_Renderer * renderer) rdata->glViewport(renderer->viewport.x, renderer->viewport.y, renderer->viewport.w, renderer->viewport.h); + + if (rdata->current_program) { + GLES2_SetOrthographicProjection(renderer); + } return 0; } @@ -542,7 +549,7 @@ GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture) GLenum status; if (texture == NULL) { - data->glBindFramebuffer(GL_FRAMEBUFFER, 0); + data->glBindFramebuffer(GL_FRAMEBUFFER, data->window_framebuffer); } else { texturedata = (GLES2_TextureData *) texture->driverdata; data->glBindFramebuffer(GL_FRAMEBUFFER, texturedata->fbo->FBO); @@ -555,9 +562,6 @@ GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture) return -1; } } - if (data->current_program) { - GLES2_SetOrthographicProjection(renderer); - } return 0; } @@ -626,6 +630,8 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex, rdata->glAttachShader(entry->id, fragment->id); rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_POSITION, "a_position"); rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_TEXCOORD, "a_texCoord"); + rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_ANGLE, "a_angle"); + rdata->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_CENTER, "a_center"); rdata->glLinkProgram(entry->id); rdata->glGetProgramiv(entry->id, GL_LINK_STATUS, &linkSuccessful); if (rdata->glGetError() != GL_NO_ERROR || !linkSuccessful) @@ -938,6 +944,9 @@ static int GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const const SDL_Rect *dstrect); static int GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 pixel_format, void * pixels, int pitch); +static int GLES2_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); static void GLES2_RenderPresent(SDL_Renderer *renderer); @@ -1239,7 +1248,7 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s /* Select the target texture */ locTexture = rdata->current_program->uniform_locations[GLES2_UNIFORM_TEXTURE]; rdata->glGetError(); - rdata->glActiveTexture(GL_TEXTURE0); + rdata->glActiveTexture(GL_TEXTURE0); rdata->glBindTexture(tdata->texture_type, tdata->texture); rdata->glUniform1i(locTexture, 0); @@ -1279,6 +1288,188 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s vertices[7] = (GLfloat)(dstrect->y + dstrect->h); } rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices); + texCoords[0] = srcrect->x / (GLfloat)texture->w; + texCoords[1] = srcrect->y / (GLfloat)texture->h; + texCoords[2] = (srcrect->x + srcrect->w) / (GLfloat)texture->w; + texCoords[3] = srcrect->y / (GLfloat)texture->h; + texCoords[4] = srcrect->x / (GLfloat)texture->w; + texCoords[5] = (srcrect->y + srcrect->h) / (GLfloat)texture->h; + texCoords[6] = (srcrect->x + srcrect->w) / (GLfloat)texture->w; + texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h; + rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords); + rdata->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + if (rdata->glGetError() != GL_NO_ERROR) + { + SDL_SetError("Failed to render texture"); + return -1; + } + return 0; +} + +static int +GLES2_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) +{ + GLES2_DriverContext *rdata = (GLES2_DriverContext *)renderer->driverdata; + GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata; + GLES2_ImageSource sourceType; + SDL_BlendMode blendMode; + GLfloat vertices[8]; + GLfloat texCoords[8]; + GLuint locTexture; + GLuint locModulation; + GLfloat translate[8]; + GLfloat fAngle[4]; + GLfloat tmp; + + GLES2_ActivateRenderer(renderer); + + rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER); + rdata->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE); + fAngle[0] = fAngle[1] = fAngle[2] = fAngle[3] = (GLfloat)angle; + /* Calculate the center of rotation */ + translate[0] = translate[2] = translate[4] = translate[6] = (GLfloat)(center->x + dstrect->x); + translate[1] = translate[3] = translate[5] = translate[7] = (GLfloat)(center->y + dstrect->y); + + /* Activate an appropriate shader and set the projection matrix */ + blendMode = texture->blendMode; + if (renderer->target) { + /* Check if we need to do color mapping between the source and render target textures */ + if (renderer->target->format != texture->format) { + switch (texture->format) + { + case SDL_PIXELFORMAT_ABGR8888: + switch (renderer->target->format) + { + case SDL_PIXELFORMAT_ARGB8888: + case SDL_PIXELFORMAT_RGB888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + case SDL_PIXELFORMAT_BGR888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR; + break; + } + break; + case SDL_PIXELFORMAT_ARGB8888: + switch (renderer->target->format) + { + case SDL_PIXELFORMAT_ABGR8888: + case SDL_PIXELFORMAT_BGR888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + case SDL_PIXELFORMAT_RGB888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR; + break; + } + break; + case SDL_PIXELFORMAT_BGR888: + switch (renderer->target->format) + { + case SDL_PIXELFORMAT_ABGR8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR; + break; + case SDL_PIXELFORMAT_ARGB8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB; + break; + case SDL_PIXELFORMAT_RGB888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + } + break; + case SDL_PIXELFORMAT_RGB888: + switch (renderer->target->format) + { + case SDL_PIXELFORMAT_ABGR8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + case SDL_PIXELFORMAT_ARGB8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR; + break; + case SDL_PIXELFORMAT_BGR888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + } + break; + } + } + else sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR; // Texture formats match, use the non color mapping shader (even if the formats are not ABGR) + } + else { + switch (texture->format) + { + case SDL_PIXELFORMAT_ABGR8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR; + break; + case SDL_PIXELFORMAT_ARGB8888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB; + break; + case SDL_PIXELFORMAT_BGR888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR; + break; + case SDL_PIXELFORMAT_RGB888: + sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB; + break; + } + } + if (GLES2_SelectProgram(renderer, sourceType, blendMode) < 0) + return -1; + + /* Select the target texture */ + locTexture = rdata->current_program->uniform_locations[GLES2_UNIFORM_TEXTURE]; + rdata->glGetError(); + rdata->glActiveTexture(GL_TEXTURE0); + rdata->glBindTexture(tdata->texture_type, tdata->texture); + rdata->glUniform1i(locTexture, 0); + + /* Configure color modulation */ + locModulation = rdata->current_program->uniform_locations[GLES2_UNIFORM_MODULATION]; + rdata->glUniform4f(locModulation, + texture->r * inv255f, + texture->g * inv255f, + texture->b * inv255f, + texture->a * inv255f); + + /* Configure texture blending */ + GLES2_SetBlendMode(rdata, blendMode); + + GLES2_SetTexCoords(rdata, SDL_TRUE); + + /* Emit the textured quad */ + if (renderer->target) { + // Flip the texture vertically to compensate for the inversion it'll be subjected to later when it's rendered to the screen + vertices[0] = (GLfloat)dstrect->x; + vertices[1] = (GLfloat)renderer->viewport.h-dstrect->y; + vertices[2] = (GLfloat)(dstrect->x + dstrect->w); + vertices[3] = (GLfloat)renderer->viewport.h-dstrect->y; + vertices[4] = (GLfloat)dstrect->x; + vertices[5] = (GLfloat)renderer->viewport.h-(dstrect->y + dstrect->h); + vertices[6] = (GLfloat)(dstrect->x + dstrect->w); + vertices[7] = (GLfloat)renderer->viewport.h-(dstrect->y + dstrect->h); + } + else { + vertices[0] = (GLfloat)dstrect->x; + vertices[1] = (GLfloat)dstrect->y; + vertices[2] = (GLfloat)(dstrect->x + dstrect->w); + vertices[3] = (GLfloat)dstrect->y; + vertices[4] = (GLfloat)dstrect->x; + vertices[5] = (GLfloat)(dstrect->y + dstrect->h); + vertices[6] = (GLfloat)(dstrect->x + dstrect->w); + vertices[7] = (GLfloat)(dstrect->y + dstrect->h); + } + if (flip & SDL_FLIP_HORIZONTAL) { + tmp = vertices[0]; + vertices[0] = vertices[4] = vertices[2]; + vertices[2] = vertices[6] = tmp; + } + if (flip & SDL_FLIP_VERTICAL) { + tmp = vertices[1]; + vertices[1] = vertices[3] = vertices[5]; + vertices[5] = vertices[7] = tmp; + } + + rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_ANGLE, 1, GL_FLOAT, GL_FALSE, 0, &fAngle); + rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate); + rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices); texCoords[0] = srcrect->x / (GLfloat)texture->w; texCoords[1] = srcrect->y / (GLfloat)texture->h; @@ -1290,6 +1481,8 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h; rdata->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords); rdata->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_CENTER); + rdata->glDisableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE); if (rdata->glGetError() != GL_NO_ERROR) { SDL_SetError("Failed to render texture"); @@ -1393,6 +1586,7 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) GLboolean hasCompiler; #endif Uint32 windowFlags; + GLint window_framebuffer; SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); @@ -1484,6 +1678,8 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) #endif /* ZUNE_HD */ rdata->framebuffers = NULL; + rdata->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &window_framebuffer); + rdata->window_framebuffer = (GLuint)window_framebuffer; /* Populate the function pointers for the module */ renderer->WindowEvent = &GLES2_WindowEvent; @@ -1499,6 +1695,7 @@ GLES2_CreateRenderer(SDL_Window *window, Uint32 flags) renderer->RenderFillRects = &GLES2_RenderFillRects; renderer->RenderCopy = &GLES2_RenderCopy; renderer->RenderReadPixels = &GLES2_RenderReadPixels; + renderer->RenderCopyEx = &GLES2_RenderCopyEx; renderer->RenderPresent = &GLES2_RenderPresent; renderer->DestroyTexture = &GLES2_DestroyTexture; renderer->DestroyRenderer = &GLES2_DestroyRenderer; diff --git a/src/helper/android/SDL2/src/render/opengles2/SDL_shaders_gles2.c b/src/eepp/helper/SDL2/src/render/opengles2/SDL_shaders_gles2.c similarity index 98% rename from src/helper/android/SDL2/src/render/opengles2/SDL_shaders_gles2.c rename to src/eepp/helper/SDL2/src/render/opengles2/SDL_shaders_gles2.c index 9c2fcb865..423e3b1e2 100755 --- a/src/helper/android/SDL2/src/render/opengles2/SDL_shaders_gles2.c +++ b/src/eepp/helper/SDL2/src/render/opengles2/SDL_shaders_gles2.c @@ -33,14 +33,21 @@ static const Uint8 GLES2_VertexSrc_Default_[] = " \ uniform mat4 u_projection; \ - attribute vec4 a_position; \ + attribute vec2 a_position; \ attribute vec2 a_texCoord; \ + attribute float a_angle; \ + attribute vec2 a_center; \ varying vec2 v_texCoord; \ \ void main() \ { \ + float angle = radians(a_angle); \ + float c = cos(angle); \ + float s = sin(angle); \ + mat2 rotationMatrix = mat2(c, -s, s, c); \ + vec2 position = rotationMatrix * (a_position - a_center) + a_center; \ v_texCoord = a_texCoord; \ - gl_Position = u_projection * a_position; \ + gl_Position = u_projection * vec4(position, 0.0, 1.0);\ gl_PointSize = 1.0; \ } \ "; diff --git a/src/helper/android/SDL2/src/render/opengles2/SDL_shaders_gles2.h b/src/eepp/helper/SDL2/src/render/opengles2/SDL_shaders_gles2.h similarity index 100% rename from src/helper/android/SDL2/src/render/opengles2/SDL_shaders_gles2.h rename to src/eepp/helper/SDL2/src/render/opengles2/SDL_shaders_gles2.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendfillrect.c b/src/eepp/helper/SDL2/src/render/software/SDL_blendfillrect.c similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendfillrect.c rename to src/eepp/helper/SDL2/src/render/software/SDL_blendfillrect.c diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendfillrect.h b/src/eepp/helper/SDL2/src/render/software/SDL_blendfillrect.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendfillrect.h rename to src/eepp/helper/SDL2/src/render/software/SDL_blendfillrect.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendline.c b/src/eepp/helper/SDL2/src/render/software/SDL_blendline.c similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendline.c rename to src/eepp/helper/SDL2/src/render/software/SDL_blendline.c diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendline.h b/src/eepp/helper/SDL2/src/render/software/SDL_blendline.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendline.h rename to src/eepp/helper/SDL2/src/render/software/SDL_blendline.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendpoint.c b/src/eepp/helper/SDL2/src/render/software/SDL_blendpoint.c similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendpoint.c rename to src/eepp/helper/SDL2/src/render/software/SDL_blendpoint.c diff --git a/src/helper/android/SDL2/src/render/software/SDL_blendpoint.h b/src/eepp/helper/SDL2/src/render/software/SDL_blendpoint.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_blendpoint.h rename to src/eepp/helper/SDL2/src/render/software/SDL_blendpoint.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_draw.h b/src/eepp/helper/SDL2/src/render/software/SDL_draw.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_draw.h rename to src/eepp/helper/SDL2/src/render/software/SDL_draw.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_drawline.c b/src/eepp/helper/SDL2/src/render/software/SDL_drawline.c similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_drawline.c rename to src/eepp/helper/SDL2/src/render/software/SDL_drawline.c diff --git a/src/helper/android/SDL2/src/render/software/SDL_drawline.h b/src/eepp/helper/SDL2/src/render/software/SDL_drawline.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_drawline.h rename to src/eepp/helper/SDL2/src/render/software/SDL_drawline.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_drawpoint.c b/src/eepp/helper/SDL2/src/render/software/SDL_drawpoint.c similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_drawpoint.c rename to src/eepp/helper/SDL2/src/render/software/SDL_drawpoint.c diff --git a/src/helper/android/SDL2/src/render/software/SDL_drawpoint.h b/src/eepp/helper/SDL2/src/render/software/SDL_drawpoint.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_drawpoint.h rename to src/eepp/helper/SDL2/src/render/software/SDL_drawpoint.h diff --git a/src/helper/android/SDL2/src/render/software/SDL_render_sw.c b/src/eepp/helper/SDL2/src/render/software/SDL_render_sw.c similarity index 79% rename from src/helper/android/SDL2/src/render/software/SDL_render_sw.c rename to src/eepp/helper/SDL2/src/render/software/SDL_render_sw.c index aa72c9364..6cac41d6e 100755 --- a/src/helper/android/SDL2/src/render/software/SDL_render_sw.c +++ b/src/eepp/helper/SDL2/src/render/software/SDL_render_sw.c @@ -24,6 +24,7 @@ #include "../SDL_sysrender.h" #include "SDL_render_sw_c.h" +#include "SDL_hints.h" #include "SDL_draw.h" #include "SDL_blendfillrect.h" @@ -31,7 +32,7 @@ #include "SDL_blendpoint.h" #include "SDL_drawline.h" #include "SDL_drawpoint.h" - +#include "SDL_rotate.h" /* SDL surface based renderer implementation */ @@ -62,6 +63,9 @@ static int SW_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect * rects, int count); static int SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * srcrect, const SDL_Rect * dstrect); +static int SW_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); static int SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch); static void SW_RenderPresent(SDL_Renderer * renderer); @@ -152,6 +156,7 @@ SW_CreateRendererForSurface(SDL_Surface * surface) renderer->RenderDrawLines = SW_RenderDrawLines; renderer->RenderFillRects = SW_RenderFillRects; renderer->RenderCopy = SW_RenderCopy; + renderer->RenderCopyEx = SW_RenderCopyEx; renderer->RenderReadPixels = SW_RenderReadPixels; renderer->RenderPresent = SW_RenderPresent; renderer->DestroyTexture = SW_DestroyTexture; @@ -183,6 +188,7 @@ SW_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event) if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) { data->surface = NULL; + data->window = NULL; } } @@ -494,6 +500,102 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, } } +static int +GetScaleQuality(void) +{ + const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY); + + if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) { + return 0; + } else { + return 1; + } +} + +static int +SW_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) +{ + SDL_Surface *surface = SW_ActivateRenderer(renderer); + SDL_Surface *src = (SDL_Surface *) texture->driverdata; + SDL_Rect final_rect = *dstrect, tmp_rect; + SDL_Surface *surface_rotated, *surface_scaled; + SDL_Point final_rect_center; + Uint32 colorkey; + int retval, dstwidth, dstheight, abscenterx, abscentery; + double cangle, sangle, px, py, p1x, p1y, p2x, p2y, p3x, p3y, p4x, p4y; + + if (!surface) { + return -1; + } + + if (renderer->viewport.x || renderer->viewport.y) { + final_rect.x += renderer->viewport.x; + final_rect.y += renderer->viewport.y; + } + + surface_scaled = SDL_CreateRGBSurface(SDL_SWSURFACE, final_rect.w, final_rect.h, src->format->BitsPerPixel, + src->format->Rmask, src->format->Gmask, + src->format->Bmask, src->format->Amask ); + SDL_GetColorKey(src, &colorkey); + SDL_SetColorKey(surface_scaled, SDL_TRUE, colorkey); + tmp_rect = final_rect; + tmp_rect.x = 0; + tmp_rect.y = 0; + if (surface_scaled) { + retval = SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect); + if (!retval) { + _rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, -angle, &dstwidth, &dstheight, &cangle, &sangle); + surface_rotated = _rotateSurface(surface_scaled, -angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle); + if(surface_rotated) { + /* Find out where the new origin is by rotating the four final_rect points around the center and then taking the extremes */ + abscenterx = final_rect.x + center->x; + abscentery = final_rect.y + center->y; + /* Compensate the angle inversion to match the behaviour of the other backends */ + sangle = -sangle; + + /* Top Left */ + px = final_rect.x - abscenterx; + py = final_rect.y - abscentery; + p1x = px * cangle - py * sangle + abscenterx; + p1y = px * sangle + py * cangle + abscentery; + + /* Top Right */ + px = final_rect.x + final_rect.w - abscenterx; + py = final_rect.y - abscentery; + p2x = px * cangle - py * sangle + abscenterx; + p2y = px * sangle + py * cangle + abscentery; + + /* Bottom Left */ + px = final_rect.x - abscenterx; + py = final_rect.y + final_rect.h - abscentery; + p3x = px * cangle - py * sangle + abscenterx; + p3y = px * sangle + py * cangle + abscentery; + + /* Bottom Right */ + px = final_rect.x + final_rect.w - abscenterx; + py = final_rect.y + final_rect.h - abscentery; + p4x = px * cangle - py * sangle + abscenterx; + p4y = px * sangle + py * cangle + abscentery; + + tmp_rect.x = (int)MIN(MIN(p1x, p2x), MIN(p3x, p4x)); + tmp_rect.y = (int)MIN(MIN(p1y, p2y), MIN(p3y, p4y)); + tmp_rect.w = dstwidth; + tmp_rect.h = dstheight; + + retval = SDL_BlitSurface(surface_rotated, NULL, surface, &tmp_rect); + SDL_FreeSurface(surface_scaled); + SDL_FreeSurface(surface_rotated); + return retval; + } + } + return retval; + } + + return -1; +} + static int SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, Uint32 format, void * pixels, int pitch) diff --git a/src/helper/android/SDL2/src/render/software/SDL_render_sw_c.h b/src/eepp/helper/SDL2/src/render/software/SDL_render_sw_c.h similarity index 100% rename from src/helper/android/SDL2/src/render/software/SDL_render_sw_c.h rename to src/eepp/helper/SDL2/src/render/software/SDL_render_sw_c.h diff --git a/src/eepp/helper/SDL2/src/render/software/SDL_rotate.c b/src/eepp/helper/SDL2/src/render/software/SDL_rotate.c new file mode 100644 index 000000000..b64f137ab --- /dev/null +++ b/src/eepp/helper/SDL2/src/render/software/SDL_rotate.c @@ -0,0 +1,501 @@ +/* + +SDL_rotate.c: rotates 32bit or 8bit surfaces + +Shamelessly stolen from SDL_gfx by Andreas Schiffler. Original copyright follows: + +Copyright (C) 2001-2011 Andreas Schiffler + +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. + +Andreas Schiffler -- aschiffler at ferzkopp dot net + +*/ +#include "SDL_config.h" + +#ifdef WIN32 +#include +#endif + +#include +#include + +#include "SDL.h" +#include "SDL_rotate.h" + +/* ---- Internally used structures */ + +/*! +\brief A 32 bit RGBA pixel. +*/ +typedef struct tColorRGBA { + Uint8 r; + Uint8 g; + Uint8 b; + Uint8 a; +} tColorRGBA; + +/*! +\brief A 8bit Y/palette pixel. +*/ +typedef struct tColorY { + Uint8 y; +} tColorY; + +/*! +\brief Returns maximum of two numbers a and b. +*/ +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) + +/*! +\brief Number of guard rows added to destination surfaces. + +This is a simple but effective workaround for observed issues. +These rows allocate extra memory and are then hidden from the surface. +Rows are added to the end of destination surfaces when they are allocated. +This catches any potential overflows which seem to happen with +just the right src image dimensions and scale/rotation and can lead +to a situation where the program can segfault. +*/ +#define GUARD_ROWS (2) + +/*! +\brief Lower limit of absolute zoom factor or rotation degrees. +*/ +#define VALUE_LIMIT 0.001 + +/*! +\brief Returns colorkey info for a surface +*/ +Uint32 _colorkey(SDL_Surface *src) +{ + Uint32 key = 0; + SDL_GetColorKey(src, &key); + return key; +} + + +/*! +\brief Internal target surface sizing function for rotations with trig result return. + +\param width The source surface width. +\param height The source surface height. +\param angle The angle to rotate in degrees. +\param dstwidth The calculated width of the destination surface. +\param dstheight The calculated height of the destination surface. +\param cangle The sine of the angle +\param sangle The cosine of the angle + +*/ +void _rotozoomSurfaceSizeTrig(int width, int height, double angle, + int *dstwidth, int *dstheight, + double *cangle, double *sangle) +{ + double x, y, cx, cy, sx, sy; + double radangle; + int dstwidthhalf, dstheighthalf; + + /* + * Determine destination width and height by rotating a centered source box + */ + radangle = angle * (M_PI / 180.0); + *sangle = SDL_sin(radangle); + *cangle = SDL_cos(radangle); + x = (double)(width / 2); + y = (double)(height / 2); + cx = *cangle * x; + cy = *cangle * y; + sx = *sangle * x; + sy = *sangle * y; + + dstwidthhalf = MAX((int) + SDL_ceil(MAX(MAX(MAX(SDL_fabs(cx + sy), SDL_fabs(cx - sy)), SDL_fabs(-cx + sy)), SDL_fabs(-cx - sy))), 1); + dstheighthalf = MAX((int) + SDL_ceil(MAX(MAX(MAX(SDL_fabs(sx + cy), SDL_fabs(sx - cy)), SDL_fabs(-sx + cy)), SDL_fabs(-sx - cy))), 1); + *dstwidth = 2 * dstwidthhalf; + *dstheight = 2 * dstheighthalf; +} + + +/*! +\brief Internal 32 bit rotozoomer with optional anti-aliasing. + +Rotates and zooms 32 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control +parameters by scanning the destination surface and applying optionally anti-aliasing +by bilinear interpolation. +Assumes src and dst surfaces are of 32 bit depth. +Assumes dst surface was allocated with the correct dimensions. + +\param src Source surface. +\param dst Destination surface. +\param cx Horizontal center coordinate. +\param cy Vertical center coordinate. +\param isin Integer version of sine of angle. +\param icos Integer version of cosine of angle. +\param flipx Flag indicating horizontal mirroring should be applied. +\param flipy Flag indicating vertical mirroring should be applied. +\param smooth Flag indicating anti-aliasing should be used. +*/ +void _transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy, int smooth) +{ + int x, y, t1, t2, dx, dy, xd, yd, sdx, sdy, ax, ay, ex, ey, sw, sh; + tColorRGBA c00, c01, c10, c11, cswap; + tColorRGBA *pc, *sp; + int gap; + + /* + * Variable setup + */ + xd = ((src->w - dst->w) << 15); + yd = ((src->h - dst->h) << 15); + ax = (cx << 16) - (icos * cx); + ay = (cy << 16) - (isin * cx); + sw = src->w - 1; + sh = src->h - 1; + pc = (tColorRGBA*) dst->pixels; + gap = dst->pitch - dst->w * 4; + + /* + * Switch between interpolating and non-interpolating code + */ + if (smooth) { + for (y = 0; y < dst->h; y++) { + dy = cy - y; + sdx = (ax + (isin * dy)) + xd; + sdy = (ay - (icos * dy)) + yd; + for (x = 0; x < dst->w; x++) { + dx = (sdx >> 16); + dy = (sdy >> 16); + if (flipx) dx = sw - dx; + if (flipy) dy = sh - dy; + if ((dx > -1) && (dy > -1) && (dx < (src->w-1)) && (dy < (src->h-1))) { + sp = (tColorRGBA *)src->pixels;; + sp += ((src->pitch/4) * dy); + sp += dx; + c00 = *sp; + sp += 1; + c01 = *sp; + sp += (src->pitch/4); + c11 = *sp; + sp -= 1; + c10 = *sp; + if (flipx) { + cswap = c00; c00=c01; c01=cswap; + cswap = c10; c10=c11; c11=cswap; + } + if (flipy) { + cswap = c00; c00=c10; c10=cswap; + cswap = c01; c01=c11; c11=cswap; + } + /* + * Interpolate colors + */ + ex = (sdx & 0xffff); + ey = (sdy & 0xffff); + t1 = ((((c01.r - c00.r) * ex) >> 16) + c00.r) & 0xff; + t2 = ((((c11.r - c10.r) * ex) >> 16) + c10.r) & 0xff; + pc->r = (((t2 - t1) * ey) >> 16) + t1; + t1 = ((((c01.g - c00.g) * ex) >> 16) + c00.g) & 0xff; + t2 = ((((c11.g - c10.g) * ex) >> 16) + c10.g) & 0xff; + pc->g = (((t2 - t1) * ey) >> 16) + t1; + t1 = ((((c01.b - c00.b) * ex) >> 16) + c00.b) & 0xff; + t2 = ((((c11.b - c10.b) * ex) >> 16) + c10.b) & 0xff; + pc->b = (((t2 - t1) * ey) >> 16) + t1; + t1 = ((((c01.a - c00.a) * ex) >> 16) + c00.a) & 0xff; + t2 = ((((c11.a - c10.a) * ex) >> 16) + c10.a) & 0xff; + pc->a = (((t2 - t1) * ey) >> 16) + t1; + } + sdx += icos; + sdy += isin; + pc++; + } + pc = (tColorRGBA *) ((Uint8 *) pc + gap); + } + } else { + for (y = 0; y < dst->h; y++) { + dy = cy - y; + sdx = (ax + (isin * dy)) + xd; + sdy = (ay - (icos * dy)) + yd; + for (x = 0; x < dst->w; x++) { + dx = (short) (sdx >> 16); + dy = (short) (sdy >> 16); + if (flipx) dx = (src->w-1)-dx; + if (flipy) dy = (src->h-1)-dy; + if ((dx >= 0) && (dy >= 0) && (dx < src->w) && (dy < src->h)) { + sp = (tColorRGBA *) ((Uint8 *) src->pixels + src->pitch * dy); + sp += dx; + *pc = *sp; + } + sdx += icos; + sdy += isin; + pc++; + } + pc = (tColorRGBA *) ((Uint8 *) pc + gap); + } + } +} + +/*! + +\brief Rotates and zooms 8 bit palette/Y 'src' surface to 'dst' surface without smoothing. + +Rotates and zooms 8 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control +parameters by scanning the destination surface. +Assumes src and dst surfaces are of 8 bit depth. +Assumes dst surface was allocated with the correct dimensions. + +\param src Source surface. +\param dst Destination surface. +\param cx Horizontal center coordinate. +\param cy Vertical center coordinate. +\param isin Integer version of sine of angle. +\param icos Integer version of cosine of angle. +\param flipx Flag indicating horizontal mirroring should be applied. +\param flipy Flag indicating vertical mirroring should be applied. +*/ +void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy) +{ + int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay, sw, sh; + tColorY *pc, *sp; + int gap; + + /* + * Variable setup + */ + xd = ((src->w - dst->w) << 15); + yd = ((src->h - dst->h) << 15); + ax = (cx << 16) - (icos * cx); + ay = (cy << 16) - (isin * cx); + sw = src->w - 1; + sh = src->h - 1; + pc = (tColorY*) dst->pixels; + gap = dst->pitch - dst->w; + /* + * Clear surface to colorkey + */ + SDL_memset(pc, (int)(_colorkey(src) & 0xff), dst->pitch * dst->h); + /* + * Iterate through destination surface + */ + for (y = 0; y < dst->h; y++) { + dy = cy - y; + sdx = (ax + (isin * dy)) + xd; + sdy = (ay - (icos * dy)) + yd; + for (x = 0; x < dst->w; x++) { + dx = (short) (sdx >> 16); + dy = (short) (sdy >> 16); + if (flipx) dx = (src->w-1)-dx; + if (flipy) dy = (src->h-1)-dy; + if ((dx >= 0) && (dy >= 0) && (dx < src->w) && (dy < src->h)) { + sp = (tColorY *) (src->pixels); + sp += (src->pitch * dy + dx); + *pc = *sp; + } + sdx += icos; + sdy += isin; + pc++; + } + pc += gap; + } +} + + + + +/*! +\brief Rotates and zooms a surface with different horizontal and vertival scaling factors and optional anti-aliasing. + +Rotates a 32bit or 8bit 'src' surface to newly created 'dst' surface. +'angle' is the rotation in degrees, 'centerx' and 'centery' the rotation center. If 'smooth' is set +then the destination 32bit surface is anti-aliased. If the surface is not 8bit +or 32bit RGBA/ABGR it will be converted into a 32bit RGBA format on the fly. + +\param src The surface to rotozoom. +\param angle The angle to rotate in degrees. +\param centerx The horizontal coordinate of the center of rotation +\param zoomy The vertical coordinate of the center of rotation +\param smooth Antialiasing flag; set to SMOOTHING_ON to enable. +\param flipx Set to 1 to flip the image horizontally +\param flipy Set to 1 to flip the image vertically +\param dstwidth The destination surface width +\param dstheight The destination surface height +\param cangle The angle cosine +\param sangle The angle sine +\return The new rotated surface. + +*/ + +SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle) +{ + SDL_Surface *rz_src; + SDL_Surface *rz_dst; + int is32bit; + int i, src_converted; + Uint8 r,g,b; + Uint32 colorkey = 0; + int colorKeyAvailable = 0; + double sangleinv, cangleinv; + + /* + * Sanity check + */ + if (src == NULL) + return (NULL); + + if (src->flags & SDL_TRUE/*SDL_SRCCOLORKEY*/) + { + colorkey = _colorkey(src); + SDL_GetRGB(colorkey, src->format, &r, &g, &b); + colorKeyAvailable = 1; + } + /* + * Determine if source surface is 32bit or 8bit + */ + is32bit = (src->format->BitsPerPixel == 32); + if ((is32bit) || (src->format->BitsPerPixel == 8)) { + /* + * Use source surface 'as is' + */ + rz_src = src; + src_converted = 0; + } else { + /* + * New source surface is 32bit with a defined RGBA ordering + */ + rz_src = + SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32, +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 +#else + 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff +#endif + ); + if(colorKeyAvailable) + SDL_SetColorKey(src, 0, 0); + + SDL_BlitSurface(src, NULL, rz_src, NULL); + + if(colorKeyAvailable) + SDL_SetColorKey(src, SDL_TRUE /*SDL_SRCCOLORKEY*/, colorkey); + src_converted = 1; + is32bit = 1; + } + + + /* Determine target size */ + //_rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); + + /* + * Calculate target factors from sin/cos and zoom + */ + sangleinv = sangle*65536.0; + cangleinv = cangle*65536.0; + + /* + * Alloc space to completely contain the rotated surface + */ + rz_dst = NULL; + if (is32bit) { + /* + * Target surface is 32bit with source RGBA/ABGR ordering + */ + rz_dst = + SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight + GUARD_ROWS, 32, + rz_src->format->Rmask, rz_src->format->Gmask, + rz_src->format->Bmask, rz_src->format->Amask); + } else { + /* + * Target surface is 8bit + */ + rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight + GUARD_ROWS, 8, 0, 0, 0, 0); + } + + /* Check target */ + if (rz_dst == NULL) + return NULL; + + /* Adjust for guard rows */ + rz_dst->h = dstheight; + + if (colorKeyAvailable == 1){ + colorkey = SDL_MapRGB(rz_dst->format, r, g, b); + + SDL_FillRect(rz_dst, NULL, colorkey ); + } + + /* + * Lock source surface + */ + if (SDL_MUSTLOCK(rz_src)) { + SDL_LockSurface(rz_src); + } + + /* + * Check which kind of surface we have + */ + if (is32bit) { + /* + * Call the 32bit transformation routine to do the rotation (using alpha) + */ + _transformSurfaceRGBA(rz_src, rz_dst, centerx, centery, + (int) (sangleinv), (int) (cangleinv), + flipx, flipy, + smooth); + /* + * Turn on source-alpha support + */ + //SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); + SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY*/ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src)); + } else { + /* + * Copy palette and colorkey info + */ + for (i = 0; i < rz_src->format->palette->ncolors; i++) { + rz_dst->format->palette->colors[i] = rz_src->format->palette->colors[i]; + } + rz_dst->format->palette->ncolors = rz_src->format->palette->ncolors; + /* + * Call the 8bit transformation routine to do the rotation + */ + transformSurfaceY(rz_src, rz_dst, centerx, centery, + (int) (sangleinv), (int) (cangleinv), + flipx, flipy); + SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY*/ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src)); + } + /* + * Unlock source surface + */ + if (SDL_MUSTLOCK(rz_src)) { + SDL_UnlockSurface(rz_src); + } + + /* + * Cleanup temp surface + */ + if (src_converted) { + SDL_FreeSurface(rz_src); + } + + /* + * Return destination surface + */ + return (rz_dst); +} + diff --git a/src/eepp/helper/SDL2/src/render/software/SDL_rotate.h b/src/eepp/helper/SDL2/src/render/software/SDL_rotate.h new file mode 100644 index 000000000..6a5a174da --- /dev/null +++ b/src/eepp/helper/SDL2/src/render/software/SDL_rotate.h @@ -0,0 +1,6 @@ +#ifndef MIN +#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +extern SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle); +extern void _rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle); \ No newline at end of file diff --git a/src/helper/android/SDL2/src/stdlib/SDL_getenv.c b/src/eepp/helper/SDL2/src/stdlib/SDL_getenv.c similarity index 100% rename from src/helper/android/SDL2/src/stdlib/SDL_getenv.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_getenv.c diff --git a/src/helper/android/SDL2/src/stdlib/SDL_iconv.c b/src/eepp/helper/SDL2/src/stdlib/SDL_iconv.c similarity index 100% rename from src/helper/android/SDL2/src/stdlib/SDL_iconv.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_iconv.c diff --git a/src/helper/android/SDL2/src/stdlib/SDL_malloc.c b/src/eepp/helper/SDL2/src/stdlib/SDL_malloc.c similarity index 100% rename from src/helper/android/SDL2/src/stdlib/SDL_malloc.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_malloc.c diff --git a/src/helper/android/SDL2/src/stdlib/SDL_qsort.c b/src/eepp/helper/SDL2/src/stdlib/SDL_qsort.c similarity index 99% rename from src/helper/android/SDL2/src/stdlib/SDL_qsort.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_qsort.c index b91be69ca..6d56c6758 100644 --- a/src/helper/android/SDL2/src/stdlib/SDL_qsort.c +++ b/src/eepp/helper/SDL2/src/stdlib/SDL_qsort.c @@ -49,11 +49,12 @@ #include */ #include "SDL_stdinc.h" +#include "SDL_assert.h" #ifdef assert #undef assert #endif -#define assert(X) +#define assert(X) SDL_assert(X) #ifdef malloc #undef malloc #endif diff --git a/src/helper/android/SDL2/src/stdlib/SDL_stdlib.c b/src/eepp/helper/SDL2/src/stdlib/SDL_stdlib.c similarity index 100% rename from src/helper/android/SDL2/src/stdlib/SDL_stdlib.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_stdlib.c diff --git a/src/helper/android/SDL2/src/stdlib/SDL_string.c b/src/eepp/helper/SDL2/src/stdlib/SDL_string.c similarity index 100% rename from src/helper/android/SDL2/src/stdlib/SDL_string.c rename to src/eepp/helper/SDL2/src/stdlib/SDL_string.c diff --git a/src/helper/android/SDL2/src/thread/SDL_systhread.h b/src/eepp/helper/SDL2/src/thread/SDL_systhread.h similarity index 100% rename from src/helper/android/SDL2/src/thread/SDL_systhread.h rename to src/eepp/helper/SDL2/src/thread/SDL_systhread.h diff --git a/src/helper/android/SDL2/src/thread/SDL_thread.c b/src/eepp/helper/SDL2/src/thread/SDL_thread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/SDL_thread.c rename to src/eepp/helper/SDL2/src/thread/SDL_thread.c diff --git a/src/helper/android/SDL2/src/thread/SDL_thread_c.h b/src/eepp/helper/SDL2/src/thread/SDL_thread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/SDL_thread_c.h rename to src/eepp/helper/SDL2/src/thread/SDL_thread_c.h diff --git a/src/helper/android/SDL2/src/thread/beos/SDL_syssem.c b/src/eepp/helper/SDL2/src/thread/beos/SDL_syssem.c similarity index 100% rename from src/helper/android/SDL2/src/thread/beos/SDL_syssem.c rename to src/eepp/helper/SDL2/src/thread/beos/SDL_syssem.c diff --git a/src/helper/android/SDL2/src/thread/beos/SDL_systhread.c b/src/eepp/helper/SDL2/src/thread/beos/SDL_systhread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/beos/SDL_systhread.c rename to src/eepp/helper/SDL2/src/thread/beos/SDL_systhread.c diff --git a/src/helper/android/SDL2/src/thread/beos/SDL_systhread_c.h b/src/eepp/helper/SDL2/src/thread/beos/SDL_systhread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/beos/SDL_systhread_c.h rename to src/eepp/helper/SDL2/src/thread/beos/SDL_systhread_c.h diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_syscond.c b/src/eepp/helper/SDL2/src/thread/generic/SDL_syscond.c similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_syscond.c rename to src/eepp/helper/SDL2/src/thread/generic/SDL_syscond.c diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_sysmutex.c b/src/eepp/helper/SDL2/src/thread/generic/SDL_sysmutex.c similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_sysmutex.c rename to src/eepp/helper/SDL2/src/thread/generic/SDL_sysmutex.c diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_sysmutex_c.h b/src/eepp/helper/SDL2/src/thread/generic/SDL_sysmutex_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_sysmutex_c.h rename to src/eepp/helper/SDL2/src/thread/generic/SDL_sysmutex_c.h diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_syssem.c b/src/eepp/helper/SDL2/src/thread/generic/SDL_syssem.c similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_syssem.c rename to src/eepp/helper/SDL2/src/thread/generic/SDL_syssem.c diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_systhread.c b/src/eepp/helper/SDL2/src/thread/generic/SDL_systhread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_systhread.c rename to src/eepp/helper/SDL2/src/thread/generic/SDL_systhread.c diff --git a/src/helper/android/SDL2/src/thread/generic/SDL_systhread_c.h b/src/eepp/helper/SDL2/src/thread/generic/SDL_systhread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/generic/SDL_systhread_c.h rename to src/eepp/helper/SDL2/src/thread/generic/SDL_systhread_c.h diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_syscond.c b/src/eepp/helper/SDL2/src/thread/nds/SDL_syscond.c similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_syscond.c rename to src/eepp/helper/SDL2/src/thread/nds/SDL_syscond.c diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_syscond_c.h b/src/eepp/helper/SDL2/src/thread/nds/SDL_syscond_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_syscond_c.h rename to src/eepp/helper/SDL2/src/thread/nds/SDL_syscond_c.h diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_sysmutex.c b/src/eepp/helper/SDL2/src/thread/nds/SDL_sysmutex.c similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_sysmutex.c rename to src/eepp/helper/SDL2/src/thread/nds/SDL_sysmutex.c diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_sysmutex_c.h b/src/eepp/helper/SDL2/src/thread/nds/SDL_sysmutex_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_sysmutex_c.h rename to src/eepp/helper/SDL2/src/thread/nds/SDL_sysmutex_c.h diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_syssem.c b/src/eepp/helper/SDL2/src/thread/nds/SDL_syssem.c similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_syssem.c rename to src/eepp/helper/SDL2/src/thread/nds/SDL_syssem.c diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_syssem_c.h b/src/eepp/helper/SDL2/src/thread/nds/SDL_syssem_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_syssem_c.h rename to src/eepp/helper/SDL2/src/thread/nds/SDL_syssem_c.h diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_systhread.c b/src/eepp/helper/SDL2/src/thread/nds/SDL_systhread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_systhread.c rename to src/eepp/helper/SDL2/src/thread/nds/SDL_systhread.c diff --git a/src/helper/android/SDL2/src/thread/nds/SDL_systhread_c.h b/src/eepp/helper/SDL2/src/thread/nds/SDL_systhread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/nds/SDL_systhread_c.h rename to src/eepp/helper/SDL2/src/thread/nds/SDL_systhread_c.h diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_syscond.c b/src/eepp/helper/SDL2/src/thread/pthread/SDL_syscond.c similarity index 100% rename from src/helper/android/SDL2/src/thread/pthread/SDL_syscond.c rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_syscond.c diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_sysmutex.c b/src/eepp/helper/SDL2/src/thread/pthread/SDL_sysmutex.c similarity index 100% rename from src/helper/android/SDL2/src/thread/pthread/SDL_sysmutex.c rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_sysmutex.c diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_sysmutex_c.h b/src/eepp/helper/SDL2/src/thread/pthread/SDL_sysmutex_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/pthread/SDL_sysmutex_c.h rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_sysmutex_c.h diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_syssem.c b/src/eepp/helper/SDL2/src/thread/pthread/SDL_syssem.c similarity index 96% rename from src/helper/android/SDL2/src/thread/pthread/SDL_syssem.c rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_syssem.c index 01d8f461a..91959c1b6 100755 --- a/src/helper/android/SDL2/src/thread/pthread/SDL_syssem.c +++ b/src/eepp/helper/SDL2/src/thread/pthread/SDL_syssem.c @@ -150,7 +150,11 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout) } while (retval < 0 && errno == EINTR); if (retval < 0) { - SDL_SetError("sem_timedwait() failed"); + if (errno == ETIMEDOUT) { + retval = SDL_MUTEX_TIMEDOUT; + } else { + SDL_SetError(strerror(errno)); + } } #else end = SDL_GetTicks() + timeout; diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_systhread.c b/src/eepp/helper/SDL2/src/thread/pthread/SDL_systhread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/pthread/SDL_systhread.c rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_systhread.c diff --git a/src/helper/android/SDL2/src/thread/pthread/SDL_systhread_c.h b/src/eepp/helper/SDL2/src/thread/pthread/SDL_systhread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/pthread/SDL_systhread_c.h rename to src/eepp/helper/SDL2/src/thread/pthread/SDL_systhread_c.h diff --git a/src/helper/android/SDL2/src/thread/windows/SDL_sysmutex.c b/src/eepp/helper/SDL2/src/thread/windows/SDL_sysmutex.c similarity index 100% rename from src/helper/android/SDL2/src/thread/windows/SDL_sysmutex.c rename to src/eepp/helper/SDL2/src/thread/windows/SDL_sysmutex.c diff --git a/src/helper/android/SDL2/src/thread/windows/SDL_syssem.c b/src/eepp/helper/SDL2/src/thread/windows/SDL_syssem.c similarity index 100% rename from src/helper/android/SDL2/src/thread/windows/SDL_syssem.c rename to src/eepp/helper/SDL2/src/thread/windows/SDL_syssem.c diff --git a/src/helper/android/SDL2/src/thread/windows/SDL_systhread.c b/src/eepp/helper/SDL2/src/thread/windows/SDL_systhread.c similarity index 100% rename from src/helper/android/SDL2/src/thread/windows/SDL_systhread.c rename to src/eepp/helper/SDL2/src/thread/windows/SDL_systhread.c diff --git a/src/helper/android/SDL2/src/thread/windows/SDL_systhread_c.h b/src/eepp/helper/SDL2/src/thread/windows/SDL_systhread_c.h similarity index 100% rename from src/helper/android/SDL2/src/thread/windows/SDL_systhread_c.h rename to src/eepp/helper/SDL2/src/thread/windows/SDL_systhread_c.h diff --git a/src/helper/android/SDL2/src/thread/windows/win_ce_semaphore.c b/src/eepp/helper/SDL2/src/thread/windows/win_ce_semaphore.c similarity index 100% rename from src/helper/android/SDL2/src/thread/windows/win_ce_semaphore.c rename to src/eepp/helper/SDL2/src/thread/windows/win_ce_semaphore.c diff --git a/src/helper/android/SDL1.3/src/thread/windows/win_ce_semaphore.h b/src/eepp/helper/SDL2/src/thread/windows/win_ce_semaphore.h similarity index 100% rename from src/helper/android/SDL1.3/src/thread/windows/win_ce_semaphore.h rename to src/eepp/helper/SDL2/src/thread/windows/win_ce_semaphore.h diff --git a/src/helper/android/SDL2/src/timer/SDL_timer.c b/src/eepp/helper/SDL2/src/timer/SDL_timer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/SDL_timer.c rename to src/eepp/helper/SDL2/src/timer/SDL_timer.c diff --git a/src/helper/android/SDL2/src/timer/SDL_timer_c.h b/src/eepp/helper/SDL2/src/timer/SDL_timer_c.h similarity index 100% rename from src/helper/android/SDL2/src/timer/SDL_timer_c.h rename to src/eepp/helper/SDL2/src/timer/SDL_timer_c.h diff --git a/src/helper/android/SDL2/src/timer/beos/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/beos/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/beos/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/beos/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/timer/dummy/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/dummy/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/dummy/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/dummy/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/timer/nds/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/nds/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/nds/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/nds/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/timer/unix/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/unix/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/unix/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/unix/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/timer/wince/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/wince/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/wince/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/wince/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/timer/windows/SDL_systimer.c b/src/eepp/helper/SDL2/src/timer/windows/SDL_systimer.c similarity index 100% rename from src/helper/android/SDL2/src/timer/windows/SDL_systimer.c rename to src/eepp/helper/SDL2/src/timer/windows/SDL_systimer.c diff --git a/src/helper/android/SDL2/src/video/SDL_RLEaccel.c b/src/eepp/helper/SDL2/src/video/SDL_RLEaccel.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_RLEaccel.c rename to src/eepp/helper/SDL2/src/video/SDL_RLEaccel.c diff --git a/src/helper/android/SDL2/src/video/SDL_RLEaccel_c.h b/src/eepp/helper/SDL2/src/video/SDL_RLEaccel_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_RLEaccel_c.h rename to src/eepp/helper/SDL2/src/video/SDL_RLEaccel_c.h diff --git a/src/helper/android/SDL2/src/video/SDL_blit.c b/src/eepp/helper/SDL2/src/video/SDL_blit.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit.c rename to src/eepp/helper/SDL2/src/video/SDL_blit.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit.h b/src/eepp/helper/SDL2/src/video/SDL_blit.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit.h rename to src/eepp/helper/SDL2/src/video/SDL_blit.h diff --git a/src/helper/android/SDL2/src/video/SDL_blit_0.c b/src/eepp/helper/SDL2/src/video/SDL_blit_0.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_0.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_0.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit_1.c b/src/eepp/helper/SDL2/src/video/SDL_blit_1.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_1.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_1.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit_A.c b/src/eepp/helper/SDL2/src/video/SDL_blit_A.c similarity index 99% rename from src/helper/android/SDL2/src/video/SDL_blit_A.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_A.c index 9242be7f1..d8537ee74 100755 --- a/src/helper/android/SDL2/src/video/SDL_blit_A.c +++ b/src/eepp/helper/SDL2/src/video/SDL_blit_A.c @@ -424,7 +424,6 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info) #if HAVE_ALTIVEC_H #include #endif -#include #if (defined(__MACOSX__) && (__GNUC__ < 4)) #define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \ diff --git a/src/helper/android/SDL2/src/video/SDL_blit_N.c b/src/eepp/helper/SDL2/src/video/SDL_blit_N.c similarity index 99% rename from src/helper/android/SDL2/src/video/SDL_blit_N.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_N.c index b52e2fe50..a87df23ae 100755 --- a/src/helper/android/SDL2/src/video/SDL_blit_N.c +++ b/src/eepp/helper/SDL2/src/video/SDL_blit_N.c @@ -25,13 +25,14 @@ #include "SDL_cpuinfo.h" #include "SDL_blit.h" +#include "SDL_assert.h" + /* Functions to blit from N-bit surfaces to other surfaces */ #if SDL_ALTIVEC_BLITTERS #ifdef HAVE_ALTIVEC_H #include #endif -#define assert(X) #ifdef __MACOSX__ #include static size_t @@ -243,7 +244,7 @@ Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info) vsrc = voverflow; } - assert(width == 0); + SDL_assert(width == 0); /* do scalar until we can align... */ ONE_PIXEL_BLEND((extrawidth), extrawidth); @@ -312,9 +313,8 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) char) (vec_add((vector unsigned int) vgreen1, vec_sl(v8, v8)) ); - - assert(srcfmt->BytesPerPixel == 2); - assert(dstfmt->BytesPerPixel == 4); + SDL_assert(srcfmt->BytesPerPixel == 2); + SDL_assert(dstfmt->BytesPerPixel == 4); vf800 = (vector unsigned short) vec_splat_u8(-7); vf800 = vec_sl(vf800, vec_splat_u16(8)); @@ -390,7 +390,7 @@ Blit_RGB565_32Altivec(SDL_BlitInfo * info) vsrc = voverflow; } - assert(width == 0); + SDL_assert(width == 0); /* do scalar until we can align... */ @@ -460,9 +460,8 @@ Blit_RGB555_32Altivec(SDL_BlitInfo * info) char) (vec_add((vector unsigned int) vgreen1, vec_sl(v8, v8)) ); - - assert(srcfmt->BytesPerPixel == 2); - assert(dstfmt->BytesPerPixel == 4); + SDL_assert(srcfmt->BytesPerPixel == 2); + SDL_assert(dstfmt->BytesPerPixel == 4); vf800 = (vector unsigned short) vec_splat_u8(-7); vf800 = vec_sl(vf800, vec_splat_u16(8)); @@ -538,7 +537,7 @@ Blit_RGB555_32Altivec(SDL_BlitInfo * info) vsrc = voverflow; } - assert(width == 0); + SDL_assert(width == 0); /* do scalar until we can align... */ @@ -630,13 +629,13 @@ Blit32to32KeyAltivec(SDL_BlitInfo * info) } int width = info->dst_w; ONE_PIXEL_BLEND((UNALIGNED_PTR(dstp)) && (width), width); - assert(width > 0); + SDL_assert(width > 0); if (width > 0) { int extrawidth = (width % 4); vector unsigned char valigner = VEC_ALIGNER(srcp); vector unsigned int vs = vec_ld(0, srcp); width -= extrawidth; - assert(width >= 4); + SDL_assert(width >= 4); while (width) { vector unsigned char vsel; vector unsigned int vd; @@ -691,8 +690,8 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) } } - assert(srcfmt->BytesPerPixel == 4); - assert(dstfmt->BytesPerPixel == 4); + SDL_assert(srcfmt->BytesPerPixel == 4); + SDL_assert(dstfmt->BytesPerPixel == 4); while (height--) { vector unsigned char valigner; @@ -708,6 +707,8 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) while ((UNALIGNED_PTR(dst)) && (width)) { bits = *(src++); RGBA_FROM_8888(bits, srcfmt, r, g, b, a); + if(!srcfmt->Amask) + a = info->a; *(dst++) = MAKE8888(dstfmt, r, g, b, a); width--; } @@ -729,12 +730,14 @@ ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info) vbits = voverflow; } - assert(width == 0); + SDL_assert(width == 0); /* cover pixels at the end of the row that didn't fit in 16 bytes. */ while (extrawidth) { bits = *(src++); /* max 7 pixels, don't bother with prefetch. */ RGBA_FROM_8888(bits, srcfmt, r, g, b, a); + if(!srcfmt->Amask) + a = info->a; *(dst++) = MAKE8888(dstfmt, r, g, b, a); extrawidth--; } @@ -770,8 +773,8 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) } } - assert(srcfmt->BytesPerPixel == 4); - assert(dstfmt->BytesPerPixel == 4); + SDL_assert(srcfmt->BytesPerPixel == 4); + SDL_assert(dstfmt->BytesPerPixel == 4); while (height--) { vector unsigned char valigner; @@ -791,6 +794,8 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) DST_CHAN_DEST); bits = *(src++); RGBA_FROM_8888(bits, srcfmt, r, g, b, a); + if(!srcfmt->Amask) + a = info->a; *(dst++) = MAKE8888(dstfmt, r, g, b, a); width--; } @@ -816,12 +821,14 @@ ConvertAltivec32to32_prefetch(SDL_BlitInfo * info) vbits = voverflow; } - assert(width == 0); + SDL_assert(width == 0); /* cover pixels at the end of the row that didn't fit in 16 bytes. */ while (extrawidth) { bits = *(src++); /* max 7 pixels, don't bother with prefetch. */ RGBA_FROM_8888(bits, srcfmt, r, g, b, a); + if(!srcfmt->Amask) + a = info->a; *(dst++) = MAKE8888(dstfmt, r, g, b, a); extrawidth--; } diff --git a/src/helper/android/SDL2/src/video/SDL_blit_auto.c b/src/eepp/helper/SDL2/src/video/SDL_blit_auto.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_auto.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_auto.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit_auto.h b/src/eepp/helper/SDL2/src/video/SDL_blit_auto.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_auto.h rename to src/eepp/helper/SDL2/src/video/SDL_blit_auto.h diff --git a/src/helper/android/SDL2/src/video/SDL_blit_copy.c b/src/eepp/helper/SDL2/src/video/SDL_blit_copy.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_copy.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_copy.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit_copy.h b/src/eepp/helper/SDL2/src/video/SDL_blit_copy.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_copy.h rename to src/eepp/helper/SDL2/src/video/SDL_blit_copy.h diff --git a/src/helper/android/SDL2/src/video/SDL_blit_slow.c b/src/eepp/helper/SDL2/src/video/SDL_blit_slow.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_slow.c rename to src/eepp/helper/SDL2/src/video/SDL_blit_slow.c diff --git a/src/helper/android/SDL2/src/video/SDL_blit_slow.h b/src/eepp/helper/SDL2/src/video/SDL_blit_slow.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_blit_slow.h rename to src/eepp/helper/SDL2/src/video/SDL_blit_slow.h diff --git a/src/helper/android/SDL2/src/video/SDL_bmp.c b/src/eepp/helper/SDL2/src/video/SDL_bmp.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_bmp.c rename to src/eepp/helper/SDL2/src/video/SDL_bmp.c diff --git a/src/helper/android/SDL2/src/video/SDL_clipboard.c b/src/eepp/helper/SDL2/src/video/SDL_clipboard.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_clipboard.c rename to src/eepp/helper/SDL2/src/video/SDL_clipboard.c diff --git a/src/helper/android/SDL2/src/video/SDL_fillrect.c b/src/eepp/helper/SDL2/src/video/SDL_fillrect.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_fillrect.c rename to src/eepp/helper/SDL2/src/video/SDL_fillrect.c diff --git a/src/helper/android/SDL2/src/video/SDL_pixels.c b/src/eepp/helper/SDL2/src/video/SDL_pixels.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_pixels.c rename to src/eepp/helper/SDL2/src/video/SDL_pixels.c diff --git a/src/helper/android/SDL2/src/video/SDL_pixels_c.h b/src/eepp/helper/SDL2/src/video/SDL_pixels_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_pixels_c.h rename to src/eepp/helper/SDL2/src/video/SDL_pixels_c.h diff --git a/src/helper/android/SDL2/src/video/SDL_rect.c b/src/eepp/helper/SDL2/src/video/SDL_rect.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_rect.c rename to src/eepp/helper/SDL2/src/video/SDL_rect.c diff --git a/src/helper/android/SDL2/src/video/SDL_rect_c.h b/src/eepp/helper/SDL2/src/video/SDL_rect_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_rect_c.h rename to src/eepp/helper/SDL2/src/video/SDL_rect_c.h diff --git a/src/helper/android/SDL2/src/video/SDL_shape.c b/src/eepp/helper/SDL2/src/video/SDL_shape.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_shape.c rename to src/eepp/helper/SDL2/src/video/SDL_shape.c diff --git a/src/helper/android/SDL2/src/video/SDL_shape_internals.h b/src/eepp/helper/SDL2/src/video/SDL_shape_internals.h similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_shape_internals.h rename to src/eepp/helper/SDL2/src/video/SDL_shape_internals.h diff --git a/src/helper/android/SDL2/src/video/SDL_stretch.c b/src/eepp/helper/SDL2/src/video/SDL_stretch.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_stretch.c rename to src/eepp/helper/SDL2/src/video/SDL_stretch.c diff --git a/src/helper/android/SDL2/src/video/SDL_surface.c b/src/eepp/helper/SDL2/src/video/SDL_surface.c similarity index 100% rename from src/helper/android/SDL2/src/video/SDL_surface.c rename to src/eepp/helper/SDL2/src/video/SDL_surface.c diff --git a/src/helper/android/SDL2/src/video/SDL_sysvideo.h b/src/eepp/helper/SDL2/src/video/SDL_sysvideo.h similarity index 99% rename from src/helper/android/SDL2/src/video/SDL_sysvideo.h rename to src/eepp/helper/SDL2/src/video/SDL_sysvideo.h index c8344298e..679be4bf8 100755 --- a/src/helper/android/SDL2/src/video/SDL_sysvideo.h +++ b/src/eepp/helper/SDL2/src/video/SDL_sysvideo.h @@ -270,6 +270,8 @@ struct SDL_VideoDevice int accelerated; int major_version; int minor_version; + int flags; + int profile_mask; int retained_backing; int driver_loaded; char driver_path[256]; diff --git a/src/helper/android/SDL2/src/video/SDL_video.c b/src/eepp/helper/SDL2/src/video/SDL_video.c similarity index 99% rename from src/helper/android/SDL2/src/video/SDL_video.c rename to src/eepp/helper/SDL2/src/video/SDL_video.c index 92a5f034d..61941d3d2 100755 --- a/src/helper/android/SDL2/src/video/SDL_video.c +++ b/src/eepp/helper/SDL2/src/video/SDL_video.c @@ -500,6 +500,8 @@ SDL_VideoInit(const char *driver_name) _this->gl_config.major_version = 2; _this->gl_config.minor_version = 0; #endif + _this->gl_config.flags = 0; + _this->gl_config.profile_mask = 0; /* Initialize the video subsystem */ if (_this->VideoInit(_this) < 0) { @@ -2300,6 +2302,12 @@ SDL_GL_SetAttribute(SDL_GLattr attr, int value) case SDL_GL_CONTEXT_MINOR_VERSION: _this->gl_config.minor_version = value; break; + case SDL_GL_CONTEXT_FLAGS: + _this->gl_config.flags = value; + break; + case SDL_GL_CONTEXT_PROFILE_MASK: + _this->gl_config.profile_mask = value; + break; default: SDL_SetError("Unknown OpenGL attribute"); retval = -1; @@ -2446,6 +2454,16 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value) *value = _this->gl_config.minor_version; return 0; } + case SDL_GL_CONTEXT_FLAGS: + { + *value = _this->gl_config.flags; + return 0; + } + case SDL_GL_CONTEXT_PROFILE_MASK: + { + *value = _this->gl_config.profile_mask; + return 0; + } default: SDL_SetError("Unknown OpenGL attribute"); return -1; diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidevents.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidevents.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidevents.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidevents.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidevents.h b/src/eepp/helper/SDL2/src/video/android/SDL_androidevents.h similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidevents.h rename to src/eepp/helper/SDL2/src/video/android/SDL_androidevents.h diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidgl.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidgl.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidgl.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidgl.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidkeyboard.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidkeyboard.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidkeyboard.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidkeyboard.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidkeyboard.h b/src/eepp/helper/SDL2/src/video/android/SDL_androidkeyboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidkeyboard.h rename to src/eepp/helper/SDL2/src/video/android/SDL_androidkeyboard.h diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidtouch.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidtouch.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidtouch.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidtouch.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidtouch.h b/src/eepp/helper/SDL2/src/video/android/SDL_androidtouch.h similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidtouch.h rename to src/eepp/helper/SDL2/src/video/android/SDL_androidtouch.h diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidvideo.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidvideo.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidvideo.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidvideo.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidvideo.h b/src/eepp/helper/SDL2/src/video/android/SDL_androidvideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidvideo.h rename to src/eepp/helper/SDL2/src/video/android/SDL_androidvideo.h diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidwindow.c b/src/eepp/helper/SDL2/src/video/android/SDL_androidwindow.c similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidwindow.c rename to src/eepp/helper/SDL2/src/video/android/SDL_androidwindow.c diff --git a/src/helper/android/SDL2/src/video/android/SDL_androidwindow.h b/src/eepp/helper/SDL2/src/video/android/SDL_androidwindow.h similarity index 100% rename from src/helper/android/SDL2/src/video/android/SDL_androidwindow.h rename to src/eepp/helper/SDL2/src/video/android/SDL_androidwindow.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_BWin.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_BWin.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_BWin.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_BWin.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bclipboard.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bclipboard.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bclipboard.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bclipboard.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bclipboard.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bclipboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bclipboard.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bclipboard.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bevents.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bevents.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bevents.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bevents.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bevents.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bevents.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bevents.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bevents.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bframebuffer.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bframebuffer.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bframebuffer.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bframebuffer.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bframebuffer.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bframebuffer.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bframebuffer.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bframebuffer.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bkeyboard.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bkeyboard.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bkeyboard.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bkeyboard.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bkeyboard.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bkeyboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bkeyboard.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bkeyboard.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bmodes.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bmodes.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bmodes.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bmodes.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bmodes.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bmodes.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bmodes.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bmodes.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bopengl.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bopengl.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bopengl.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bopengl.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bopengl.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bopengl.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bopengl.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bopengl.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bvideo.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bvideo.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bvideo.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bvideo.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bvideo.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bvideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bvideo.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bvideo.h diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bwindow.cc b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bwindow.cc similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bwindow.cc rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bwindow.cc diff --git a/src/helper/android/SDL2/src/video/bwindow/SDL_bwindow.h b/src/eepp/helper/SDL2/src/video/bwindow/SDL_bwindow.h similarity index 100% rename from src/helper/android/SDL2/src/video/bwindow/SDL_bwindow.h rename to src/eepp/helper/SDL2/src/video/bwindow/SDL_bwindow.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaclipboard.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaclipboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaclipboard.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaclipboard.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaclipboard.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaclipboard.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaclipboard.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaclipboard.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaevents.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaevents.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaevents.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaevents.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaevents.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaevents.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaevents.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaevents.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoakeyboard.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoakeyboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoakeyboard.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoakeyboard.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoakeyboard.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoakeyboard.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoakeyboard.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoakeyboard.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoamodes.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamodes.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoamodes.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamodes.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoamodes.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamodes.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoamodes.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamodes.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoamouse.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamouse.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoamouse.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamouse.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoamouse.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamouse.m similarity index 94% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoamouse.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamouse.m index 6f9875175..67b805a95 100755 --- a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoamouse.m +++ b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoamouse.m @@ -92,15 +92,13 @@ Cocoa_ShowCursor(SDL_Cursor * cursor) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - if (SDL_GetMouseFocus()) { - if (cursor) { - NSCursor *nscursor = (NSCursor *)cursor->driverdata; + if (cursor) { + NSCursor *nscursor = (NSCursor *)cursor->driverdata; - [nscursor set]; - [NSCursor unhide]; - } else { - [NSCursor hide]; - } + [nscursor set]; + [NSCursor unhide]; + } else { + [NSCursor hide]; } [pool release]; diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaopengl.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaopengl.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaopengl.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaopengl.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoaopengl.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaopengl.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoaopengl.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoaopengl.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoashape.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoashape.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoashape.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoashape.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoashape.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoashape.m similarity index 97% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoashape.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoashape.m index da62f1ec2..afada6cc6 100755 --- a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoashape.m +++ b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoashape.m @@ -27,6 +27,7 @@ #include "SDL_shape.h" #include "SDL_cocoashape.h" #include "../SDL_sysvideo.h" +#include "SDL_assert.h" SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) { @@ -49,7 +50,7 @@ Cocoa_CreateShaper(SDL_Window* window) { data->shape = NULL; int resized_properly = Cocoa_ResizeWindowShape(window); - assert(resized_properly == 0); + SDL_assert(resized_properly == 0); return result; } @@ -100,7 +101,7 @@ Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShape int Cocoa_ResizeWindowShape(SDL_Window *window) { SDL_ShapeData* data = window->shaper->driverdata; - assert(data != NULL); + SDL_assert(data != NULL); return 0; } diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoavideo.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoavideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoavideo.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoavideo.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoavideo.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoavideo.m similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoavideo.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoavideo.m diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoawindow.h b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoawindow.h similarity index 100% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoawindow.h rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoawindow.h diff --git a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoawindow.m b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoawindow.m similarity index 99% rename from src/helper/android/SDL2/src/video/cocoa/SDL_cocoawindow.m rename to src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoawindow.m index b48de4f94..ef19ce002 100755 --- a/src/helper/android/SDL2/src/video/cocoa/SDL_cocoawindow.m +++ b/src/eepp/helper/SDL2/src/video/cocoa/SDL_cocoawindow.m @@ -313,9 +313,7 @@ static __inline__ void ConvertNSRect(NSRect *r) CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint); } else { SDL_SetMouseFocus(NULL); - - [[NSCursor arrowCursor] set]; - [NSCursor unhide]; + SDL_SetCursor(NULL); } } } diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_WM.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_WM.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_WM.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_WM.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_WM.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_WM.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_WM.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_WM.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_dyn.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_dyn.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_dyn.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_dyn.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_dyn.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_dyn.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_dyn.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_dyn.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_events.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_events.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_events.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_events.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_events.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_events.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_events.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_events.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_modes.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_modes.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_modes.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_modes.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_modes.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_modes.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_modes.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_modes.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_mouse.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_mouse.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_mouse.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_mouse.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_mouse.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_mouse.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_mouse.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_mouse.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_opengl.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_opengl.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_opengl.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_opengl.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_opengl.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_opengl.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_opengl.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_opengl.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_render.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_render.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_render.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_render.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_render.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_render.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_render.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_render.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_shape.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_shape.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_shape.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_shape.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_shape.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_shape.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_shape.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_shape.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_video.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_video.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_video.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_video.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_video.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_video.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_video.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_video.h diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_window.c b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_window.c similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_window.c rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_window.c diff --git a/src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_window.h b/src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_window.h similarity index 100% rename from src/helper/android/SDL2/src/video/directfb/SDL_DirectFB_window.h rename to src/eepp/helper/SDL2/src/video/directfb/SDL_DirectFB_window.h diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullevents.c b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullevents.c similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullevents.c rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullevents.c diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullevents_c.h b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullevents_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullevents_c.h rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullevents_c.h diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullframebuffer.c b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullframebuffer.c similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullframebuffer.c rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullframebuffer.c diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullframebuffer_c.h b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullframebuffer_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullframebuffer_c.h rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullframebuffer_c.h diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullvideo.c b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullvideo.c similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullvideo.c rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullvideo.c diff --git a/src/helper/android/SDL2/src/video/dummy/SDL_nullvideo.h b/src/eepp/helper/SDL2/src/video/dummy/SDL_nullvideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/dummy/SDL_nullvideo.h rename to src/eepp/helper/SDL2/src/video/dummy/SDL_nullvideo.h diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndsevents.c b/src/eepp/helper/SDL2/src/video/nds/SDL_ndsevents.c similarity index 100% rename from src/helper/android/SDL2/src/video/nds/SDL_ndsevents.c rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndsevents.c diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndsevents_c.h b/src/eepp/helper/SDL2/src/video/nds/SDL_ndsevents_c.h similarity index 100% rename from src/helper/android/SDL2/src/video/nds/SDL_ndsevents_c.h rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndsevents_c.h diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndsvideo.c b/src/eepp/helper/SDL2/src/video/nds/SDL_ndsvideo.c similarity index 99% rename from src/helper/android/SDL2/src/video/nds/SDL_ndsvideo.c rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndsvideo.c index 42ed5ccab..53ffbe413 100755 --- a/src/helper/android/SDL2/src/video/nds/SDL_ndsvideo.c +++ b/src/eepp/helper/SDL2/src/video/nds/SDL_ndsvideo.c @@ -28,12 +28,12 @@ #include #include #include -#include #include "SDL_video.h" #include "SDL_ndsvideo.h" #include "SDL_ndsevents_c.h" #include "../../render/SDL_sysrender.h" +#include "../../render/nds/SDL_libgl2D.h" #include "SDL_log.h" #define NDSVID_DRIVER_NAME "nds" diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndsvideo.h b/src/eepp/helper/SDL2/src/video/nds/SDL_ndsvideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/nds/SDL_ndsvideo.h rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndsvideo.h diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndswindow.c b/src/eepp/helper/SDL2/src/video/nds/SDL_ndswindow.c similarity index 100% rename from src/helper/android/SDL2/src/video/nds/SDL_ndswindow.c rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndswindow.c diff --git a/src/helper/android/SDL2/src/video/nds/SDL_ndswindow.h b/src/eepp/helper/SDL2/src/video/nds/SDL_ndswindow.h similarity index 100% rename from src/helper/android/SDL2/src/video/nds/SDL_ndswindow.h rename to src/eepp/helper/SDL2/src/video/nds/SDL_ndswindow.h diff --git a/src/helper/android/SDL2/src/video/pandora/SDL_pandora.c b/src/eepp/helper/SDL2/src/video/pandora/SDL_pandora.c similarity index 100% rename from src/helper/android/SDL2/src/video/pandora/SDL_pandora.c rename to src/eepp/helper/SDL2/src/video/pandora/SDL_pandora.c diff --git a/src/helper/android/SDL2/src/video/pandora/SDL_pandora.h b/src/eepp/helper/SDL2/src/video/pandora/SDL_pandora.h similarity index 100% rename from src/helper/android/SDL2/src/video/pandora/SDL_pandora.h rename to src/eepp/helper/SDL2/src/video/pandora/SDL_pandora.h diff --git a/src/helper/android/SDL2/src/video/pandora/SDL_pandora_events.c b/src/eepp/helper/SDL2/src/video/pandora/SDL_pandora_events.c similarity index 100% rename from src/helper/android/SDL2/src/video/pandora/SDL_pandora_events.c rename to src/eepp/helper/SDL2/src/video/pandora/SDL_pandora_events.c diff --git a/src/helper/android/SDL2/src/video/pandora/SDL_pandora_events.h b/src/eepp/helper/SDL2/src/video/pandora/SDL_pandora_events.h similarity index 100% rename from src/helper/android/SDL2/src/video/pandora/SDL_pandora_events.h rename to src/eepp/helper/SDL2/src/video/pandora/SDL_pandora_events.h diff --git a/src/helper/android/SDL2/src/video/sdlgenblit.pl b/src/eepp/helper/SDL2/src/video/sdlgenblit.pl similarity index 100% rename from src/helper/android/SDL2/src/video/sdlgenblit.pl rename to src/eepp/helper/SDL2/src/video/sdlgenblit.pl diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitappdelegate.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitappdelegate.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitappdelegate.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitappdelegate.h diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitappdelegate.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitappdelegate.m similarity index 99% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitappdelegate.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitappdelegate.m index 7dbee14ec..9c5440220 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitappdelegate.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitappdelegate.m @@ -29,7 +29,7 @@ #import "SDL_uikitappdelegate.h" #import "SDL_uikitopenglview.h" -#import "SDL_events_c.h" +#import "../../events/SDL_events_c.h" #import "jumphack.h" #ifdef main diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitevents.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitevents.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitevents.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitevents.h diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitevents.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitevents.m similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitevents.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitevents.m diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitkeyboard.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitkeyboard.h similarity index 82% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitkeyboard.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitkeyboard.h index 910e37a2d..5ed736173 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitkeyboard.h +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitkeyboard.h @@ -22,11 +22,25 @@ #ifndef sdl_uikitkeyboard_h #define sdl_uikitkeyboard_h +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif + extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardShow(SDL_Window * window); extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardHide(SDL_Window * window); extern DECLSPEC SDL_bool SDLCALL SDL_iPhoneKeyboardIsShown(SDL_Window * window); extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardToggle(SDL_Window * window); +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ #endif +#endif /* sdl_uikitkeyboard_h */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopengles.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopengles.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitopengles.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopengles.h diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopengles.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopengles.m similarity index 92% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitopengles.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopengles.m index 57b414290..f377b2b3c 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopengles.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopengles.m @@ -27,7 +27,7 @@ #include "SDL_uikitappdelegate.h" #include "SDL_uikitwindow.h" #include "jumphack.h" -#include "SDL_sysvideo.h" +#include "../SDL_sysvideo.h" #include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_mouse_c.h" #include "../../power/uikit/SDL_syspower.h" @@ -103,10 +103,14 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window) { SDL_uikitopenglview *view; SDL_WindowData *data = (SDL_WindowData *) window->driverdata; + SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); + SDL_DisplayData *displaydata = display->driverdata; + SDL_DisplayModeData *displaymodedata = display->current_mode.driverdata; UIWindow *uiwindow = data->uiwindow; /* construct our view, passing in SDL's OpenGL configuration data */ view = [[SDL_uikitopenglview alloc] initWithFrame: [uiwindow bounds] + scale: displaymodedata->scale retainBacking: _this->gl_config.retained_backing rBits: _this->gl_config.red_size gBits: _this->gl_config.green_size @@ -135,9 +139,10 @@ SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window) } /* Make this window the current mouse focus for touch input */ - /* !!! FIXME: only do this if this is the primary screen. */ - SDL_SetMouseFocus(window); - SDL_SetKeyboardFocus(window); + if (displaydata->uiscreen == [UIScreen mainScreen]) { + SDL_SetMouseFocus(window); + SDL_SetKeyboardFocus(window); + } return view; } diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.h similarity index 98% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.h index 61f7b2036..8c1ba3c84 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.h +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.h @@ -54,6 +54,7 @@ - (void)setCurrentContext; - (id)initWithFrame:(CGRect)frame + scale:(CGFloat)scale retainBacking:(BOOL)retained rBits:(int)rBits gBits:(int)gBits diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.m similarity index 97% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.m index 4f30dc980..d38b26c9b 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitopenglview.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitopenglview.m @@ -37,6 +37,7 @@ } - (id)initWithFrame:(CGRect)frame + scale:(CGFloat)scale retainBacking:(BOOL)retained rBits:(int)rBits gBits:(int)gBits @@ -79,10 +80,9 @@ return nil; } - // !!! FIXME: use the screen this is on! - /* Use the main screen scale (for retina display support) */ + /* Set the appropriate scale (for retina display support) */ if ([self respondsToSelector:@selector(contentScaleFactor)]) - self.contentScaleFactor = [UIScreen mainScreen].scale; + self.contentScaleFactor = scale; /* create the buffers */ glGenFramebuffersOES(1, &viewFramebuffer); diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11mouse.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.h similarity index 68% rename from src/helper/android/SDL2/src/video/x11/SDL_x11mouse.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.h index 9a44b2329..4f2cea35c 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11mouse.h +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.h @@ -18,29 +18,29 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#include "SDL_config.h" +#ifndef _SDL_uikitvideo_h +#define _SDL_uikitvideo_h -#ifndef _SDL_x11mouse_h -#define _SDL_x11mouse_h +#include -#if SDL_VIDEO_DRIVER_X11_XINPUT -typedef struct X11_MouseData +extern BOOL SDL_UIKit_supports_multiple_displays; + +typedef struct SDL_DisplayData SDL_DisplayData; + +struct SDL_DisplayData { - Display *display; - XDevice *device; - int motion; - int button_pressed; - int button_released; - int proximity_in; - int proximity_out; - int num_xevents; - XEventClass xevents[5]; -} X11_MouseData; -#endif + UIScreen *uiscreen; + CGFloat scale; +}; -extern void X11_InitMouse(_THIS); -extern void X11_QuitMouse(_THIS); +typedef struct SDL_DisplayModeData SDL_DisplayModeData; -#endif /* _SDL_x11mouse_h */ +struct SDL_DisplayModeData +{ + UIScreenMode *uiscreenmode; + CGFloat scale; +}; + +#endif /* _SDL_uikitvideo_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.m similarity index 56% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.m index cbba21dda..a08fee1c6 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitvideo.m @@ -120,79 +120,184 @@ The main screen should list a AxB mode for portrait orientation, and then */ -static void -UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) +static int +UIKit_AllocateDisplayModeData(SDL_DisplayMode * mode, + UIScreenMode * uiscreenmode, CGFloat scale) { - UIScreen *uiscreen = (UIScreen *) display->driverdata; - SDL_DisplayMode mode; - SDL_zero(mode); - - // availableModes showed up in 3.2 (the iPad and later). We should only - // land here for at least that version of the OS. - if (!SDL_UIKit_supports_multiple_displays) { - const CGRect rect = [uiscreen bounds]; - mode.format = SDL_PIXELFORMAT_ABGR8888; - mode.refresh_rate = 0; - mode.driverdata = NULL; - - mode.w = (int) rect.size.width; - mode.h = (int) rect.size.height; - SDL_AddDisplayMode(display, &mode); - - mode.w = (int) rect.size.height; // swap the orientation, add again. - mode.h = (int) rect.size.width; - SDL_AddDisplayMode(display, &mode); - return; - } - - for (UIScreenMode *uimode in [uiscreen availableModes]) { - CGSize size = [uimode size]; - mode.format = SDL_PIXELFORMAT_ABGR8888; - mode.refresh_rate = 0; - mode.driverdata = uimode; - mode.w = (int) size.width; - mode.h = (int) size.height; - if (SDL_AddDisplayMode(display, &mode)) - [uimode retain]; // retain is needed because of mode.driverdata - - if (uiscreen == [UIScreen mainScreen]) { - // Add the mode with swapped width/height - mode.w = (int) size.height; - mode.h = (int) size.width; - if (SDL_AddDisplayMode(display, &mode)) - [uimode retain]; + SDL_DisplayModeData *data = NULL; + + if (uiscreenmode != nil) { + /* Allocate the display mode data */ + data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data)); + if (!data) { + SDL_OutOfMemory(); + return -1; } + + data->uiscreenmode = uiscreenmode; + [data->uiscreenmode retain]; + + data->scale = scale; + } + + mode->driverdata = data; + + return 0; +} + +static void +UIKit_FreeDisplayModeData(SDL_DisplayMode * mode) +{ + if (!SDL_UIKit_supports_multiple_displays) { + // Not on at least iPhoneOS 3.2 (versions prior to iPad). + SDL_assert(mode->driverdata == NULL); + } else if (mode->driverdata != NULL) { + SDL_DisplayModeData *data = (SDL_DisplayModeData *)mode->driverdata; + [data->uiscreenmode release]; + SDL_free(data); + mode->driverdata = NULL; } } +static int +UIKit_AddSingleDisplayMode(SDL_VideoDisplay * display, int w, int h, + UIScreenMode * uiscreenmode, CGFloat scale) +{ + SDL_DisplayMode mode; + SDL_zero(mode); + + mode.format = SDL_PIXELFORMAT_ABGR8888; + mode.refresh_rate = 0; + if (UIKit_AllocateDisplayModeData(&mode, uiscreenmode, scale) < 0) { + return -1; + } + + mode.w = w; + mode.h = h; + if (SDL_AddDisplayMode(display, &mode)) { + return 0; + } + + // Failure case; free resources + SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode.driverdata; + + if (data != NULL) { + [data->uiscreenmode release]; + SDL_free(data); + } + + return -1; +} + +static int +UIKit_AddDisplayMode(SDL_VideoDisplay * display, int w, int h, CGFloat scale, + UIScreenMode * uiscreenmode, BOOL rotated) +{ + if (UIKit_AddSingleDisplayMode(display, w, h, uiscreenmode, scale) < 0) { + return -1; + } + + if (rotated) { + // Add the rotated version + if (UIKit_AddSingleDisplayMode(display, h, w, uiscreenmode, scale) < 0) { + return -1; + } + } + + return 0; +} static void -UIKit_AddDisplay(UIScreen *uiscreen, int w, int h) +UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display) { + SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; + + if (SDL_UIKit_supports_multiple_displays) { + // availableModes showed up in 3.2 (the iPad and later). We should only + // land here for at least that version of the OS. + for (UIScreenMode *uimode in [data->uiscreen availableModes]) { + BOOL mainscreen = (data->uiscreen == [UIScreen mainScreen]); + CGSize size = [uimode size]; + int w = (int)size.width; + int h = (int)size.height; + + // Add the native screen resolution. + UIKit_AddDisplayMode(display, w, h, data->scale, uimode, mainscreen); + + if (data->scale != 1.0f) { + // Add the native screen resolution divided by its scale. + // This is so devices capable of e.g. 640x960 also advertise + // 320x480. + UIKit_AddDisplayMode(display, + (int)(w / data->scale), (int)(h / data->scale), + 1.0f, uimode, mainscreen); + } + } + } else { + const CGRect rect = [data->uiscreen bounds]; + UIKit_AddDisplayMode(display, + (int)rect.size.width, (int)rect.size.height, + 1.0f, nil, YES); + } +} + + +static int +UIKit_AddDisplay(UIScreen *uiscreen, CGSize size) +{ + // When dealing with UIKit all coordinates are specified in terms of + // what Apple refers to as points. On earlier devices without the + // so called "Retina" display, there is a one to one mapping between + // points and pixels. In other cases [UIScreen scale] indicates the + // relationship between points and pixels. Since SDL has no notion + // of points, we must compensate in all cases where dealing with such + // units. + CGFloat scale; + if ([UIScreen instancesRespondToSelector:@selector(scale)]) { + scale = [uiscreen scale]; // iOS >= 4.0 + } else { + scale = 1.0f; // iOS < 4.0 + } + SDL_VideoDisplay display; SDL_DisplayMode mode; SDL_zero(mode); mode.format = SDL_PIXELFORMAT_ABGR8888; - mode.w = w; - mode.h = h; + mode.w = (int)(size.width * scale); + mode.h = (int)(size.height * scale); mode.refresh_rate = 0; - + + UIScreenMode * uiscreenmode = nil; // UIScreenMode showed up in 3.2 (the iPad and later). We're // misusing this supports_multiple_displays flag here for that. if (SDL_UIKit_supports_multiple_displays) { - UIScreenMode *uimode = [uiscreen currentMode]; - [uimode retain]; // once for the desktop_mode - [uimode retain]; // once for the current_mode - mode.driverdata = uimode; + uiscreenmode = [uiscreen currentMode]; + } + + if (UIKit_AllocateDisplayModeData(&mode, uiscreenmode, scale) < 0) { + return -1; } SDL_zero(display); display.desktop_mode = mode; display.current_mode = mode; + /* Allocate the display data */ + SDL_DisplayData *data = (SDL_DisplayData *) SDL_malloc(sizeof(*data)); + if (!data) { + SDL_OutOfMemory(); + UIKit_FreeDisplayModeData(&display.desktop_mode); + return -1; + } + [uiscreen retain]; - display.driverdata = uiscreen; + data->uiscreen = uiscreen; + data->scale = scale; + + display.driverdata = data; SDL_AddVideoDisplay(&display); + + return 0; } @@ -207,7 +312,10 @@ UIKit_VideoInit(_THIS) // Add the main screen. UIScreen *uiscreen = [UIScreen mainScreen]; const CGSize size = [uiscreen bounds].size; - UIKit_AddDisplay(uiscreen, (int)size.width, (int)size.height); + + if (UIKit_AddDisplay(uiscreen, size) < 0) { + return -1; + } // If this is iPhoneOS < 3.2, all devices are one screen, 320x480 pixels. // The iPad added both a larger main screen and the ability to use @@ -217,7 +325,9 @@ UIKit_VideoInit(_THIS) // Only add the other screens if (uiscreen != [UIScreen mainScreen]) { const CGSize size = [uiscreen bounds].size; - UIKit_AddDisplay(uiscreen, (int)size.width, (int)size.height); + if (UIKit_AddDisplay(uiscreen, size) < 0) { + return -1; + } } } } @@ -229,15 +339,15 @@ UIKit_VideoInit(_THIS) static int UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) { - UIScreen *uiscreen = (UIScreen *) display->driverdata; + SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; if (!SDL_UIKit_supports_multiple_displays) { // Not on at least iPhoneOS 3.2 (versions prior to iPad). SDL_assert(mode->driverdata == NULL); } else { - UIScreenMode *uimode = (UIScreenMode *) mode->driverdata; - [uiscreen setCurrentMode:uimode]; + SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)mode->driverdata; + [data->uiscreen setCurrentMode:modedata->uiscreenmode]; - CGSize size = [uimode size]; + CGSize size = [modedata->uiscreenmode size]; if (size.width >= size.height) { [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO]; } else { @@ -248,19 +358,6 @@ UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode) return 0; } -static void -UIKit_ReleaseUIScreenMode(SDL_DisplayMode * mode) -{ - if (!SDL_UIKit_supports_multiple_displays) { - // Not on at least iPhoneOS 3.2 (versions prior to iPad). - SDL_assert(mode->driverdata == NULL); - } else { - UIScreenMode *uimode = (UIScreenMode *) mode->driverdata; - [uimode release]; - mode->driverdata = NULL; - } -} - void UIKit_VideoQuit(_THIS) { @@ -268,14 +365,14 @@ UIKit_VideoQuit(_THIS) int i, j; for (i = 0; i < _this->num_displays; i++) { SDL_VideoDisplay *display = &_this->displays[i]; - UIScreen *uiscreen = (UIScreen *) display->driverdata; - [uiscreen release]; + SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; + [data->uiscreen release]; + SDL_free(data); display->driverdata = NULL; - UIKit_ReleaseUIScreenMode(&display->desktop_mode); - UIKit_ReleaseUIScreenMode(&display->current_mode); + UIKit_FreeDisplayModeData(&display->desktop_mode); for (j = 0; j < display->num_display_modes; j++) { SDL_DisplayMode *mode = &display->display_modes[j]; - UIKit_ReleaseUIScreenMode(mode); + UIKit_FreeDisplayModeData(mode); } } } diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitview.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitview.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitview.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitview.h diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitview.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitview.m similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitview.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitview.m diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitviewcontroller.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitviewcontroller.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitviewcontroller.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitviewcontroller.h diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitviewcontroller.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitviewcontroller.m similarity index 92% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitviewcontroller.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitviewcontroller.m index 6e43537da..7b452ed3b 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitviewcontroller.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitviewcontroller.m @@ -113,11 +113,10 @@ const UIInterfaceOrientation toInterfaceOrientation = [self interfaceOrientation]; SDL_WindowData *data = self->window->driverdata; UIWindow *uiwindow = data->uiwindow; - UIScreen *uiscreen; - if (SDL_UIKit_supports_multiple_displays) - uiscreen = [uiwindow screen]; - else - uiscreen = [UIScreen mainScreen]; + SDL_VideoDisplay *display = SDL_GetDisplayForWindow(self->window); + SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata; + SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata; + UIScreen *uiscreen = displaydata->uiscreen; const int noborder = (self->window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)); CGRect frame = noborder ? [uiscreen bounds] : [uiscreen applicationFrame]; const CGSize size = frame.size; @@ -141,6 +140,9 @@ return; } + w = (int)(w * displaymodedata->scale); + h = (int)(h * displaymodedata->scale); + [uiwindow setFrame:frame]; [data->view setFrame:frame]; [data->view updateFrame]; diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.h b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.h similarity index 98% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.h rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.h index c8c7a17df..99f6ed20e 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.h +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.h @@ -22,6 +22,7 @@ #define _SDL_uikitwindow_h #include "../SDL_sysvideo.h" +#import "SDL_uikitvideo.h" #import "SDL_uikitopenglview.h" #import "SDL_uikitviewcontroller.h" diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.m b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.m similarity index 80% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.m rename to src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.m index b444dfdcd..60037b518 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitwindow.m +++ b/src/eepp/helper/SDL2/src/video/uikit/SDL_uikitwindow.m @@ -46,7 +46,8 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created) { SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); - UIScreen *uiscreen = (UIScreen *) display->driverdata; + SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata; + SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata; SDL_WindowData *data; /* Allocate the window data */ @@ -64,24 +65,28 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bo window->x = 0; window->y = 0; + /* Get frame dimensions in pixels */ + int width = (int)(uiwindow.frame.size.width * displaymodedata->scale); + int height = (int)(uiwindow.frame.size.height * displaymodedata->scale); + /* We can pick either width or height here and we'll rotate the screen to match, so we pick the closest to what we wanted. */ if (window->w >= window->h) { if (uiwindow.frame.size.width > uiwindow.frame.size.height) { - window->w = (int)uiwindow.frame.size.width; - window->h = (int)uiwindow.frame.size.height; + window->w = width; + window->h = height; } else { - window->w = (int)uiwindow.frame.size.height; - window->h = (int)uiwindow.frame.size.width; + window->w = height; + window->h = width; } } else { if (uiwindow.frame.size.width > uiwindow.frame.size.height) { - window->w = (int)uiwindow.frame.size.height; - window->h = (int)uiwindow.frame.size.width; + window->w = height; + window->h = width; } else { - window->w = (int)uiwindow.frame.size.width; - window->h = (int)uiwindow.frame.size.height; + window->w = width; + window->h = height; } } } @@ -95,7 +100,7 @@ static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bo // SDL_WINDOW_BORDERLESS controls whether status bar is hidden. // This is only set if the window is on the main screen. Other screens // just force the window to have the borderless flag. - if ([UIScreen mainScreen] != uiscreen) { + if ([UIScreen mainScreen] != displaydata->uiscreen) { window->flags &= ~SDL_WINDOW_RESIZABLE; // window is NEVER resizeable window->flags &= ~SDL_WINDOW_INPUT_FOCUS; // never has input focus window->flags |= SDL_WINDOW_BORDERLESS; // never has a status bar. @@ -131,8 +136,8 @@ int UIKit_CreateWindow(_THIS, SDL_Window *window) { SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); - UIScreen *uiscreen = (UIScreen *) display->driverdata; - const BOOL external = ([UIScreen mainScreen] != uiscreen); + SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata; + const BOOL external = ([UIScreen mainScreen] != data->uiscreen); // SDL currently puts this window at the start of display's linked list. We rely on this. SDL_assert(_this->windows == window); @@ -154,7 +159,7 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) // user, so it's in standby), try to force the display to a resolution // that most closely matches the desired window size. if (SDL_UIKit_supports_multiple_displays) { - const CGSize origsize = [[uiscreen currentMode] size]; + const CGSize origsize = [[data->uiscreen currentMode] size]; if ((origsize.width == 0.0f) && (origsize.height == 0.0f)) { if (display->num_display_modes == 0) { _this->GetDisplayModes(_this, display); @@ -169,15 +174,13 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) } if (bestmode) { - UIScreenMode *uimode = (UIScreenMode *) bestmode->driverdata; - [uiscreen setCurrentMode:uimode]; + SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)bestmode->driverdata; + [data->uiscreen setCurrentMode:modedata->uiscreenmode]; // desktop_mode doesn't change here (the higher level will // use it to set all the screens back to their defaults // upon window destruction, SDL_Quit(), etc. - [((UIScreenMode *) display->current_mode.driverdata) release]; display->current_mode = *bestmode; - [((UIScreenMode *) display->current_mode.driverdata) retain]; } } } @@ -186,16 +189,16 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) // !!! FIXME: can we have a smaller view? UIWindow *uiwindow = [UIWindow alloc]; if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) - uiwindow = [uiwindow initWithFrame:[uiscreen bounds]]; + uiwindow = [uiwindow initWithFrame:[data->uiscreen bounds]]; else - uiwindow = [uiwindow initWithFrame:[uiscreen applicationFrame]]; + uiwindow = [uiwindow initWithFrame:[data->uiscreen applicationFrame]]; // put the window on an external display if appropriate. This implicitly // does [uiwindow setframe:[uiscreen bounds]], so don't do it on the // main display, where we land by default, as that would eat the // status bar real estate. if (external) { - [uiwindow setScreen:uiscreen]; + [uiwindow setScreen:data->uiscreen]; } if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) { @@ -210,35 +213,40 @@ UIKit_CreateWindow(_THIS, SDL_Window *window) void UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen) { - UIScreen *uiscreen = (UIScreen *) display->driverdata; + SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata; + SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata; UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow; if (fullscreen) { [UIApplication sharedApplication].statusBarHidden = YES; - uiwindow.frame = [uiscreen bounds]; + uiwindow.frame = [displaydata->uiscreen bounds]; } else { [UIApplication sharedApplication].statusBarHidden = NO; - uiwindow.frame = [uiscreen applicationFrame]; + uiwindow.frame = [displaydata->uiscreen applicationFrame]; } + /* Get frame dimensions in pixels */ + int width = (int)(uiwindow.frame.size.width * displaymodedata->scale); + int height = (int)(uiwindow.frame.size.height * displaymodedata->scale); + /* We can pick either width or height here and we'll rotate the screen to match, so we pick the closest to what we wanted. */ if (window->w >= window->h) { if (uiwindow.frame.size.width > uiwindow.frame.size.height) { - window->w = (int)uiwindow.frame.size.width; - window->h = (int)uiwindow.frame.size.height; + window->w = width; + window->h = height; } else { - window->w = (int)uiwindow.frame.size.height; - window->h = (int)uiwindow.frame.size.width; + window->w = height; + window->h = width; } } else { if (uiwindow.frame.size.width > uiwindow.frame.size.height) { - window->w = (int)uiwindow.frame.size.height; - window->h = (int)uiwindow.frame.size.width; + window->w = height; + window->h = width; } else { - window->w = (int)uiwindow.frame.size.width; - window->h = (int)uiwindow.frame.size.height; + window->w = width; + window->h = height; } } } diff --git a/src/helper/android/SDL1.3/src/video/uikit/jumphack.c b/src/eepp/helper/SDL2/src/video/uikit/jumphack.c similarity index 100% rename from src/helper/android/SDL1.3/src/video/uikit/jumphack.c rename to src/eepp/helper/SDL2/src/video/uikit/jumphack.c diff --git a/src/helper/android/SDL1.3/src/video/uikit/jumphack.h b/src/eepp/helper/SDL2/src/video/uikit/jumphack.h similarity index 100% rename from src/helper/android/SDL1.3/src/video/uikit/jumphack.h rename to src/eepp/helper/SDL2/src/video/uikit/jumphack.h diff --git a/src/helper/android/SDL2/src/video/uikit/keyinfotable.h b/src/eepp/helper/SDL2/src/video/uikit/keyinfotable.h similarity index 100% rename from src/helper/android/SDL2/src/video/uikit/keyinfotable.h rename to src/eepp/helper/SDL2/src/video/uikit/keyinfotable.h diff --git a/src/helper/android/SDL1.3/src/video/windows/SDL_msctf.h b/src/eepp/helper/SDL2/src/video/windows/SDL_msctf.h similarity index 100% rename from src/helper/android/SDL1.3/src/video/windows/SDL_msctf.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_msctf.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_vkeys.h b/src/eepp/helper/SDL2/src/video/windows/SDL_vkeys.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_vkeys.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_vkeys.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsclipboard.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsclipboard.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsclipboard.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsclipboard.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsclipboard.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsclipboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsclipboard.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsclipboard.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsevents.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsevents.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsevents.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsevents.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsevents.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsevents.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsevents.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsevents.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsframebuffer.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsframebuffer.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsframebuffer.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsframebuffer.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsframebuffer.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsframebuffer.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsframebuffer.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsframebuffer.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowskeyboard.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowskeyboard.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowskeyboard.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowskeyboard.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowskeyboard.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowskeyboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowskeyboard.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowskeyboard.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsmodes.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsmodes.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsmodes.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsmodes.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsmodes.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsmodes.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsmodes.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsmodes.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsmouse.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsmouse.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsmouse.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsmouse.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsmouse.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsmouse.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsmouse.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsmouse.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsopengl.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsopengl.c similarity index 91% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsopengl.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsopengl.c index 439234370..5674d903b 100755 --- a/src/helper/android/SDL2/src/video/windows/SDL_windowsopengl.c +++ b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsopengl.c @@ -39,6 +39,26 @@ #define WGL_CONTEXT_FLAGS_ARB 0x2093 #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 + +#ifndef WGL_ARB_create_context_profile +#define WGL_ARB_create_context_profile +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#endif + +#ifndef WGL_ARB_create_context_robustness +#define WGL_ARB_create_context_robustness +#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 +#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#endif +#endif + +#ifndef WGL_EXT_create_context_es2_profile +#define WGL_EXT_create_context_es2_profile +#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 #endif typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, @@ -398,7 +418,7 @@ WIN_GL_SetupWindow(_THIS, SDL_Window * window) { HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc; PIXELFORMATDESCRIPTOR pfd; - int pixel_format; + int pixel_format = 0; int iAttribs[64]; int *iAttr; float fAttribs[1] = { 0 }; @@ -468,16 +488,19 @@ WIN_GL_SetupWindow(_THIS, SDL_Window * window) *iAttr++ = _this->gl_config.multisamplesamples; } - if (_this->gl_config.accelerated >= 0) { - *iAttr++ = WGL_ACCELERATION_ARB; - *iAttr++ = (_this->gl_config.accelerated ? WGL_FULL_ACCELERATION_ARB : - WGL_NO_ACCELERATION_ARB); - } + *iAttr++ = WGL_ACCELERATION_ARB; + *iAttr++ = WGL_FULL_ACCELERATION_ARB; *iAttr = 0; /* Choose and set the closest available pixel format */ - pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs); + if (_this->gl_config.accelerated != 0) { + pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs); + } + if (!pixel_format && _this->gl_config.accelerated != 1) { + iAttr[-1] = WGL_NO_ACCELERATION_ARB; + pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs); + } if (!pixel_format) { pixel_format = WIN_GL_ChoosePixelFormat(hdc, &pfd); } @@ -521,11 +544,28 @@ WIN_GL_CreateContext(_THIS, SDL_Window * window) SDL_SetError("GL 3.x is not supported"); context = temp_context; } else { - int attribs[] = { + /* max 8 attributes plus terminator */ + int attribs[9] = { WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, 0 }; + int iattr = 4; + + /* SDL profile bits match WGL profile bits */ + if( _this->gl_config.profile_mask != 0 ) { + attribs[iattr++] = WGL_CONTEXT_PROFILE_MASK_ARB; + attribs[iattr++] = _this->gl_config.profile_mask; + } + + /* SDL flags match WGL flags */ + if( _this->gl_config.flags != 0 ) { + attribs[iattr++] = WGL_CONTEXT_FLAGS_ARB; + attribs[iattr++] = _this->gl_config.flags; + } + + attribs[iattr++] = 0; + /* Create the GL 3.x context */ context = wglCreateContextAttribsARB(hdc, 0, attribs); /* Delete the GL 2.x context */ diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsopengl.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsopengl.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsopengl.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsopengl.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsshape.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsshape.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsshape.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsshape.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsshape.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsshape.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsshape.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsshape.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsvideo.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsvideo.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsvideo.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsvideo.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowsvideo.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowsvideo.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowsvideo.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowsvideo.h diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowswindow.c b/src/eepp/helper/SDL2/src/video/windows/SDL_windowswindow.c similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowswindow.c rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowswindow.c diff --git a/src/helper/android/SDL2/src/video/windows/SDL_windowswindow.h b/src/eepp/helper/SDL2/src/video/windows/SDL_windowswindow.h similarity index 100% rename from src/helper/android/SDL2/src/video/windows/SDL_windowswindow.h rename to src/eepp/helper/SDL2/src/video/windows/SDL_windowswindow.h diff --git a/src/helper/android/SDL1.3/src/video/windows/wmmsg.h b/src/eepp/helper/SDL2/src/video/windows/wmmsg.h similarity index 100% rename from src/helper/android/SDL1.3/src/video/windows/wmmsg.h rename to src/eepp/helper/SDL2/src/video/windows/wmmsg.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11clipboard.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11clipboard.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11clipboard.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11clipboard.c diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11clipboard.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11clipboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11clipboard.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11clipboard.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11dyn.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.c similarity index 97% rename from src/helper/android/SDL2/src/video/x11/SDL_x11dyn.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.c index 631e15e54..2ec9b7d9c 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11dyn.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.c @@ -53,8 +53,8 @@ typedef struct #ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA NULL #endif -#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT NULL +#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 NULL #endif #ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR NULL @@ -71,7 +71,7 @@ static x11dynlib x11libs[] = { {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT}, {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR}, {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA}, - {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT}, + {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2}, {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR}, {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS}, {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE} diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11dyn.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.h similarity index 95% rename from src/helper/android/SDL2/src/video/x11/SDL_x11dyn.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.h index 04d810462..5d2d9da16 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11dyn.h +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11dyn.h @@ -27,6 +27,10 @@ #include #include +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM +#include +#endif + /* Apparently some X11 systems can't include this multiple times... */ #ifndef SDL_INCLUDED_XLIBINT_H #define SDL_INCLUDED_XLIBINT_H 1 @@ -49,8 +53,8 @@ #if SDL_VIDEO_DRIVER_X11_XINERAMA #include #endif -#if SDL_VIDEO_DRIVER_X11_XINPUT -#include +#if SDL_VIDEO_DRIVER_X11_XINPUT2 +#include #endif #if SDL_VIDEO_DRIVER_X11_XRANDR #include diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11events.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11events.c similarity index 94% rename from src/helper/android/SDL2/src/video/x11/SDL_x11events.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11events.c index 4f52c6093..a85622d2a 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11events.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11events.c @@ -30,6 +30,7 @@ #include "SDL_x11video.h" #include "SDL_x11touch.h" +#include "SDL_x11xinput2.h" #include "../../events/SDL_events_c.h" #include "../../events/SDL_mouse_c.h" #include "../../events/SDL_touch_c.h" @@ -44,7 +45,6 @@ #include #include #endif -/*#define DEBUG_XEVENTS*/ /* Check to see if this is a repeated key. (idea shamelessly lifted from GII -- thanks guys! :) @@ -95,6 +95,19 @@ static SDL_bool X11_IsWheelEvent(Display * display,XEvent * event,int * ticks) return SDL_FALSE; } + +#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS +static void X11_HandleGenericEvent(SDL_VideoData *videodata,XEvent event) +{ + XGenericEventCookie *cookie = &event.xcookie; + XGetEventData(videodata->display, cookie); + X11_HandleXinput2Event(videodata,cookie); + XFreeEventData(videodata->display,cookie); +} +#endif /* SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS */ + + + static void X11_DispatchEvent(_THIS) { @@ -127,6 +140,13 @@ X11_DispatchEvent(_THIS) SDL_SendSysWMEvent(&wmmsg); } +#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS + if(xevent.type == GenericEvent) { + X11_HandleGenericEvent(videodata,xevent); + return; + } +#endif + data = NULL; if (videodata && videodata->windowlist) { for (i = 0; i < videodata->numwindows; ++i) { @@ -245,7 +265,11 @@ X11_DispatchEvent(_THIS) if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN) { int min_keycode, max_keycode; XDisplayKeycodes(display, &min_keycode, &max_keycode); +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + keysym = XkbKeycodeToKeysym(display, keycode, 0, 0); +#else keysym = XKeycodeToKeysym(display, keycode, 0); +#endif fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n", keycode, keycode - min_keycode, keysym, @@ -337,10 +361,14 @@ X11_DispatchEvent(_THIS) break; case MotionNotify:{ + SDL_Mouse *mouse = SDL_GetMouse(); + if(!mouse->relative_mode) { #ifdef DEBUG_MOTION - printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y); + printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y); #endif - SDL_SendMouseMotion(data->window, 0, xevent.xmotion.x, xevent.xmotion.y); + + SDL_SendMouseMotion(data->window, 0, xevent.xmotion.x, xevent.xmotion.y); + } } break; @@ -539,15 +567,19 @@ X11_PumpEvents(_THIS) XResetScreenSaver(data->display); data->screensaver_activity = now; } - } + } /* Keep processing pending events */ while (X11_Pending(data->display)) { X11_DispatchEvent(_this); } + /*Dont process evtouch events if XInput2 multitouch is supported*/ + if(X11_Xinput2IsMutitouchSupported()) { + return; + } #ifdef SDL_INPUT_LINUXEV - /* Process Touch events - TODO When X gets touch support, use that instead*/ + /* Process Touch events*/ int i = 0,rd; struct input_event ev[64]; int size = sizeof (struct input_event); diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11events.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11events.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11events.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11events.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11framebuffer.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11framebuffer.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11framebuffer.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11framebuffer.c diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11framebuffer.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11framebuffer.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11framebuffer.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11framebuffer.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11keyboard.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11keyboard.c similarity index 97% rename from src/helper/android/SDL2/src/video/x11/SDL_x11keyboard.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11keyboard.c index 3ed61e963..142b96baf 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11keyboard.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11keyboard.c @@ -151,7 +151,11 @@ X11_KeyCodeToSDLKey(Display *display, KeyCode keycode) unsigned int ucs4; int i; +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + keysym = XkbKeycodeToKeysym(display, keycode, 0, 0); +#else keysym = XKeycodeToKeysym(display, keycode, 0); +#endif if (keysym == NoSymbol) { return SDLK_UNKNOWN; } @@ -232,7 +236,11 @@ X11_InitKeyboard(_THIS) SDL_GetDefaultKeymap(keymap); for (i = min_keycode; i <= max_keycode; ++i) { KeySym sym; +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + sym = XkbKeycodeToKeysym(data->display, i, 0, 0); +#else sym = XKeycodeToKeysym(data->display, i, 0); +#endif if (sym != NoSymbol) { SDL_Keycode key; printf("code = %d, sym = 0x%X (%s) ", i - min_keycode, diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11keyboard.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11keyboard.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11keyboard.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11keyboard.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11modes.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11modes.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11modes.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11modes.c diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11modes.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11modes.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11modes.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11modes.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11mouse.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.c similarity index 98% rename from src/helper/android/SDL2/src/video/x11/SDL_x11mouse.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.c index 253d505e8..d9454bd8a 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11mouse.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.c @@ -25,6 +25,7 @@ #include "SDL_assert.h" #include "SDL_x11video.h" #include "SDL_x11mouse.h" +#include "SDL_x11xinput2.h" #include "../../events/SDL_mouse_c.h" @@ -272,7 +273,12 @@ X11_WarpMouse(SDL_Window * window, int x, int y) static int X11_SetRelativeMouseMode(SDL_bool enabled) { +#if SDL_VIDEO_DRIVER_X11_XINPUT2 + if(X11_Xinput2IsInitialized()) + return 0; +#else SDL_Unsupported(); +#endif return -1; } diff --git a/src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.h similarity index 85% rename from src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.h index d678daeee..0187fb7ed 100755 --- a/src/helper/android/SDL2/src/video/uikit/SDL_uikitvideo.h +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11mouse.h @@ -18,13 +18,14 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#ifndef _SDL_uikitvideo_h -#define _SDL_uikitvideo_h +#include "SDL_config.h" -#include +#ifndef _SDL_x11mouse_h +#define _SDL_x11mouse_h -extern BOOL SDL_UIKit_supports_multiple_displays; +extern void X11_InitMouse(_THIS); +extern void X11_QuitMouse(_THIS); -#endif /* _SDL_uikitvideo_h */ +#endif /* _SDL_x11mouse_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11opengl.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11opengl.c similarity index 91% rename from src/helper/android/SDL2/src/video/x11/SDL_x11opengl.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11opengl.c index f3875f0c5..90b1e73b9 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11opengl.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11opengl.c @@ -67,11 +67,6 @@ #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 -#ifndef GLX_EXT_swap_control -#define GLX_SWAP_INTERVAL_EXT 0x20F1 -#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2 -#endif - /* Typedef for the GL 3.0 context creation function */ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy, GLXFBConfig config, @@ -80,6 +75,31 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy, Bool direct, const int *attrib_list); + +#ifndef GLX_ARB_create_context_profile +#define GLX_ARB_create_context_profile +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#endif + +#ifndef GLX_ARB_create_context_robustness +#define GLX_ARB_create_context_robustness +#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 +#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 +#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261 +#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252 +#endif +#endif + +#ifndef GLX_EXT_create_context_es2_profile +#define GLX_EXT_create_context_es2_profile +#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000002 +#endif + +#ifndef GLX_EXT_swap_control +#define GLX_SWAP_INTERVAL_EXT 0x20F1 +#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2 #endif #define OPENGL_REQUIRES_DLOPEN @@ -305,16 +325,24 @@ X11_GL_InitExtensions(_THIS) X11_PumpEvents(_this); } +/* glXChooseVisual and glXChooseFBConfig have some small differences in + * the attribute encoding, it can be chosen with the for_FBConfig parameter. + */ int -X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size) +X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size, Bool for_FBConfig) { int i = 0; /* assert buffer is large enough to hold all SDL attributes. */ - /* assert(size >= 32);*/ + SDL_assert(size >= 32); /* Setup our GLX attributes according to the gl_config. */ - attribs[i++] = GLX_RGBA; + if( for_FBConfig ) { + attribs[i++] = GLX_RENDER_TYPE; + attribs[i++] = GLX_RGBA_BIT; + } else { + attribs[i++] = GLX_RGBA; + } attribs[i++] = GLX_RED_SIZE; attribs[i++] = _this->gl_config.red_size; attribs[i++] = GLX_GREEN_SIZE; @@ -327,13 +355,10 @@ X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int si attribs[i++] = _this->gl_config.alpha_size; } - if (_this->gl_config.buffer_size) { - attribs[i++] = GLX_BUFFER_SIZE; - attribs[i++] = _this->gl_config.buffer_size; - } - if (_this->gl_config.double_buffer) { attribs[i++] = GLX_DOUBLEBUFFER; + if( for_FBConfig ) + attribs[i++] = True; } attribs[i++] = GLX_DEPTH_SIZE; @@ -366,6 +391,8 @@ X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int si if (_this->gl_config.stereo) { attribs[i++] = GLX_STEREO; + if( for_FBConfig ) + attribs[i++] = True; } if (_this->gl_config.multisamplebuffers) { @@ -396,10 +423,8 @@ X11_GL_GetVisual(_THIS, Display * display, int screen) XVisualInfo *vinfo; /* 64 seems nice. */ - const int max_attrs = 64; - int attribs[max_attrs]; - const int i = X11_GL_GetAttributes(_this,display,screen,attribs,max_attrs); - SDL_assert(i <= max_attrs); + int attribs[64]; + int i = X11_GL_GetAttributes(_this,display,screen,attribs,64,SDL_FALSE); if (!_this->gl_data) { /* The OpenGL library wasn't loaded, SDL_GetError() should have info */ @@ -444,13 +469,29 @@ X11_GL_CreateContext(_THIS, SDL_Window * window) SDL_SetError("Could not create GL context"); return NULL; } else { - int attribs[] = { + /* max 8 attributes plus terminator */ + int attribs[9] = { GLX_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version, GLX_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version, 0 }; + int iattr = 4; + + /* SDL profile bits match GLX profile bits */ + if( _this->gl_config.profile_mask != 0 ) { + attribs[iattr++] = GLX_CONTEXT_PROFILE_MASK_ARB; + attribs[iattr++] = _this->gl_config.profile_mask; + } + + /* SDL flags match GLX flags */ + if( _this->gl_config.flags != 0 ) { + attribs[iattr++] = GLX_CONTEXT_FLAGS_ARB; + attribs[iattr++] = _this->gl_config.flags; + } + + attribs[iattr++] = 0; /* Get a pointer to the context creation function for GL 3.0 */ PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = @@ -477,7 +518,7 @@ X11_GL_CreateContext(_THIS, SDL_Window * window) int *)) _this->gl_data-> glXGetProcAddress((GLubyte *) "glXChooseFBConfig"); - X11_GL_GetAttributes(_this,display,screen,glxAttribs,64); + X11_GL_GetAttributes(_this,display,screen,glxAttribs,64,SDL_TRUE); if (!glXChooseFBConfig || !(framebuffer_config = diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11opengl.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11opengl.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11opengl.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11opengl.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11opengles.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11opengles.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11opengles.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11opengles.c diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11opengles.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11opengles.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11opengles.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11opengles.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11shape.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11shape.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11shape.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11shape.c diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11shape.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11shape.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11shape.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11shape.h diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11sym.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11sym.h similarity index 92% rename from src/helper/android/SDL2/src/video/x11/SDL_x11sym.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11sym.h index a8cc2bd56..1e2a6f223 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11sym.h +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11sym.h @@ -103,7 +103,11 @@ SDL_X11_SYM(int,XUngrabServer,(Display* a),(a),return) SDL_X11_SYM(int,XUnmapWindow,(Display* a,Window b),(a,b),return) SDL_X11_SYM(int,XWarpPointer,(Display* a,Window b,Window c,int d,int e,unsigned int f,unsigned int g,int h,int i),(a,b,c,d,e,f,g,h,i),return) SDL_X11_SYM(VisualID,XVisualIDFromVisual,(Visual* a),(a),return) +#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY +SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return) +#else SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return) +#endif SDL_X11_SYM(XExtensionInfo*,XextCreateExtension,(void),(),return) SDL_X11_SYM(void,XextDestroyExtension,(XExtensionInfo* a),(a),) SDL_X11_SYM(XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo* a,Display* b),(a,b),return) @@ -122,10 +126,19 @@ SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display* a,xGenericReply* b),(a, SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return) SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return) SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return) -SDL_X11_SYM(XClassHint*,XAllocClassHint,(void),(),return) -SDL_X11_SYM(XWMHints*,XAllocWMHints,(void),(),return) -SDL_X11_SYM(int,XSetClassHint,(Display* a,Window b,XClassHint* c),(a,b,c),return) -SDL_X11_SYM(int,XSetWMHints,(Display* a,Window b,XWMHints* c),(a,b,c),return) + +#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS +SDL_X11_SYM(Bool,XGetEventData,(Display* a,XGenericEventCookie* b),(a,b),return) +SDL_X11_SYM(void,XFreeEventData,(Display* a,XGenericEventCookie* b),(a,b),) +#endif + +#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM +#if NeedWidePrototypes +SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,unsigned int b,int c,int d),(a,b,c,d),return) +#else +SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,KeyCode b,int c,int d),(a,b,c,d),return) +#endif +#endif #if NeedWidePrototypes SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return) @@ -194,14 +207,14 @@ SDL_X11_SYM(Status,XineramaQueryVersion,(Display *a,int *b,int *c),(a,b,c),retur SDL_X11_SYM(XineramaScreenInfo*,XineramaQueryScreens,(Display *a, int *b),(a,b),return) #endif -/* XInput support for multiple mice, tablets, etc. */ -#if SDL_VIDEO_DRIVER_X11_XINPUT -SDL_X11_MODULE(XINPUT) -SDL_X11_SYM(XDeviceInfo*,XListInputDevices,(Display *a,int *b),(a,b),return) -SDL_X11_SYM(void,XFreeDeviceList,(XDeviceInfo *a),(a),) -SDL_X11_SYM(int,XSelectExtensionEvent,(Display *a,Window b,XEventClass *c,int d),(a,b,c,d),return) -SDL_X11_SYM(XDevice*,XOpenDevice,(Display *a,XID b),(a,b),return) -SDL_X11_SYM(int,XCloseDevice,(Display* a,XDevice* b),(a,b),return) +/* XInput2 support for multiple mice, tablets, etc. */ +#if SDL_VIDEO_DRIVER_X11_XINPUT2 +SDL_X11_MODULE(XINPUT2) +SDL_X11_SYM(XIDeviceInfo*,XIQueryDevice,(Display *a,int b,int *c),(a,b,c),return) +SDL_X11_SYM(void,XIFreeDeviceInfo,(XIDeviceInfo *a),(a),) +SDL_X11_SYM(int,XISelectEvents,(Display *a,Window b,XIEventMask *c,int d),(a,b,c,d),return) +SDL_X11_SYM(Status,XIQueryVersion,(Display *a,int *b,int *c),(a,b,c),return) +SDL_X11_SYM(XIEventMask*,XIGetSelectedEvents,(Display *a,Window b,int *c),(a,b,c),return) #endif /* XRandR support */ diff --git a/src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.c new file mode 100755 index 000000000..ddef89a66 --- /dev/null +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.c @@ -0,0 +1,131 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2012 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. +*/ +#include "SDL_config.h" + +#if SDL_VIDEO_DRIVER_X11 + +#include "SDL_x11video.h" +#include "SDL_x11touch.h" +#include "SDL_x11xinput2.h" +#include "../../events/SDL_touch_c.h" + + +#ifdef SDL_INPUT_LINUXEV +#include +#include +#endif + +void +X11_InitTouch(_THIS) +{ + /*Initilized Xinput2 multitouch + * and return in order to not initialize + * evtouch also*/ + if(X11_Xinput2IsMutitouchSupported()) { + X11_InitXinput2Multitouch(_this); + return; + } +#ifdef SDL_INPUT_LINUXEV + FILE *fd; + fd = fopen("/proc/bus/input/devices","r"); + + int i = 0; + int tsfd; + char line[256]; + char tstr[256]; + int vendor = -1,product = -1,event = -1; + while(!feof(fd)) { + if(fgets(line,256,fd) <=0) continue; + if(line[0] == '\n') { + if(vendor == 1386 || vendor==1) { + sprintf(tstr,"/dev/input/event%i",event); + + tsfd = open( tstr, O_RDONLY | O_NONBLOCK ); + if ( tsfd == -1 ) + continue; /* Maybe not enough permissions ? */ + + SDL_Touch touch; + touch.pressure_max = 0; + touch.pressure_min = 0; + touch.id = event; + + touch.driverdata = SDL_malloc(sizeof(EventTouchData)); + EventTouchData* data = (EventTouchData*)(touch.driverdata); + + data->x = -1; + data->y = -1; + data->pressure = -1; + data->finger = 0; + data->up = SDL_FALSE; + data->down = SDL_FALSE; + + data->eventStream = tsfd; + ioctl (data->eventStream, EVIOCGNAME (sizeof (tstr)), tstr); + + int abs[5]; + ioctl(data->eventStream,EVIOCGABS(0),abs); + touch.x_min = abs[1]; + touch.x_max = abs[2]; + touch.native_xres = touch.x_max - touch.x_min; + ioctl(data->eventStream,EVIOCGABS(ABS_Y),abs); + touch.y_min = abs[1]; + touch.y_max = abs[2]; + touch.native_yres = touch.y_max - touch.y_min; + ioctl(data->eventStream,EVIOCGABS(ABS_PRESSURE),abs); + touch.pressure_min = abs[1]; + touch.pressure_max = abs[2]; + touch.native_pressureres = touch.pressure_max - touch.pressure_min; + + SDL_AddTouch(&touch, tstr); + } + vendor = -1; + product = -1; + event = -1; + } + else if(line[0] == 'I') { + i = 1; + while(line[i]) { + sscanf(&line[i],"Vendor=%x",&vendor); + sscanf(&line[i],"Product=%x",&product); + i++; + } + } + else if(line[0] == 'H') { + i = 1; + while(line[i]) { + sscanf(&line[i],"event%d",&event); + i++; + } + } + } + fclose(fd); +#endif +} + +void +X11_QuitTouch(_THIS) +{ + SDL_TouchQuit(); +} + +#endif /* SDL_VIDEO_DRIVER_X11 */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11touch.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.h similarity index 91% rename from src/helper/android/SDL2/src/video/x11/SDL_x11touch.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.h index b4d39431e..8fe20e5b0 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11touch.h +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11touch.h @@ -23,12 +23,6 @@ #ifndef _SDL_x11touch_h #define _SDL_x11touch_h -/* -!!! FIXME: remove the evdev code; -!!! FIXME: this should be using XInput 2.1's new multitouch API. -*/ - -/* What should this be? */ #ifdef SDL_INPUT_LINUXEV typedef struct EventTouchData { diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11video.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11video.c similarity index 99% rename from src/helper/android/SDL2/src/video/x11/SDL_x11video.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11video.c index 254714fd6..690fd6d0a 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11video.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11video.c @@ -33,6 +33,7 @@ #include "SDL_x11framebuffer.h" #include "SDL_x11shape.h" #include "SDL_x11touch.h" +#include "SDL_x11xinput2.h" #if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 #include "SDL_x11opengles.h" @@ -359,6 +360,8 @@ X11_VideoInit(_THIS) return -1; } + X11_InitXinput2(_this); + if (X11_InitKeyboard(_this) != 0) { return -1; } diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11video.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11video.h similarity index 96% rename from src/helper/android/SDL2/src/video/x11/SDL_x11video.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11video.h index 9a7ca5474..59234296f 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11video.h +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11video.h @@ -37,8 +37,8 @@ #if SDL_VIDEO_DRIVER_X11_XINERAMA #include #endif -#if SDL_VIDEO_DRIVER_X11_XINPUT -#include +#if SDL_VIDEO_DRIVER_X11_XINPUT2 +#include #endif #if SDL_VIDEO_DRIVER_X11_XRANDR #include @@ -92,7 +92,7 @@ typedef struct SDL_VideoData Atom UTF8_STRING; SDL_Scancode key_layout[256]; - SDL_bool selection_waiting; + SDL_bool selection_waiting; } SDL_VideoData; extern SDL_bool X11_UseDirectColorVisuals(void); diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11window.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11window.c similarity index 96% rename from src/helper/android/SDL2/src/video/x11/SDL_x11window.c rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11window.c index edd5ac702..ece345a24 100755 --- a/src/helper/android/SDL2/src/video/x11/SDL_x11window.c +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11window.c @@ -30,6 +30,7 @@ #include "SDL_x11video.h" #include "SDL_x11mouse.h" #include "SDL_x11shape.h" +#include "SDL_x11xinput2.h" #if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 #include "SDL_x11opengles.h" @@ -258,9 +259,9 @@ X11_CreateWindow(_THIS, SDL_Window * window) int depth; XSetWindowAttributes xattr; Window w; - XSizeHints * sizehints; - XWMHints * wmhints; - XClassHint * classhints; + XSizeHints sizehints; + XWMHints wmhints; + XClassHint classhints; Atom _NET_WM_WINDOW_TYPE; Atom _NET_WM_WINDOW_TYPE_NORMAL; Atom _NET_WM_PID; @@ -501,37 +502,26 @@ X11_CreateWindow(_THIS, SDL_Window * window) } /* Setup the normal size hints */ - sizehints = XAllocSizeHints(); - if (sizehints) { - if (!(window->flags & SDL_WINDOW_RESIZABLE)) { - sizehints->min_width = sizehints->max_width = window->w; - sizehints->min_height = sizehints->max_height = window->h; - sizehints->flags = PMaxSize | PMinSize; - } - sizehints->x = window->x; - sizehints->y = window->y; - sizehints->flags |= USPosition; - XSetWMNormalHints(display, w, sizehints); - XFree(sizehints); + sizehints.flags = 0; + if (!(window->flags & SDL_WINDOW_RESIZABLE)) { + sizehints.min_width = sizehints.max_width = window->w; + sizehints.min_height = sizehints.max_height = window->h; + sizehints.flags |= (PMaxSize | PMinSize); } + sizehints.x = window->x; + sizehints.y = window->y; + sizehints.flags |= USPosition; - /* Set the input hints so we get keyboard input */ - wmhints = XAllocWMHints(); - if (wmhints) { - wmhints->input = True; - wmhints->flags = InputHint; - XSetWMHints(display, w, wmhints); - XFree(wmhints); - } + /* Setup the input hints so we get keyboard input */ + wmhints.input = True; + wmhints.flags = InputHint; - /* Set the class hints so we can get an icon (AfterStep) */ - classhints = XAllocClassHint(); - if (classhints != NULL) { - classhints->res_name = data->classname; - classhints->res_class = data->classname; - XSetClassHint(display, w, classhints); - XFree(classhints); - } + /* Setup the class hints so we can get an icon (AfterStep) */ + classhints.res_name = data->classname; + classhints.res_class = data->classname; + + /* Set the size, input and class hints, and define WM_CLIENT_MACHINE and WM_LOCALE_NAME */ + XSetWMProperties(display, w, NULL, NULL, NULL, 0, &sizehints, &wmhints, &classhints); /* Set the PID related to the window for the given hostname, if possible */ if (data->pid > 0) { @@ -572,6 +562,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) } #endif + X11_Xinput2SelectTouch(_this, window); + XSelectInput(display, w, (FocusChangeMask | EnterWindowMask | LeaveWindowMask | ExposureMask | ButtonPressMask | ButtonReleaseMask | diff --git a/src/helper/android/SDL2/src/video/x11/SDL_x11window.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11window.h similarity index 100% rename from src/helper/android/SDL2/src/video/x11/SDL_x11window.h rename to src/eepp/helper/SDL2/src/video/x11/SDL_x11window.h diff --git a/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.c b/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.c new file mode 100644 index 000000000..30742f8d4 --- /dev/null +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.c @@ -0,0 +1,250 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2012 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. +*/ +#include "SDL_config.h" + +#if SDL_VIDEO_DRIVER_X11 + +#include "SDL_x11video.h" +#include "SDL_x11xinput2.h" +#include "../../events/SDL_mouse_c.h" +#include "../../events/SDL_touch_c.h" + +#define MAX_AXIS 16 + +static int xinput2_initialized = 0; +static int xinput2_multitouch_supported = 0; +/* Opcode returned XQueryExtension + * It will be used in event processing + * to know that the event came from + * this extension */ +static int xinput2_opcode; + + +#if SDL_VIDEO_DRIVER_X11_XINPUT2 +static void parse_valuators(const double *input_values,unsigned char *mask,int mask_len, + double *output_values,int output_values_len) { + int i = 0,z = 0; + int top = mask_len * 8; + if (top > MAX_AXIS) + top = MAX_AXIS; + + SDL_memset(output_values,0,output_values_len * sizeof(double)); + for (; i < top && z < output_values_len; i++) { + if (XIMaskIsSet(mask, i)) { + const int value = (int) *input_values; + output_values[z] = value; + input_values++; + } + z++; + } +} +#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */ + +void +X11_InitXinput2(_THIS) { +#if SDL_VIDEO_DRIVER_X11_XINPUT2 + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + + XIEventMask eventmask; + unsigned char mask[3] = { 0,0,0 }; + int event, err; + int major = 2, minor = 0; + int outmajor,outminor; +#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH + minor = 2; +#endif + /* + * Initialize XInput 2 + * According to http://who-t.blogspot.com/2009/05/xi2-recipes-part-1.html its better + * to inform Xserver what version of Xinput we support.The server will store the version we support. + * "As XI2 progresses it becomes important that you use this call as the server may treat the client + * differently depending on the supported version". + * + * FIXME:event and err are not needed but if not passed XQueryExtension returns SegmentationFault + */ + if (!XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) { + return; + } + + outmajor = major; + outminor = minor; + if (XIQueryVersion(data->display, &outmajor, &outminor) != Success) { + return; + } + + /*Check supported version*/ + if(outmajor * 1000 + outminor < major * 1000 + minor) { + /*X server does not support the version we want*/ + return; + } + xinput2_initialized = 1; +#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH + /*XInput 2.2*/ + if(outmajor * 1000 + outminor >= major * 1000 + minor) { + xinput2_multitouch_supported = 1; + } +#endif + + /*Enable Raw motion events for this display*/ + eventmask.deviceid = XIAllMasterDevices; + eventmask.mask_len = sizeof(mask); + eventmask.mask = mask; + + XISetMask(mask, XI_RawMotion); + + if (XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) { + return; + } +#endif +} + + + +int +X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie) { +#if SDL_VIDEO_DRIVER_X11_XINPUT2 + if(cookie->extension != xinput2_opcode) { + return 0; + } + switch(cookie->evtype) { + case XI_RawMotion: { + const XIRawEvent *rawev = (const XIRawEvent*)cookie->data; + SDL_Mouse *mouse = SDL_GetMouse(); + double relative_cords[2]; + + if (!mouse->relative_mode) { + return 0; + } + + parse_valuators(rawev->raw_values,rawev->valuators.mask, + rawev->valuators.mask_len,relative_cords,2); + SDL_SendMouseMotion(mouse->focus,1,(int)relative_cords[0],(int)relative_cords[1]); + return 1; + } + break; +#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH + case XI_TouchBegin: { + const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; + SDL_SendFingerDown(xev->sourceid,xev->detail, + SDL_TRUE, (int)xev->event_x, (int)xev->event_y, + 1.0); + return 1; + } + break; + case XI_TouchEnd: { + const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; + SDL_SendFingerDown(xev->sourceid,xev->detail, + SDL_FALSE, (int)xev->event_x, (int)xev->event_y, + 1.0); + return 1; + } + break; + case XI_TouchUpdate: { + const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data; + SDL_SendTouchMotion(xev->sourceid,xev->detail, + SDL_FALSE, (int)xev->event_x, (int)xev->event_y, + 1.0); + return 1; + } + break; +#endif + } +#endif + return 0; +} + +void +X11_InitXinput2Multitouch(_THIS) { +#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + XIDeviceInfo *info; + int ndevices,i,j; + info = XIQueryDevice(data->display, XIAllMasterDevices, &ndevices); + + for (i = 0; i < ndevices; i++) { + XIDeviceInfo *dev = &info[i]; + for (j = 0; j < dev->num_classes; j++) { + SDL_TouchID touchId; + XIAnyClassInfo *class = dev->classes[j]; + XITouchClassInfo *t = (XITouchClassInfo*)class; + + /*Only touch devices*/ + if (class->type != XITouchClass) + continue; + + touchId = t->sourceid; + /*Add the touch*/ + if (!SDL_GetTouch(touchId)) { + SDL_Touch touch; + + touch.id = touchId; + touch.x_min = 0; + touch.x_max = 1; + touch.native_xres = touch.x_max - touch.x_min; + touch.y_min = 0; + touch.y_max = 1; + touch.native_yres = touch.y_max - touch.y_min; + touch.pressure_min = 0; + touch.pressure_max = 1; + touch.native_pressureres = touch.pressure_max - touch.pressure_min; + + SDL_AddTouch(&touch,dev->name); + } + } + } + XIFreeDeviceInfo(info); +#endif +} + +void +X11_Xinput2SelectTouch(_THIS, SDL_Window *window) { +#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH + SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; + XIEventMask eventmask; + unsigned char mask[3] = { 0,0,0 }; + SDL_WindowData *window_data = (SDL_WindowData*)window->driverdata; + + eventmask.deviceid = XIAllMasterDevices; + eventmask.mask_len = sizeof(mask); + eventmask.mask = mask; + + XISetMask(mask, XI_TouchBegin); + XISetMask(mask, XI_TouchUpdate); + XISetMask(mask, XI_TouchEnd); + + XISelectEvents(data->display,window_data->xwindow,&eventmask,1); +#endif +} + + +int +X11_Xinput2IsInitialized() { + return xinput2_initialized; +} + +int +X11_Xinput2IsMutitouchSupported() { + return xinput2_initialized && xinput2_multitouch_supported; +} + +#endif /* SDL_VIDEO_DRIVER_X11 */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.h b/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.h new file mode 100644 index 000000000..a95ef2940 --- /dev/null +++ b/src/eepp/helper/SDL2/src/video/x11/SDL_x11xinput2.h @@ -0,0 +1,42 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2012 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. +*/ +#include "SDL_config.h" + +#ifndef _SDL_x11xinput2_h +#define _SDL_x11xinput2_h + +#ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS +/*Define XGenericEventCookie as forward declaration when + *xinput2 is not available in order to compile*/ +struct XGenericEventCookie; +typedef struct XGenericEventCookie XGenericEventCookie; +#endif + +extern void X11_InitXinput2(_THIS); +extern void X11_InitXinput2Multitouch(_THIS); +extern int X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie); +extern int X11_Xinput2IsInitialized(void); +extern int X11_Xinput2IsMutitouchSupported(void); +extern void X11_Xinput2SelectTouch(_THIS, SDL_Window *window); + +#endif /* _SDL_x11xinput2_h */ + +/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL2/src/video/x11/imKStoUCS.c b/src/eepp/helper/SDL2/src/video/x11/imKStoUCS.c similarity index 100% rename from src/helper/android/SDL2/src/video/x11/imKStoUCS.c rename to src/eepp/helper/SDL2/src/video/x11/imKStoUCS.c diff --git a/src/helper/android/SDL1.3/src/video/x11/imKStoUCS.h b/src/eepp/helper/SDL2/src/video/x11/imKStoUCS.h similarity index 100% rename from src/helper/android/SDL1.3/src/video/x11/imKStoUCS.h rename to src/eepp/helper/SDL2/src/video/x11/imKStoUCS.h diff --git a/src/helper/SOIL/SOIL.c b/src/eepp/helper/SOIL/SOIL.c similarity index 100% rename from src/helper/SOIL/SOIL.c rename to src/eepp/helper/SOIL/SOIL.c diff --git a/src/helper/SOIL/image_DXT.c b/src/eepp/helper/SOIL/image_DXT.c similarity index 100% rename from src/helper/SOIL/image_DXT.c rename to src/eepp/helper/SOIL/image_DXT.c diff --git a/src/helper/SOIL/image_helper.c b/src/eepp/helper/SOIL/image_helper.c similarity index 100% rename from src/helper/SOIL/image_helper.c rename to src/eepp/helper/SOIL/image_helper.c diff --git a/src/helper/SOIL/stb_image.c b/src/eepp/helper/SOIL/stb_image.c similarity index 100% rename from src/helper/SOIL/stb_image.c rename to src/eepp/helper/SOIL/stb_image.c diff --git a/src/helper/SOIL/stb_image_write.c b/src/eepp/helper/SOIL/stb_image_write.c similarity index 100% rename from src/helper/SOIL/stb_image_write.c rename to src/eepp/helper/SOIL/stb_image_write.c diff --git a/src/helper/SOIL/stbi_DDS_c.h b/src/eepp/helper/SOIL/stbi_DDS_c.h similarity index 100% rename from src/helper/SOIL/stbi_DDS_c.h rename to src/eepp/helper/SOIL/stbi_DDS_c.h diff --git a/src/helper/android/openal/COPYING b/src/eepp/helper/android/openal/COPYING similarity index 100% rename from src/helper/android/openal/COPYING rename to src/eepp/helper/android/openal/COPYING diff --git a/src/helper/android/openal/README b/src/eepp/helper/android/openal/README similarity index 100% rename from src/helper/android/openal/README rename to src/eepp/helper/android/openal/README diff --git a/src/helper/android/openal/README-ANDROID b/src/eepp/helper/android/openal/README-ANDROID similarity index 100% rename from src/helper/android/openal/README-ANDROID rename to src/eepp/helper/android/openal/README-ANDROID diff --git a/src/helper/android/openal/include/AL/al.h b/src/eepp/helper/android/openal/include/AL/al.h similarity index 100% rename from src/helper/android/openal/include/AL/al.h rename to src/eepp/helper/android/openal/include/AL/al.h diff --git a/src/helper/android/openal/include/AL/alc.h b/src/eepp/helper/android/openal/include/AL/alc.h similarity index 100% rename from src/helper/android/openal/include/AL/alc.h rename to src/eepp/helper/android/openal/include/AL/alc.h diff --git a/src/helper/android/openal/include/AL/alext.h b/src/eepp/helper/android/openal/include/AL/alext.h similarity index 100% rename from src/helper/android/openal/include/AL/alext.h rename to src/eepp/helper/android/openal/include/AL/alext.h diff --git a/src/helper/android/openal/include/AL/alut.h b/src/eepp/helper/android/openal/include/AL/alut.h similarity index 100% rename from src/helper/android/openal/include/AL/alut.h rename to src/eepp/helper/android/openal/include/AL/alut.h diff --git a/src/helper/android/openal/include/AL/android.h b/src/eepp/helper/android/openal/include/AL/android.h similarity index 100% rename from src/helper/android/openal/include/AL/android.h rename to src/eepp/helper/android/openal/include/AL/android.h diff --git a/src/helper/android/openal/include/AL/efx-creative.h b/src/eepp/helper/android/openal/include/AL/efx-creative.h similarity index 100% rename from src/helper/android/openal/include/AL/efx-creative.h rename to src/eepp/helper/android/openal/include/AL/efx-creative.h diff --git a/src/helper/android/openal/include/AL/efx.h b/src/eepp/helper/android/openal/include/AL/efx.h similarity index 100% rename from src/helper/android/openal/include/AL/efx.h rename to src/eepp/helper/android/openal/include/AL/efx.h diff --git a/src/helper/android/openal/src/Alc/ALc.c b/src/eepp/helper/android/openal/src/Alc/ALc.c similarity index 100% rename from src/helper/android/openal/src/Alc/ALc.c rename to src/eepp/helper/android/openal/src/Alc/ALc.c diff --git a/src/helper/android/openal/src/Alc/ALu.c b/src/eepp/helper/android/openal/src/Alc/ALu.c similarity index 100% rename from src/helper/android/openal/src/Alc/ALu.c rename to src/eepp/helper/android/openal/src/Alc/ALu.c diff --git a/src/helper/android/openal/src/Alc/alcConfig.c b/src/eepp/helper/android/openal/src/Alc/alcConfig.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcConfig.c rename to src/eepp/helper/android/openal/src/Alc/alcConfig.c diff --git a/src/helper/android/openal/src/Alc/alcEcho.c b/src/eepp/helper/android/openal/src/Alc/alcEcho.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcEcho.c rename to src/eepp/helper/android/openal/src/Alc/alcEcho.c diff --git a/src/helper/android/openal/src/Alc/alcModulator.c b/src/eepp/helper/android/openal/src/Alc/alcModulator.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcModulator.c rename to src/eepp/helper/android/openal/src/Alc/alcModulator.c diff --git a/src/helper/android/openal/src/Alc/alcReverb.c b/src/eepp/helper/android/openal/src/Alc/alcReverb.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcReverb.c rename to src/eepp/helper/android/openal/src/Alc/alcReverb.c diff --git a/src/helper/android/openal/src/Alc/alcRing.c b/src/eepp/helper/android/openal/src/Alc/alcRing.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcRing.c rename to src/eepp/helper/android/openal/src/Alc/alcRing.c diff --git a/src/helper/android/openal/src/Alc/alcThread.c b/src/eepp/helper/android/openal/src/Alc/alcThread.c similarity index 100% rename from src/helper/android/openal/src/Alc/alcThread.c rename to src/eepp/helper/android/openal/src/Alc/alcThread.c diff --git a/src/helper/android/openal/src/Alc/android.c b/src/eepp/helper/android/openal/src/Alc/android.c similarity index 100% rename from src/helper/android/openal/src/Alc/android.c rename to src/eepp/helper/android/openal/src/Alc/android.c diff --git a/src/helper/android/openal/src/Alc/bs2b.c b/src/eepp/helper/android/openal/src/Alc/bs2b.c similarity index 100% rename from src/helper/android/openal/src/Alc/bs2b.c rename to src/eepp/helper/android/openal/src/Alc/bs2b.c diff --git a/src/helper/android/openal/src/Alc/null.c b/src/eepp/helper/android/openal/src/Alc/null.c similarity index 100% rename from src/helper/android/openal/src/Alc/null.c rename to src/eepp/helper/android/openal/src/Alc/null.c diff --git a/src/helper/android/openal/src/OpenAL32/Include/alAuxEffectSlot.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alAuxEffectSlot.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alAuxEffectSlot.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alAuxEffectSlot.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alBuffer.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alBuffer.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alBuffer.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alBuffer.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alDatabuffer.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alDatabuffer.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alDatabuffer.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alDatabuffer.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alEffect.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alEffect.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alEffect.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alEffect.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alError.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alError.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alError.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alError.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alFilter.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alFilter.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alFilter.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alFilter.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alListener.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alListener.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alListener.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alListener.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alMain.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alMain.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alMain.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alMain.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alSource.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alSource.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alSource.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alSource.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alState.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alState.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alState.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alState.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alThunk.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alThunk.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alThunk.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alThunk.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/alu.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/alu.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/alu.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/alu.h diff --git a/src/helper/android/openal/src/OpenAL32/Include/bs2b.h b/src/eepp/helper/android/openal/src/OpenAL32/Include/bs2b.h similarity index 100% rename from src/helper/android/openal/src/OpenAL32/Include/bs2b.h rename to src/eepp/helper/android/openal/src/OpenAL32/Include/bs2b.h diff --git a/src/helper/android/openal/src/OpenAL32/alAuxEffectSlot.c b/src/eepp/helper/android/openal/src/OpenAL32/alAuxEffectSlot.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alAuxEffectSlot.c rename to src/eepp/helper/android/openal/src/OpenAL32/alAuxEffectSlot.c diff --git a/src/helper/android/openal/src/OpenAL32/alBuffer.c b/src/eepp/helper/android/openal/src/OpenAL32/alBuffer.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alBuffer.c rename to src/eepp/helper/android/openal/src/OpenAL32/alBuffer.c diff --git a/src/helper/android/openal/src/OpenAL32/alDatabuffer.c b/src/eepp/helper/android/openal/src/OpenAL32/alDatabuffer.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alDatabuffer.c rename to src/eepp/helper/android/openal/src/OpenAL32/alDatabuffer.c diff --git a/src/helper/android/openal/src/OpenAL32/alEffect.c b/src/eepp/helper/android/openal/src/OpenAL32/alEffect.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alEffect.c rename to src/eepp/helper/android/openal/src/OpenAL32/alEffect.c diff --git a/src/helper/android/openal/src/OpenAL32/alError.c b/src/eepp/helper/android/openal/src/OpenAL32/alError.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alError.c rename to src/eepp/helper/android/openal/src/OpenAL32/alError.c diff --git a/src/helper/android/openal/src/OpenAL32/alExtension.c b/src/eepp/helper/android/openal/src/OpenAL32/alExtension.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alExtension.c rename to src/eepp/helper/android/openal/src/OpenAL32/alExtension.c diff --git a/src/helper/android/openal/src/OpenAL32/alFilter.c b/src/eepp/helper/android/openal/src/OpenAL32/alFilter.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alFilter.c rename to src/eepp/helper/android/openal/src/OpenAL32/alFilter.c diff --git a/src/helper/android/openal/src/OpenAL32/alListener.c b/src/eepp/helper/android/openal/src/OpenAL32/alListener.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alListener.c rename to src/eepp/helper/android/openal/src/OpenAL32/alListener.c diff --git a/src/helper/android/openal/src/OpenAL32/alSource.c b/src/eepp/helper/android/openal/src/OpenAL32/alSource.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alSource.c rename to src/eepp/helper/android/openal/src/OpenAL32/alSource.c diff --git a/src/helper/android/openal/src/OpenAL32/alState.c b/src/eepp/helper/android/openal/src/OpenAL32/alState.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alState.c rename to src/eepp/helper/android/openal/src/OpenAL32/alState.c diff --git a/src/helper/android/openal/src/OpenAL32/alThunk.c b/src/eepp/helper/android/openal/src/OpenAL32/alThunk.c similarity index 100% rename from src/helper/android/openal/src/OpenAL32/alThunk.c rename to src/eepp/helper/android/openal/src/OpenAL32/alThunk.c diff --git a/src/helper/android/openal/src/config.h b/src/eepp/helper/android/openal/src/config.h similarity index 100% rename from src/helper/android/openal/src/config.h rename to src/eepp/helper/android/openal/src/config.h diff --git a/src/helper/android/openal/src/freealut/README b/src/eepp/helper/android/openal/src/freealut/README similarity index 100% rename from src/helper/android/openal/src/freealut/README rename to src/eepp/helper/android/openal/src/freealut/README diff --git a/src/helper/android/openal/src/freealut/alutBufferData.c b/src/eepp/helper/android/openal/src/freealut/alutBufferData.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutBufferData.c rename to src/eepp/helper/android/openal/src/freealut/alutBufferData.c diff --git a/src/helper/android/openal/src/freealut/alutCodec.c b/src/eepp/helper/android/openal/src/freealut/alutCodec.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutCodec.c rename to src/eepp/helper/android/openal/src/freealut/alutCodec.c diff --git a/src/helper/android/openal/src/freealut/alutError.c b/src/eepp/helper/android/openal/src/freealut/alutError.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutError.c rename to src/eepp/helper/android/openal/src/freealut/alutError.c diff --git a/src/helper/android/openal/src/freealut/alutInit.c b/src/eepp/helper/android/openal/src/freealut/alutInit.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutInit.c rename to src/eepp/helper/android/openal/src/freealut/alutInit.c diff --git a/src/helper/android/openal/src/freealut/alutInputStream.c b/src/eepp/helper/android/openal/src/freealut/alutInputStream.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutInputStream.c rename to src/eepp/helper/android/openal/src/freealut/alutInputStream.c diff --git a/src/helper/android/openal/src/freealut/alutInternal.h b/src/eepp/helper/android/openal/src/freealut/alutInternal.h similarity index 100% rename from src/helper/android/openal/src/freealut/alutInternal.h rename to src/eepp/helper/android/openal/src/freealut/alutInternal.h diff --git a/src/helper/android/openal/src/freealut/alutLoader.c b/src/eepp/helper/android/openal/src/freealut/alutLoader.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutLoader.c rename to src/eepp/helper/android/openal/src/freealut/alutLoader.c diff --git a/src/helper/android/openal/src/freealut/alutOutputStream.c b/src/eepp/helper/android/openal/src/freealut/alutOutputStream.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutOutputStream.c rename to src/eepp/helper/android/openal/src/freealut/alutOutputStream.c diff --git a/src/helper/android/openal/src/freealut/alutUtil.c b/src/eepp/helper/android/openal/src/freealut/alutUtil.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutUtil.c rename to src/eepp/helper/android/openal/src/freealut/alutUtil.c diff --git a/src/helper/android/openal/src/freealut/alutVersion.c b/src/eepp/helper/android/openal/src/freealut/alutVersion.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutVersion.c rename to src/eepp/helper/android/openal/src/freealut/alutVersion.c diff --git a/src/helper/android/openal/src/freealut/alutWaveform.c b/src/eepp/helper/android/openal/src/freealut/alutWaveform.c similarity index 100% rename from src/helper/android/openal/src/freealut/alutWaveform.c rename to src/eepp/helper/android/openal/src/freealut/alutWaveform.c diff --git a/src/helper/chipmunk/chipmunk.c b/src/eepp/helper/chipmunk/chipmunk.c similarity index 100% rename from src/helper/chipmunk/chipmunk.c rename to src/eepp/helper/chipmunk/chipmunk.c diff --git a/src/helper/chipmunk/constraints/cpConstraint.c b/src/eepp/helper/chipmunk/constraints/cpConstraint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpConstraint.c rename to src/eepp/helper/chipmunk/constraints/cpConstraint.c diff --git a/src/helper/chipmunk/constraints/cpDampedRotarySpring.c b/src/eepp/helper/chipmunk/constraints/cpDampedRotarySpring.c similarity index 100% rename from src/helper/chipmunk/constraints/cpDampedRotarySpring.c rename to src/eepp/helper/chipmunk/constraints/cpDampedRotarySpring.c diff --git a/src/helper/chipmunk/constraints/cpDampedSpring.c b/src/eepp/helper/chipmunk/constraints/cpDampedSpring.c similarity index 100% rename from src/helper/chipmunk/constraints/cpDampedSpring.c rename to src/eepp/helper/chipmunk/constraints/cpDampedSpring.c diff --git a/src/helper/chipmunk/constraints/cpGearJoint.c b/src/eepp/helper/chipmunk/constraints/cpGearJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpGearJoint.c rename to src/eepp/helper/chipmunk/constraints/cpGearJoint.c diff --git a/src/helper/chipmunk/constraints/cpGrooveJoint.c b/src/eepp/helper/chipmunk/constraints/cpGrooveJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpGrooveJoint.c rename to src/eepp/helper/chipmunk/constraints/cpGrooveJoint.c diff --git a/src/helper/chipmunk/constraints/cpPinJoint.c b/src/eepp/helper/chipmunk/constraints/cpPinJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpPinJoint.c rename to src/eepp/helper/chipmunk/constraints/cpPinJoint.c diff --git a/src/helper/chipmunk/constraints/cpPivotJoint.c b/src/eepp/helper/chipmunk/constraints/cpPivotJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpPivotJoint.c rename to src/eepp/helper/chipmunk/constraints/cpPivotJoint.c diff --git a/src/helper/chipmunk/constraints/cpRatchetJoint.c b/src/eepp/helper/chipmunk/constraints/cpRatchetJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpRatchetJoint.c rename to src/eepp/helper/chipmunk/constraints/cpRatchetJoint.c diff --git a/src/helper/chipmunk/constraints/cpRotaryLimitJoint.c b/src/eepp/helper/chipmunk/constraints/cpRotaryLimitJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpRotaryLimitJoint.c rename to src/eepp/helper/chipmunk/constraints/cpRotaryLimitJoint.c diff --git a/src/helper/chipmunk/constraints/cpSimpleMotor.c b/src/eepp/helper/chipmunk/constraints/cpSimpleMotor.c similarity index 100% rename from src/helper/chipmunk/constraints/cpSimpleMotor.c rename to src/eepp/helper/chipmunk/constraints/cpSimpleMotor.c diff --git a/src/helper/chipmunk/constraints/cpSlideJoint.c b/src/eepp/helper/chipmunk/constraints/cpSlideJoint.c similarity index 100% rename from src/helper/chipmunk/constraints/cpSlideJoint.c rename to src/eepp/helper/chipmunk/constraints/cpSlideJoint.c diff --git a/src/helper/chipmunk/cpArbiter.c b/src/eepp/helper/chipmunk/cpArbiter.c similarity index 100% rename from src/helper/chipmunk/cpArbiter.c rename to src/eepp/helper/chipmunk/cpArbiter.c diff --git a/src/helper/chipmunk/cpArray.c b/src/eepp/helper/chipmunk/cpArray.c similarity index 100% rename from src/helper/chipmunk/cpArray.c rename to src/eepp/helper/chipmunk/cpArray.c diff --git a/src/helper/chipmunk/cpBB.c b/src/eepp/helper/chipmunk/cpBB.c similarity index 100% rename from src/helper/chipmunk/cpBB.c rename to src/eepp/helper/chipmunk/cpBB.c diff --git a/src/helper/chipmunk/cpBBTree.c b/src/eepp/helper/chipmunk/cpBBTree.c similarity index 100% rename from src/helper/chipmunk/cpBBTree.c rename to src/eepp/helper/chipmunk/cpBBTree.c diff --git a/src/helper/chipmunk/cpBody.c b/src/eepp/helper/chipmunk/cpBody.c similarity index 100% rename from src/helper/chipmunk/cpBody.c rename to src/eepp/helper/chipmunk/cpBody.c diff --git a/src/helper/chipmunk/cpCollision.c b/src/eepp/helper/chipmunk/cpCollision.c similarity index 100% rename from src/helper/chipmunk/cpCollision.c rename to src/eepp/helper/chipmunk/cpCollision.c diff --git a/src/helper/chipmunk/cpHashSet.c b/src/eepp/helper/chipmunk/cpHashSet.c similarity index 100% rename from src/helper/chipmunk/cpHashSet.c rename to src/eepp/helper/chipmunk/cpHashSet.c diff --git a/src/helper/chipmunk/cpPolyShape.c b/src/eepp/helper/chipmunk/cpPolyShape.c similarity index 100% rename from src/helper/chipmunk/cpPolyShape.c rename to src/eepp/helper/chipmunk/cpPolyShape.c diff --git a/src/helper/chipmunk/cpShape.c b/src/eepp/helper/chipmunk/cpShape.c similarity index 100% rename from src/helper/chipmunk/cpShape.c rename to src/eepp/helper/chipmunk/cpShape.c diff --git a/src/helper/chipmunk/cpSpace.c b/src/eepp/helper/chipmunk/cpSpace.c similarity index 100% rename from src/helper/chipmunk/cpSpace.c rename to src/eepp/helper/chipmunk/cpSpace.c diff --git a/src/helper/chipmunk/cpSpaceComponent.c b/src/eepp/helper/chipmunk/cpSpaceComponent.c similarity index 100% rename from src/helper/chipmunk/cpSpaceComponent.c rename to src/eepp/helper/chipmunk/cpSpaceComponent.c diff --git a/src/helper/chipmunk/cpSpaceHash.c b/src/eepp/helper/chipmunk/cpSpaceHash.c similarity index 100% rename from src/helper/chipmunk/cpSpaceHash.c rename to src/eepp/helper/chipmunk/cpSpaceHash.c diff --git a/src/helper/chipmunk/cpSpaceQuery.c b/src/eepp/helper/chipmunk/cpSpaceQuery.c similarity index 100% rename from src/helper/chipmunk/cpSpaceQuery.c rename to src/eepp/helper/chipmunk/cpSpaceQuery.c diff --git a/src/helper/chipmunk/cpSpaceStep.c b/src/eepp/helper/chipmunk/cpSpaceStep.c similarity index 100% rename from src/helper/chipmunk/cpSpaceStep.c rename to src/eepp/helper/chipmunk/cpSpaceStep.c diff --git a/src/helper/chipmunk/cpSpatialIndex.c b/src/eepp/helper/chipmunk/cpSpatialIndex.c similarity index 100% rename from src/helper/chipmunk/cpSpatialIndex.c rename to src/eepp/helper/chipmunk/cpSpatialIndex.c diff --git a/src/helper/chipmunk/cpSweep1D.c b/src/eepp/helper/chipmunk/cpSweep1D.c similarity index 100% rename from src/helper/chipmunk/cpSweep1D.c rename to src/eepp/helper/chipmunk/cpSweep1D.c diff --git a/src/helper/chipmunk/cpVect.c b/src/eepp/helper/chipmunk/cpVect.c similarity index 100% rename from src/helper/chipmunk/cpVect.c rename to src/eepp/helper/chipmunk/cpVect.c diff --git a/src/helper/freetype2/include/freetype/config/ftconfig.h b/src/eepp/helper/freetype2/include/freetype/config/ftconfig.h similarity index 100% rename from src/helper/freetype2/include/freetype/config/ftconfig.h rename to src/eepp/helper/freetype2/include/freetype/config/ftconfig.h diff --git a/src/helper/freetype2/include/freetype/config/ftheader.h b/src/eepp/helper/freetype2/include/freetype/config/ftheader.h similarity index 100% rename from src/helper/freetype2/include/freetype/config/ftheader.h rename to src/eepp/helper/freetype2/include/freetype/config/ftheader.h diff --git a/src/helper/freetype2/include/freetype/config/ftmodule.h b/src/eepp/helper/freetype2/include/freetype/config/ftmodule.h similarity index 100% rename from src/helper/freetype2/include/freetype/config/ftmodule.h rename to src/eepp/helper/freetype2/include/freetype/config/ftmodule.h diff --git a/src/helper/freetype2/include/freetype/config/ftoption.h b/src/eepp/helper/freetype2/include/freetype/config/ftoption.h similarity index 100% rename from src/helper/freetype2/include/freetype/config/ftoption.h rename to src/eepp/helper/freetype2/include/freetype/config/ftoption.h diff --git a/src/helper/freetype2/include/freetype/config/ftstdlib.h b/src/eepp/helper/freetype2/include/freetype/config/ftstdlib.h similarity index 100% rename from src/helper/freetype2/include/freetype/config/ftstdlib.h rename to src/eepp/helper/freetype2/include/freetype/config/ftstdlib.h diff --git a/src/helper/freetype2/include/freetype/freetype.h b/src/eepp/helper/freetype2/include/freetype/freetype.h similarity index 100% rename from src/helper/freetype2/include/freetype/freetype.h rename to src/eepp/helper/freetype2/include/freetype/freetype.h diff --git a/src/helper/freetype2/include/freetype/ftadvanc.h b/src/eepp/helper/freetype2/include/freetype/ftadvanc.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftadvanc.h rename to src/eepp/helper/freetype2/include/freetype/ftadvanc.h diff --git a/src/helper/freetype2/include/freetype/ftbbox.h b/src/eepp/helper/freetype2/include/freetype/ftbbox.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftbbox.h rename to src/eepp/helper/freetype2/include/freetype/ftbbox.h diff --git a/src/helper/freetype2/include/freetype/ftbdf.h b/src/eepp/helper/freetype2/include/freetype/ftbdf.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftbdf.h rename to src/eepp/helper/freetype2/include/freetype/ftbdf.h diff --git a/src/helper/freetype2/include/freetype/ftbitmap.h b/src/eepp/helper/freetype2/include/freetype/ftbitmap.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftbitmap.h rename to src/eepp/helper/freetype2/include/freetype/ftbitmap.h diff --git a/src/helper/freetype2/include/freetype/ftbzip2.h b/src/eepp/helper/freetype2/include/freetype/ftbzip2.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftbzip2.h rename to src/eepp/helper/freetype2/include/freetype/ftbzip2.h diff --git a/src/helper/freetype2/include/freetype/ftcache.h b/src/eepp/helper/freetype2/include/freetype/ftcache.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftcache.h rename to src/eepp/helper/freetype2/include/freetype/ftcache.h diff --git a/src/helper/freetype2/include/freetype/ftchapters.h b/src/eepp/helper/freetype2/include/freetype/ftchapters.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftchapters.h rename to src/eepp/helper/freetype2/include/freetype/ftchapters.h diff --git a/src/helper/freetype2/include/freetype/ftcid.h b/src/eepp/helper/freetype2/include/freetype/ftcid.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftcid.h rename to src/eepp/helper/freetype2/include/freetype/ftcid.h diff --git a/src/helper/freetype2/include/freetype/fterrdef.h b/src/eepp/helper/freetype2/include/freetype/fterrdef.h similarity index 100% rename from src/helper/freetype2/include/freetype/fterrdef.h rename to src/eepp/helper/freetype2/include/freetype/fterrdef.h diff --git a/src/helper/freetype2/include/freetype/fterrors.h b/src/eepp/helper/freetype2/include/freetype/fterrors.h similarity index 100% rename from src/helper/freetype2/include/freetype/fterrors.h rename to src/eepp/helper/freetype2/include/freetype/fterrors.h diff --git a/src/helper/freetype2/include/freetype/ftgasp.h b/src/eepp/helper/freetype2/include/freetype/ftgasp.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftgasp.h rename to src/eepp/helper/freetype2/include/freetype/ftgasp.h diff --git a/src/helper/freetype2/include/freetype/ftglyph.h b/src/eepp/helper/freetype2/include/freetype/ftglyph.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftglyph.h rename to src/eepp/helper/freetype2/include/freetype/ftglyph.h diff --git a/src/helper/freetype2/include/freetype/ftgxval.h b/src/eepp/helper/freetype2/include/freetype/ftgxval.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftgxval.h rename to src/eepp/helper/freetype2/include/freetype/ftgxval.h diff --git a/src/helper/freetype2/include/freetype/ftgzip.h b/src/eepp/helper/freetype2/include/freetype/ftgzip.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftgzip.h rename to src/eepp/helper/freetype2/include/freetype/ftgzip.h diff --git a/src/helper/freetype2/include/freetype/ftimage.h b/src/eepp/helper/freetype2/include/freetype/ftimage.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftimage.h rename to src/eepp/helper/freetype2/include/freetype/ftimage.h diff --git a/src/helper/freetype2/include/freetype/ftincrem.h b/src/eepp/helper/freetype2/include/freetype/ftincrem.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftincrem.h rename to src/eepp/helper/freetype2/include/freetype/ftincrem.h diff --git a/src/helper/freetype2/include/freetype/ftlcdfil.h b/src/eepp/helper/freetype2/include/freetype/ftlcdfil.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftlcdfil.h rename to src/eepp/helper/freetype2/include/freetype/ftlcdfil.h diff --git a/src/helper/freetype2/include/freetype/ftlist.h b/src/eepp/helper/freetype2/include/freetype/ftlist.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftlist.h rename to src/eepp/helper/freetype2/include/freetype/ftlist.h diff --git a/src/helper/freetype2/include/freetype/ftlzw.h b/src/eepp/helper/freetype2/include/freetype/ftlzw.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftlzw.h rename to src/eepp/helper/freetype2/include/freetype/ftlzw.h diff --git a/src/helper/freetype2/include/freetype/ftmac.h b/src/eepp/helper/freetype2/include/freetype/ftmac.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftmac.h rename to src/eepp/helper/freetype2/include/freetype/ftmac.h diff --git a/src/helper/freetype2/include/freetype/ftmm.h b/src/eepp/helper/freetype2/include/freetype/ftmm.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftmm.h rename to src/eepp/helper/freetype2/include/freetype/ftmm.h diff --git a/src/helper/freetype2/include/freetype/ftmodapi.h b/src/eepp/helper/freetype2/include/freetype/ftmodapi.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftmodapi.h rename to src/eepp/helper/freetype2/include/freetype/ftmodapi.h diff --git a/src/helper/freetype2/include/freetype/ftmoderr.h b/src/eepp/helper/freetype2/include/freetype/ftmoderr.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftmoderr.h rename to src/eepp/helper/freetype2/include/freetype/ftmoderr.h diff --git a/src/helper/freetype2/include/freetype/ftotval.h b/src/eepp/helper/freetype2/include/freetype/ftotval.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftotval.h rename to src/eepp/helper/freetype2/include/freetype/ftotval.h diff --git a/src/helper/freetype2/include/freetype/ftoutln.h b/src/eepp/helper/freetype2/include/freetype/ftoutln.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftoutln.h rename to src/eepp/helper/freetype2/include/freetype/ftoutln.h diff --git a/src/helper/freetype2/include/freetype/ftpfr.h b/src/eepp/helper/freetype2/include/freetype/ftpfr.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftpfr.h rename to src/eepp/helper/freetype2/include/freetype/ftpfr.h diff --git a/src/helper/freetype2/include/freetype/ftrender.h b/src/eepp/helper/freetype2/include/freetype/ftrender.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftrender.h rename to src/eepp/helper/freetype2/include/freetype/ftrender.h diff --git a/src/helper/freetype2/include/freetype/ftsizes.h b/src/eepp/helper/freetype2/include/freetype/ftsizes.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftsizes.h rename to src/eepp/helper/freetype2/include/freetype/ftsizes.h diff --git a/src/helper/freetype2/include/freetype/ftsnames.h b/src/eepp/helper/freetype2/include/freetype/ftsnames.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftsnames.h rename to src/eepp/helper/freetype2/include/freetype/ftsnames.h diff --git a/src/helper/freetype2/include/freetype/ftstroke.h b/src/eepp/helper/freetype2/include/freetype/ftstroke.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftstroke.h rename to src/eepp/helper/freetype2/include/freetype/ftstroke.h diff --git a/src/helper/freetype2/include/freetype/ftsynth.h b/src/eepp/helper/freetype2/include/freetype/ftsynth.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftsynth.h rename to src/eepp/helper/freetype2/include/freetype/ftsynth.h diff --git a/src/helper/freetype2/include/freetype/ftsystem.h b/src/eepp/helper/freetype2/include/freetype/ftsystem.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftsystem.h rename to src/eepp/helper/freetype2/include/freetype/ftsystem.h diff --git a/src/helper/freetype2/include/freetype/fttrigon.h b/src/eepp/helper/freetype2/include/freetype/fttrigon.h similarity index 100% rename from src/helper/freetype2/include/freetype/fttrigon.h rename to src/eepp/helper/freetype2/include/freetype/fttrigon.h diff --git a/src/helper/freetype2/include/freetype/fttypes.h b/src/eepp/helper/freetype2/include/freetype/fttypes.h similarity index 100% rename from src/helper/freetype2/include/freetype/fttypes.h rename to src/eepp/helper/freetype2/include/freetype/fttypes.h diff --git a/src/helper/freetype2/include/freetype/ftwinfnt.h b/src/eepp/helper/freetype2/include/freetype/ftwinfnt.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftwinfnt.h rename to src/eepp/helper/freetype2/include/freetype/ftwinfnt.h diff --git a/src/helper/freetype2/include/freetype/ftxf86.h b/src/eepp/helper/freetype2/include/freetype/ftxf86.h similarity index 100% rename from src/helper/freetype2/include/freetype/ftxf86.h rename to src/eepp/helper/freetype2/include/freetype/ftxf86.h diff --git a/src/helper/freetype2/include/freetype/internal/autohint.h b/src/eepp/helper/freetype2/include/freetype/internal/autohint.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/autohint.h rename to src/eepp/helper/freetype2/include/freetype/internal/autohint.h diff --git a/src/helper/freetype2/include/freetype/internal/ftcalc.h b/src/eepp/helper/freetype2/include/freetype/internal/ftcalc.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftcalc.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftcalc.h diff --git a/src/helper/freetype2/include/freetype/internal/ftdebug.h b/src/eepp/helper/freetype2/include/freetype/internal/ftdebug.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftdebug.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftdebug.h diff --git a/src/helper/freetype2/include/freetype/internal/ftdriver.h b/src/eepp/helper/freetype2/include/freetype/internal/ftdriver.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftdriver.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftdriver.h diff --git a/src/helper/freetype2/include/freetype/internal/ftgloadr.h b/src/eepp/helper/freetype2/include/freetype/internal/ftgloadr.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftgloadr.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftgloadr.h diff --git a/src/helper/freetype2/include/freetype/internal/ftmemory.h b/src/eepp/helper/freetype2/include/freetype/internal/ftmemory.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftmemory.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftmemory.h diff --git a/src/helper/freetype2/include/freetype/internal/ftobjs.h b/src/eepp/helper/freetype2/include/freetype/internal/ftobjs.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftobjs.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftobjs.h diff --git a/src/helper/freetype2/include/freetype/internal/ftpic.h b/src/eepp/helper/freetype2/include/freetype/internal/ftpic.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftpic.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftpic.h diff --git a/src/helper/freetype2/include/freetype/internal/ftrfork.h b/src/eepp/helper/freetype2/include/freetype/internal/ftrfork.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftrfork.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftrfork.h diff --git a/src/helper/freetype2/include/freetype/internal/ftserv.h b/src/eepp/helper/freetype2/include/freetype/internal/ftserv.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftserv.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftserv.h diff --git a/src/helper/freetype2/include/freetype/internal/ftstream.h b/src/eepp/helper/freetype2/include/freetype/internal/ftstream.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftstream.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftstream.h diff --git a/src/helper/freetype2/include/freetype/internal/fttrace.h b/src/eepp/helper/freetype2/include/freetype/internal/fttrace.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/fttrace.h rename to src/eepp/helper/freetype2/include/freetype/internal/fttrace.h diff --git a/src/helper/freetype2/include/freetype/internal/ftvalid.h b/src/eepp/helper/freetype2/include/freetype/internal/ftvalid.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/ftvalid.h rename to src/eepp/helper/freetype2/include/freetype/internal/ftvalid.h diff --git a/src/helper/freetype2/include/freetype/internal/internal.h b/src/eepp/helper/freetype2/include/freetype/internal/internal.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/internal.h rename to src/eepp/helper/freetype2/include/freetype/internal/internal.h diff --git a/src/helper/freetype2/include/freetype/internal/psaux.h b/src/eepp/helper/freetype2/include/freetype/internal/psaux.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/psaux.h rename to src/eepp/helper/freetype2/include/freetype/internal/psaux.h diff --git a/src/helper/freetype2/include/freetype/internal/pshints.h b/src/eepp/helper/freetype2/include/freetype/internal/pshints.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/pshints.h rename to src/eepp/helper/freetype2/include/freetype/internal/pshints.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svbdf.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svbdf.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svbdf.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svbdf.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svcid.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svcid.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svcid.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svcid.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svgldict.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svgldict.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svgldict.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svgldict.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svgxval.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svgxval.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svgxval.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svgxval.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svkern.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svkern.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svkern.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svkern.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svmm.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svmm.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svmm.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svmm.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svotval.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svotval.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svotval.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svotval.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svpfr.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svpfr.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svpfr.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svpfr.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svpostnm.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svpostnm.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svpostnm.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svpostnm.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svpscmap.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svpscmap.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svpscmap.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svpscmap.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svpsinfo.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svpsinfo.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svpsinfo.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svpsinfo.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svsfnt.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svsfnt.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svsfnt.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svsfnt.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svttcmap.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svttcmap.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svttcmap.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svttcmap.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svtteng.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svtteng.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svtteng.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svtteng.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svttglyf.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svttglyf.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svttglyf.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svttglyf.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svwinfnt.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svwinfnt.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svwinfnt.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svwinfnt.h diff --git a/src/helper/freetype2/include/freetype/internal/services/svxf86nm.h b/src/eepp/helper/freetype2/include/freetype/internal/services/svxf86nm.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/services/svxf86nm.h rename to src/eepp/helper/freetype2/include/freetype/internal/services/svxf86nm.h diff --git a/src/helper/freetype2/include/freetype/internal/sfnt.h b/src/eepp/helper/freetype2/include/freetype/internal/sfnt.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/sfnt.h rename to src/eepp/helper/freetype2/include/freetype/internal/sfnt.h diff --git a/src/helper/freetype2/include/freetype/internal/t1types.h b/src/eepp/helper/freetype2/include/freetype/internal/t1types.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/t1types.h rename to src/eepp/helper/freetype2/include/freetype/internal/t1types.h diff --git a/src/helper/freetype2/include/freetype/internal/tttypes.h b/src/eepp/helper/freetype2/include/freetype/internal/tttypes.h similarity index 100% rename from src/helper/freetype2/include/freetype/internal/tttypes.h rename to src/eepp/helper/freetype2/include/freetype/internal/tttypes.h diff --git a/src/helper/freetype2/include/freetype/t1tables.h b/src/eepp/helper/freetype2/include/freetype/t1tables.h similarity index 100% rename from src/helper/freetype2/include/freetype/t1tables.h rename to src/eepp/helper/freetype2/include/freetype/t1tables.h diff --git a/src/helper/freetype2/include/freetype/ttnameid.h b/src/eepp/helper/freetype2/include/freetype/ttnameid.h similarity index 100% rename from src/helper/freetype2/include/freetype/ttnameid.h rename to src/eepp/helper/freetype2/include/freetype/ttnameid.h diff --git a/src/helper/freetype2/include/freetype/tttables.h b/src/eepp/helper/freetype2/include/freetype/tttables.h similarity index 100% rename from src/helper/freetype2/include/freetype/tttables.h rename to src/eepp/helper/freetype2/include/freetype/tttables.h diff --git a/src/helper/freetype2/include/freetype/tttags.h b/src/eepp/helper/freetype2/include/freetype/tttags.h similarity index 100% rename from src/helper/freetype2/include/freetype/tttags.h rename to src/eepp/helper/freetype2/include/freetype/tttags.h diff --git a/src/helper/freetype2/include/freetype/ttunpat.h b/src/eepp/helper/freetype2/include/freetype/ttunpat.h similarity index 100% rename from src/helper/freetype2/include/freetype/ttunpat.h rename to src/eepp/helper/freetype2/include/freetype/ttunpat.h diff --git a/src/helper/freetype2/include/ft2build.h b/src/eepp/helper/freetype2/include/ft2build.h similarity index 100% rename from src/helper/freetype2/include/ft2build.h rename to src/eepp/helper/freetype2/include/ft2build.h diff --git a/src/helper/freetype2/src/Jamfile b/src/eepp/helper/freetype2/src/Jamfile similarity index 100% rename from src/helper/freetype2/src/Jamfile rename to src/eepp/helper/freetype2/src/Jamfile diff --git a/src/helper/freetype2/src/autofit/Jamfile b/src/eepp/helper/freetype2/src/autofit/Jamfile similarity index 100% rename from src/helper/freetype2/src/autofit/Jamfile rename to src/eepp/helper/freetype2/src/autofit/Jamfile diff --git a/src/helper/freetype2/src/autofit/afangles.c b/src/eepp/helper/freetype2/src/autofit/afangles.c similarity index 100% rename from src/helper/freetype2/src/autofit/afangles.c rename to src/eepp/helper/freetype2/src/autofit/afangles.c diff --git a/src/helper/freetype2/src/autofit/afangles.h b/src/eepp/helper/freetype2/src/autofit/afangles.h similarity index 100% rename from src/helper/freetype2/src/autofit/afangles.h rename to src/eepp/helper/freetype2/src/autofit/afangles.h diff --git a/src/helper/freetype2/src/autofit/afcjk.c b/src/eepp/helper/freetype2/src/autofit/afcjk.c similarity index 100% rename from src/helper/freetype2/src/autofit/afcjk.c rename to src/eepp/helper/freetype2/src/autofit/afcjk.c diff --git a/src/helper/freetype2/src/autofit/afcjk.h b/src/eepp/helper/freetype2/src/autofit/afcjk.h similarity index 100% rename from src/helper/freetype2/src/autofit/afcjk.h rename to src/eepp/helper/freetype2/src/autofit/afcjk.h diff --git a/src/helper/freetype2/src/autofit/afdummy.c b/src/eepp/helper/freetype2/src/autofit/afdummy.c similarity index 100% rename from src/helper/freetype2/src/autofit/afdummy.c rename to src/eepp/helper/freetype2/src/autofit/afdummy.c diff --git a/src/helper/freetype2/src/autofit/afdummy.h b/src/eepp/helper/freetype2/src/autofit/afdummy.h similarity index 100% rename from src/helper/freetype2/src/autofit/afdummy.h rename to src/eepp/helper/freetype2/src/autofit/afdummy.h diff --git a/src/helper/freetype2/src/autofit/aferrors.h b/src/eepp/helper/freetype2/src/autofit/aferrors.h similarity index 100% rename from src/helper/freetype2/src/autofit/aferrors.h rename to src/eepp/helper/freetype2/src/autofit/aferrors.h diff --git a/src/helper/freetype2/src/autofit/afglobal.c b/src/eepp/helper/freetype2/src/autofit/afglobal.c similarity index 100% rename from src/helper/freetype2/src/autofit/afglobal.c rename to src/eepp/helper/freetype2/src/autofit/afglobal.c diff --git a/src/helper/freetype2/src/autofit/afglobal.h b/src/eepp/helper/freetype2/src/autofit/afglobal.h similarity index 100% rename from src/helper/freetype2/src/autofit/afglobal.h rename to src/eepp/helper/freetype2/src/autofit/afglobal.h diff --git a/src/helper/freetype2/src/autofit/afhints.c b/src/eepp/helper/freetype2/src/autofit/afhints.c similarity index 100% rename from src/helper/freetype2/src/autofit/afhints.c rename to src/eepp/helper/freetype2/src/autofit/afhints.c diff --git a/src/helper/freetype2/src/autofit/afhints.h b/src/eepp/helper/freetype2/src/autofit/afhints.h similarity index 100% rename from src/helper/freetype2/src/autofit/afhints.h rename to src/eepp/helper/freetype2/src/autofit/afhints.h diff --git a/src/helper/freetype2/src/autofit/afindic.c b/src/eepp/helper/freetype2/src/autofit/afindic.c similarity index 100% rename from src/helper/freetype2/src/autofit/afindic.c rename to src/eepp/helper/freetype2/src/autofit/afindic.c diff --git a/src/helper/freetype2/src/autofit/afindic.h b/src/eepp/helper/freetype2/src/autofit/afindic.h similarity index 100% rename from src/helper/freetype2/src/autofit/afindic.h rename to src/eepp/helper/freetype2/src/autofit/afindic.h diff --git a/src/helper/freetype2/src/autofit/aflatin.c b/src/eepp/helper/freetype2/src/autofit/aflatin.c similarity index 100% rename from src/helper/freetype2/src/autofit/aflatin.c rename to src/eepp/helper/freetype2/src/autofit/aflatin.c diff --git a/src/helper/freetype2/src/autofit/aflatin.h b/src/eepp/helper/freetype2/src/autofit/aflatin.h similarity index 100% rename from src/helper/freetype2/src/autofit/aflatin.h rename to src/eepp/helper/freetype2/src/autofit/aflatin.h diff --git a/src/helper/freetype2/src/autofit/afloader.c b/src/eepp/helper/freetype2/src/autofit/afloader.c similarity index 100% rename from src/helper/freetype2/src/autofit/afloader.c rename to src/eepp/helper/freetype2/src/autofit/afloader.c diff --git a/src/helper/freetype2/src/autofit/afloader.h b/src/eepp/helper/freetype2/src/autofit/afloader.h similarity index 100% rename from src/helper/freetype2/src/autofit/afloader.h rename to src/eepp/helper/freetype2/src/autofit/afloader.h diff --git a/src/helper/freetype2/src/autofit/afmodule.c b/src/eepp/helper/freetype2/src/autofit/afmodule.c similarity index 100% rename from src/helper/freetype2/src/autofit/afmodule.c rename to src/eepp/helper/freetype2/src/autofit/afmodule.c diff --git a/src/helper/freetype2/src/autofit/afmodule.h b/src/eepp/helper/freetype2/src/autofit/afmodule.h similarity index 100% rename from src/helper/freetype2/src/autofit/afmodule.h rename to src/eepp/helper/freetype2/src/autofit/afmodule.h diff --git a/src/helper/freetype2/src/autofit/afpic.c b/src/eepp/helper/freetype2/src/autofit/afpic.c similarity index 100% rename from src/helper/freetype2/src/autofit/afpic.c rename to src/eepp/helper/freetype2/src/autofit/afpic.c diff --git a/src/helper/freetype2/src/autofit/afpic.h b/src/eepp/helper/freetype2/src/autofit/afpic.h similarity index 100% rename from src/helper/freetype2/src/autofit/afpic.h rename to src/eepp/helper/freetype2/src/autofit/afpic.h diff --git a/src/helper/freetype2/src/autofit/aftypes.h b/src/eepp/helper/freetype2/src/autofit/aftypes.h similarity index 100% rename from src/helper/freetype2/src/autofit/aftypes.h rename to src/eepp/helper/freetype2/src/autofit/aftypes.h diff --git a/src/helper/freetype2/src/autofit/afwarp.c b/src/eepp/helper/freetype2/src/autofit/afwarp.c similarity index 100% rename from src/helper/freetype2/src/autofit/afwarp.c rename to src/eepp/helper/freetype2/src/autofit/afwarp.c diff --git a/src/helper/freetype2/src/autofit/afwarp.h b/src/eepp/helper/freetype2/src/autofit/afwarp.h similarity index 100% rename from src/helper/freetype2/src/autofit/afwarp.h rename to src/eepp/helper/freetype2/src/autofit/afwarp.h diff --git a/src/helper/freetype2/src/autofit/module.mk b/src/eepp/helper/freetype2/src/autofit/module.mk similarity index 100% rename from src/helper/freetype2/src/autofit/module.mk rename to src/eepp/helper/freetype2/src/autofit/module.mk diff --git a/src/helper/freetype2/src/autofit/rules.mk b/src/eepp/helper/freetype2/src/autofit/rules.mk similarity index 100% rename from src/helper/freetype2/src/autofit/rules.mk rename to src/eepp/helper/freetype2/src/autofit/rules.mk diff --git a/src/helper/freetype2/src/base/Jamfile b/src/eepp/helper/freetype2/src/base/Jamfile similarity index 100% rename from src/helper/freetype2/src/base/Jamfile rename to src/eepp/helper/freetype2/src/base/Jamfile diff --git a/src/helper/freetype2/src/base/basepic.c b/src/eepp/helper/freetype2/src/base/basepic.c similarity index 100% rename from src/helper/freetype2/src/base/basepic.c rename to src/eepp/helper/freetype2/src/base/basepic.c diff --git a/src/helper/freetype2/src/base/basepic.h b/src/eepp/helper/freetype2/src/base/basepic.h similarity index 100% rename from src/helper/freetype2/src/base/basepic.h rename to src/eepp/helper/freetype2/src/base/basepic.h diff --git a/src/helper/freetype2/src/base/ftadvanc.c b/src/eepp/helper/freetype2/src/base/ftadvanc.c similarity index 100% rename from src/helper/freetype2/src/base/ftadvanc.c rename to src/eepp/helper/freetype2/src/base/ftadvanc.c diff --git a/src/helper/freetype2/src/base/ftapi.c b/src/eepp/helper/freetype2/src/base/ftapi.c similarity index 100% rename from src/helper/freetype2/src/base/ftapi.c rename to src/eepp/helper/freetype2/src/base/ftapi.c diff --git a/src/helper/freetype2/src/base/ftbase.h b/src/eepp/helper/freetype2/src/base/ftbase.h similarity index 100% rename from src/helper/freetype2/src/base/ftbase.h rename to src/eepp/helper/freetype2/src/base/ftbase.h diff --git a/src/helper/freetype2/src/base/ftbbox.c b/src/eepp/helper/freetype2/src/base/ftbbox.c similarity index 100% rename from src/helper/freetype2/src/base/ftbbox.c rename to src/eepp/helper/freetype2/src/base/ftbbox.c diff --git a/src/helper/freetype2/src/base/ftbdf.c b/src/eepp/helper/freetype2/src/base/ftbdf.c similarity index 100% rename from src/helper/freetype2/src/base/ftbdf.c rename to src/eepp/helper/freetype2/src/base/ftbdf.c diff --git a/src/helper/freetype2/src/base/ftbitmap.c b/src/eepp/helper/freetype2/src/base/ftbitmap.c similarity index 100% rename from src/helper/freetype2/src/base/ftbitmap.c rename to src/eepp/helper/freetype2/src/base/ftbitmap.c diff --git a/src/helper/freetype2/src/base/ftcalc.c b/src/eepp/helper/freetype2/src/base/ftcalc.c similarity index 100% rename from src/helper/freetype2/src/base/ftcalc.c rename to src/eepp/helper/freetype2/src/base/ftcalc.c diff --git a/src/helper/freetype2/src/base/ftcid.c b/src/eepp/helper/freetype2/src/base/ftcid.c similarity index 100% rename from src/helper/freetype2/src/base/ftcid.c rename to src/eepp/helper/freetype2/src/base/ftcid.c diff --git a/src/helper/freetype2/src/base/ftdbgmem.c b/src/eepp/helper/freetype2/src/base/ftdbgmem.c similarity index 100% rename from src/helper/freetype2/src/base/ftdbgmem.c rename to src/eepp/helper/freetype2/src/base/ftdbgmem.c diff --git a/src/helper/freetype2/src/base/ftdebug.c b/src/eepp/helper/freetype2/src/base/ftdebug.c similarity index 100% rename from src/helper/freetype2/src/base/ftdebug.c rename to src/eepp/helper/freetype2/src/base/ftdebug.c diff --git a/src/helper/freetype2/src/base/ftfstype.c b/src/eepp/helper/freetype2/src/base/ftfstype.c similarity index 100% rename from src/helper/freetype2/src/base/ftfstype.c rename to src/eepp/helper/freetype2/src/base/ftfstype.c diff --git a/src/helper/freetype2/src/base/ftgasp.c b/src/eepp/helper/freetype2/src/base/ftgasp.c similarity index 100% rename from src/helper/freetype2/src/base/ftgasp.c rename to src/eepp/helper/freetype2/src/base/ftgasp.c diff --git a/src/helper/freetype2/src/base/ftgloadr.c b/src/eepp/helper/freetype2/src/base/ftgloadr.c similarity index 100% rename from src/helper/freetype2/src/base/ftgloadr.c rename to src/eepp/helper/freetype2/src/base/ftgloadr.c diff --git a/src/helper/freetype2/src/base/ftglyph.c b/src/eepp/helper/freetype2/src/base/ftglyph.c similarity index 100% rename from src/helper/freetype2/src/base/ftglyph.c rename to src/eepp/helper/freetype2/src/base/ftglyph.c diff --git a/src/helper/freetype2/src/base/ftgxval.c b/src/eepp/helper/freetype2/src/base/ftgxval.c similarity index 100% rename from src/helper/freetype2/src/base/ftgxval.c rename to src/eepp/helper/freetype2/src/base/ftgxval.c diff --git a/src/helper/freetype2/src/base/ftinit.c b/src/eepp/helper/freetype2/src/base/ftinit.c similarity index 100% rename from src/helper/freetype2/src/base/ftinit.c rename to src/eepp/helper/freetype2/src/base/ftinit.c diff --git a/src/helper/freetype2/src/base/ftlcdfil.c b/src/eepp/helper/freetype2/src/base/ftlcdfil.c similarity index 100% rename from src/helper/freetype2/src/base/ftlcdfil.c rename to src/eepp/helper/freetype2/src/base/ftlcdfil.c diff --git a/src/helper/freetype2/src/base/ftmm.c b/src/eepp/helper/freetype2/src/base/ftmm.c similarity index 100% rename from src/helper/freetype2/src/base/ftmm.c rename to src/eepp/helper/freetype2/src/base/ftmm.c diff --git a/src/helper/freetype2/src/base/ftobjs.c b/src/eepp/helper/freetype2/src/base/ftobjs.c similarity index 100% rename from src/helper/freetype2/src/base/ftobjs.c rename to src/eepp/helper/freetype2/src/base/ftobjs.c diff --git a/src/helper/freetype2/src/base/ftotval.c b/src/eepp/helper/freetype2/src/base/ftotval.c similarity index 100% rename from src/helper/freetype2/src/base/ftotval.c rename to src/eepp/helper/freetype2/src/base/ftotval.c diff --git a/src/helper/freetype2/src/base/ftoutln.c b/src/eepp/helper/freetype2/src/base/ftoutln.c similarity index 100% rename from src/helper/freetype2/src/base/ftoutln.c rename to src/eepp/helper/freetype2/src/base/ftoutln.c diff --git a/src/helper/freetype2/src/base/ftpatent.c b/src/eepp/helper/freetype2/src/base/ftpatent.c similarity index 100% rename from src/helper/freetype2/src/base/ftpatent.c rename to src/eepp/helper/freetype2/src/base/ftpatent.c diff --git a/src/helper/freetype2/src/base/ftpfr.c b/src/eepp/helper/freetype2/src/base/ftpfr.c similarity index 100% rename from src/helper/freetype2/src/base/ftpfr.c rename to src/eepp/helper/freetype2/src/base/ftpfr.c diff --git a/src/helper/freetype2/src/base/ftpic.c b/src/eepp/helper/freetype2/src/base/ftpic.c similarity index 100% rename from src/helper/freetype2/src/base/ftpic.c rename to src/eepp/helper/freetype2/src/base/ftpic.c diff --git a/src/helper/freetype2/src/base/ftrfork.c b/src/eepp/helper/freetype2/src/base/ftrfork.c similarity index 100% rename from src/helper/freetype2/src/base/ftrfork.c rename to src/eepp/helper/freetype2/src/base/ftrfork.c diff --git a/src/helper/freetype2/src/base/ftsnames.c b/src/eepp/helper/freetype2/src/base/ftsnames.c similarity index 100% rename from src/helper/freetype2/src/base/ftsnames.c rename to src/eepp/helper/freetype2/src/base/ftsnames.c diff --git a/src/helper/freetype2/src/base/ftstream.c b/src/eepp/helper/freetype2/src/base/ftstream.c similarity index 100% rename from src/helper/freetype2/src/base/ftstream.c rename to src/eepp/helper/freetype2/src/base/ftstream.c diff --git a/src/helper/freetype2/src/base/ftstroke.c b/src/eepp/helper/freetype2/src/base/ftstroke.c similarity index 100% rename from src/helper/freetype2/src/base/ftstroke.c rename to src/eepp/helper/freetype2/src/base/ftstroke.c diff --git a/src/helper/freetype2/src/base/ftsynth.c b/src/eepp/helper/freetype2/src/base/ftsynth.c similarity index 100% rename from src/helper/freetype2/src/base/ftsynth.c rename to src/eepp/helper/freetype2/src/base/ftsynth.c diff --git a/src/helper/freetype2/src/base/ftsystem.c b/src/eepp/helper/freetype2/src/base/ftsystem.c similarity index 100% rename from src/helper/freetype2/src/base/ftsystem.c rename to src/eepp/helper/freetype2/src/base/ftsystem.c diff --git a/src/helper/freetype2/src/base/fttrigon.c b/src/eepp/helper/freetype2/src/base/fttrigon.c similarity index 100% rename from src/helper/freetype2/src/base/fttrigon.c rename to src/eepp/helper/freetype2/src/base/fttrigon.c diff --git a/src/helper/freetype2/src/base/fttype1.c b/src/eepp/helper/freetype2/src/base/fttype1.c similarity index 100% rename from src/helper/freetype2/src/base/fttype1.c rename to src/eepp/helper/freetype2/src/base/fttype1.c diff --git a/src/helper/freetype2/src/base/ftutil.c b/src/eepp/helper/freetype2/src/base/ftutil.c similarity index 100% rename from src/helper/freetype2/src/base/ftutil.c rename to src/eepp/helper/freetype2/src/base/ftutil.c diff --git a/src/helper/freetype2/src/base/ftwinfnt.c b/src/eepp/helper/freetype2/src/base/ftwinfnt.c similarity index 100% rename from src/helper/freetype2/src/base/ftwinfnt.c rename to src/eepp/helper/freetype2/src/base/ftwinfnt.c diff --git a/src/helper/freetype2/src/base/ftxf86.c b/src/eepp/helper/freetype2/src/base/ftxf86.c similarity index 100% rename from src/helper/freetype2/src/base/ftxf86.c rename to src/eepp/helper/freetype2/src/base/ftxf86.c diff --git a/src/helper/freetype2/src/base/rules.mk b/src/eepp/helper/freetype2/src/base/rules.mk similarity index 100% rename from src/helper/freetype2/src/base/rules.mk rename to src/eepp/helper/freetype2/src/base/rules.mk diff --git a/src/helper/freetype2/src/bdf/Jamfile b/src/eepp/helper/freetype2/src/bdf/Jamfile similarity index 100% rename from src/helper/freetype2/src/bdf/Jamfile rename to src/eepp/helper/freetype2/src/bdf/Jamfile diff --git a/src/helper/freetype2/src/bdf/README b/src/eepp/helper/freetype2/src/bdf/README similarity index 100% rename from src/helper/freetype2/src/bdf/README rename to src/eepp/helper/freetype2/src/bdf/README diff --git a/src/helper/freetype2/src/bdf/bdf.h b/src/eepp/helper/freetype2/src/bdf/bdf.h similarity index 100% rename from src/helper/freetype2/src/bdf/bdf.h rename to src/eepp/helper/freetype2/src/bdf/bdf.h diff --git a/src/helper/freetype2/src/bdf/bdfdrivr.c b/src/eepp/helper/freetype2/src/bdf/bdfdrivr.c similarity index 100% rename from src/helper/freetype2/src/bdf/bdfdrivr.c rename to src/eepp/helper/freetype2/src/bdf/bdfdrivr.c diff --git a/src/helper/freetype2/src/bdf/bdfdrivr.h b/src/eepp/helper/freetype2/src/bdf/bdfdrivr.h similarity index 100% rename from src/helper/freetype2/src/bdf/bdfdrivr.h rename to src/eepp/helper/freetype2/src/bdf/bdfdrivr.h diff --git a/src/helper/freetype2/src/bdf/bdferror.h b/src/eepp/helper/freetype2/src/bdf/bdferror.h similarity index 100% rename from src/helper/freetype2/src/bdf/bdferror.h rename to src/eepp/helper/freetype2/src/bdf/bdferror.h diff --git a/src/helper/freetype2/src/bdf/bdflib.c b/src/eepp/helper/freetype2/src/bdf/bdflib.c similarity index 100% rename from src/helper/freetype2/src/bdf/bdflib.c rename to src/eepp/helper/freetype2/src/bdf/bdflib.c diff --git a/src/helper/freetype2/src/bdf/module.mk b/src/eepp/helper/freetype2/src/bdf/module.mk similarity index 100% rename from src/helper/freetype2/src/bdf/module.mk rename to src/eepp/helper/freetype2/src/bdf/module.mk diff --git a/src/helper/freetype2/src/bdf/rules.mk b/src/eepp/helper/freetype2/src/bdf/rules.mk similarity index 100% rename from src/helper/freetype2/src/bdf/rules.mk rename to src/eepp/helper/freetype2/src/bdf/rules.mk diff --git a/src/helper/freetype2/src/bzip2/Jamfile b/src/eepp/helper/freetype2/src/bzip2/Jamfile similarity index 100% rename from src/helper/freetype2/src/bzip2/Jamfile rename to src/eepp/helper/freetype2/src/bzip2/Jamfile diff --git a/src/helper/freetype2/src/bzip2/ftbzip2.c b/src/eepp/helper/freetype2/src/bzip2/ftbzip2.c similarity index 100% rename from src/helper/freetype2/src/bzip2/ftbzip2.c rename to src/eepp/helper/freetype2/src/bzip2/ftbzip2.c diff --git a/src/helper/freetype2/src/bzip2/rules.mk b/src/eepp/helper/freetype2/src/bzip2/rules.mk similarity index 100% rename from src/helper/freetype2/src/bzip2/rules.mk rename to src/eepp/helper/freetype2/src/bzip2/rules.mk diff --git a/src/helper/freetype2/src/cache/Jamfile b/src/eepp/helper/freetype2/src/cache/Jamfile similarity index 100% rename from src/helper/freetype2/src/cache/Jamfile rename to src/eepp/helper/freetype2/src/cache/Jamfile diff --git a/src/helper/freetype2/src/cache/ftcbasic.c b/src/eepp/helper/freetype2/src/cache/ftcbasic.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcbasic.c rename to src/eepp/helper/freetype2/src/cache/ftcbasic.c diff --git a/src/helper/freetype2/src/cache/ftccache.c b/src/eepp/helper/freetype2/src/cache/ftccache.c similarity index 100% rename from src/helper/freetype2/src/cache/ftccache.c rename to src/eepp/helper/freetype2/src/cache/ftccache.c diff --git a/src/helper/freetype2/src/cache/ftccache.h b/src/eepp/helper/freetype2/src/cache/ftccache.h similarity index 100% rename from src/helper/freetype2/src/cache/ftccache.h rename to src/eepp/helper/freetype2/src/cache/ftccache.h diff --git a/src/helper/freetype2/src/cache/ftccback.h b/src/eepp/helper/freetype2/src/cache/ftccback.h similarity index 100% rename from src/helper/freetype2/src/cache/ftccback.h rename to src/eepp/helper/freetype2/src/cache/ftccback.h diff --git a/src/helper/freetype2/src/cache/ftccmap.c b/src/eepp/helper/freetype2/src/cache/ftccmap.c similarity index 100% rename from src/helper/freetype2/src/cache/ftccmap.c rename to src/eepp/helper/freetype2/src/cache/ftccmap.c diff --git a/src/helper/freetype2/src/cache/ftcerror.h b/src/eepp/helper/freetype2/src/cache/ftcerror.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcerror.h rename to src/eepp/helper/freetype2/src/cache/ftcerror.h diff --git a/src/helper/freetype2/src/cache/ftcglyph.c b/src/eepp/helper/freetype2/src/cache/ftcglyph.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcglyph.c rename to src/eepp/helper/freetype2/src/cache/ftcglyph.c diff --git a/src/helper/freetype2/src/cache/ftcglyph.h b/src/eepp/helper/freetype2/src/cache/ftcglyph.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcglyph.h rename to src/eepp/helper/freetype2/src/cache/ftcglyph.h diff --git a/src/helper/freetype2/src/cache/ftcimage.c b/src/eepp/helper/freetype2/src/cache/ftcimage.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcimage.c rename to src/eepp/helper/freetype2/src/cache/ftcimage.c diff --git a/src/helper/freetype2/src/cache/ftcimage.h b/src/eepp/helper/freetype2/src/cache/ftcimage.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcimage.h rename to src/eepp/helper/freetype2/src/cache/ftcimage.h diff --git a/src/helper/freetype2/src/cache/ftcmanag.c b/src/eepp/helper/freetype2/src/cache/ftcmanag.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcmanag.c rename to src/eepp/helper/freetype2/src/cache/ftcmanag.c diff --git a/src/helper/freetype2/src/cache/ftcmanag.h b/src/eepp/helper/freetype2/src/cache/ftcmanag.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcmanag.h rename to src/eepp/helper/freetype2/src/cache/ftcmanag.h diff --git a/src/helper/freetype2/src/cache/ftcmru.c b/src/eepp/helper/freetype2/src/cache/ftcmru.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcmru.c rename to src/eepp/helper/freetype2/src/cache/ftcmru.c diff --git a/src/helper/freetype2/src/cache/ftcmru.h b/src/eepp/helper/freetype2/src/cache/ftcmru.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcmru.h rename to src/eepp/helper/freetype2/src/cache/ftcmru.h diff --git a/src/helper/freetype2/src/cache/ftcsbits.c b/src/eepp/helper/freetype2/src/cache/ftcsbits.c similarity index 100% rename from src/helper/freetype2/src/cache/ftcsbits.c rename to src/eepp/helper/freetype2/src/cache/ftcsbits.c diff --git a/src/helper/freetype2/src/cache/ftcsbits.h b/src/eepp/helper/freetype2/src/cache/ftcsbits.h similarity index 100% rename from src/helper/freetype2/src/cache/ftcsbits.h rename to src/eepp/helper/freetype2/src/cache/ftcsbits.h diff --git a/src/helper/freetype2/src/cache/rules.mk b/src/eepp/helper/freetype2/src/cache/rules.mk similarity index 100% rename from src/helper/freetype2/src/cache/rules.mk rename to src/eepp/helper/freetype2/src/cache/rules.mk diff --git a/src/helper/freetype2/src/cff/Jamfile b/src/eepp/helper/freetype2/src/cff/Jamfile similarity index 100% rename from src/helper/freetype2/src/cff/Jamfile rename to src/eepp/helper/freetype2/src/cff/Jamfile diff --git a/src/helper/freetype2/src/cff/cffcmap.c b/src/eepp/helper/freetype2/src/cff/cffcmap.c similarity index 100% rename from src/helper/freetype2/src/cff/cffcmap.c rename to src/eepp/helper/freetype2/src/cff/cffcmap.c diff --git a/src/helper/freetype2/src/cff/cffcmap.h b/src/eepp/helper/freetype2/src/cff/cffcmap.h similarity index 100% rename from src/helper/freetype2/src/cff/cffcmap.h rename to src/eepp/helper/freetype2/src/cff/cffcmap.h diff --git a/src/helper/freetype2/src/cff/cffdrivr.c b/src/eepp/helper/freetype2/src/cff/cffdrivr.c similarity index 100% rename from src/helper/freetype2/src/cff/cffdrivr.c rename to src/eepp/helper/freetype2/src/cff/cffdrivr.c diff --git a/src/helper/freetype2/src/cff/cffdrivr.h b/src/eepp/helper/freetype2/src/cff/cffdrivr.h similarity index 100% rename from src/helper/freetype2/src/cff/cffdrivr.h rename to src/eepp/helper/freetype2/src/cff/cffdrivr.h diff --git a/src/helper/freetype2/src/cff/cfferrs.h b/src/eepp/helper/freetype2/src/cff/cfferrs.h similarity index 100% rename from src/helper/freetype2/src/cff/cfferrs.h rename to src/eepp/helper/freetype2/src/cff/cfferrs.h diff --git a/src/helper/freetype2/src/cff/cffgload.c b/src/eepp/helper/freetype2/src/cff/cffgload.c similarity index 100% rename from src/helper/freetype2/src/cff/cffgload.c rename to src/eepp/helper/freetype2/src/cff/cffgload.c diff --git a/src/helper/freetype2/src/cff/cffgload.h b/src/eepp/helper/freetype2/src/cff/cffgload.h similarity index 100% rename from src/helper/freetype2/src/cff/cffgload.h rename to src/eepp/helper/freetype2/src/cff/cffgload.h diff --git a/src/helper/freetype2/src/cff/cffload.c b/src/eepp/helper/freetype2/src/cff/cffload.c similarity index 100% rename from src/helper/freetype2/src/cff/cffload.c rename to src/eepp/helper/freetype2/src/cff/cffload.c diff --git a/src/helper/freetype2/src/cff/cffload.h b/src/eepp/helper/freetype2/src/cff/cffload.h similarity index 100% rename from src/helper/freetype2/src/cff/cffload.h rename to src/eepp/helper/freetype2/src/cff/cffload.h diff --git a/src/helper/freetype2/src/cff/cffobjs.c b/src/eepp/helper/freetype2/src/cff/cffobjs.c similarity index 100% rename from src/helper/freetype2/src/cff/cffobjs.c rename to src/eepp/helper/freetype2/src/cff/cffobjs.c diff --git a/src/helper/freetype2/src/cff/cffobjs.h b/src/eepp/helper/freetype2/src/cff/cffobjs.h similarity index 100% rename from src/helper/freetype2/src/cff/cffobjs.h rename to src/eepp/helper/freetype2/src/cff/cffobjs.h diff --git a/src/helper/freetype2/src/cff/cffparse.c b/src/eepp/helper/freetype2/src/cff/cffparse.c similarity index 100% rename from src/helper/freetype2/src/cff/cffparse.c rename to src/eepp/helper/freetype2/src/cff/cffparse.c diff --git a/src/helper/freetype2/src/cff/cffparse.h b/src/eepp/helper/freetype2/src/cff/cffparse.h similarity index 100% rename from src/helper/freetype2/src/cff/cffparse.h rename to src/eepp/helper/freetype2/src/cff/cffparse.h diff --git a/src/helper/freetype2/src/cff/cffpic.c b/src/eepp/helper/freetype2/src/cff/cffpic.c similarity index 100% rename from src/helper/freetype2/src/cff/cffpic.c rename to src/eepp/helper/freetype2/src/cff/cffpic.c diff --git a/src/helper/freetype2/src/cff/cffpic.h b/src/eepp/helper/freetype2/src/cff/cffpic.h similarity index 100% rename from src/helper/freetype2/src/cff/cffpic.h rename to src/eepp/helper/freetype2/src/cff/cffpic.h diff --git a/src/helper/freetype2/src/cff/cfftoken.h b/src/eepp/helper/freetype2/src/cff/cfftoken.h similarity index 100% rename from src/helper/freetype2/src/cff/cfftoken.h rename to src/eepp/helper/freetype2/src/cff/cfftoken.h diff --git a/src/helper/freetype2/src/cff/cfftypes.h b/src/eepp/helper/freetype2/src/cff/cfftypes.h similarity index 100% rename from src/helper/freetype2/src/cff/cfftypes.h rename to src/eepp/helper/freetype2/src/cff/cfftypes.h diff --git a/src/helper/freetype2/src/cff/module.mk b/src/eepp/helper/freetype2/src/cff/module.mk similarity index 100% rename from src/helper/freetype2/src/cff/module.mk rename to src/eepp/helper/freetype2/src/cff/module.mk diff --git a/src/helper/freetype2/src/cff/rules.mk b/src/eepp/helper/freetype2/src/cff/rules.mk similarity index 100% rename from src/helper/freetype2/src/cff/rules.mk rename to src/eepp/helper/freetype2/src/cff/rules.mk diff --git a/src/helper/freetype2/src/cid/Jamfile b/src/eepp/helper/freetype2/src/cid/Jamfile similarity index 100% rename from src/helper/freetype2/src/cid/Jamfile rename to src/eepp/helper/freetype2/src/cid/Jamfile diff --git a/src/helper/freetype2/src/cid/ciderrs.h b/src/eepp/helper/freetype2/src/cid/ciderrs.h similarity index 100% rename from src/helper/freetype2/src/cid/ciderrs.h rename to src/eepp/helper/freetype2/src/cid/ciderrs.h diff --git a/src/helper/freetype2/src/cid/cidgload.c b/src/eepp/helper/freetype2/src/cid/cidgload.c similarity index 100% rename from src/helper/freetype2/src/cid/cidgload.c rename to src/eepp/helper/freetype2/src/cid/cidgload.c diff --git a/src/helper/freetype2/src/cid/cidgload.h b/src/eepp/helper/freetype2/src/cid/cidgload.h similarity index 100% rename from src/helper/freetype2/src/cid/cidgload.h rename to src/eepp/helper/freetype2/src/cid/cidgload.h diff --git a/src/helper/freetype2/src/cid/cidload.c b/src/eepp/helper/freetype2/src/cid/cidload.c similarity index 100% rename from src/helper/freetype2/src/cid/cidload.c rename to src/eepp/helper/freetype2/src/cid/cidload.c diff --git a/src/helper/freetype2/src/cid/cidload.h b/src/eepp/helper/freetype2/src/cid/cidload.h similarity index 100% rename from src/helper/freetype2/src/cid/cidload.h rename to src/eepp/helper/freetype2/src/cid/cidload.h diff --git a/src/helper/freetype2/src/cid/cidobjs.c b/src/eepp/helper/freetype2/src/cid/cidobjs.c similarity index 100% rename from src/helper/freetype2/src/cid/cidobjs.c rename to src/eepp/helper/freetype2/src/cid/cidobjs.c diff --git a/src/helper/freetype2/src/cid/cidobjs.h b/src/eepp/helper/freetype2/src/cid/cidobjs.h similarity index 100% rename from src/helper/freetype2/src/cid/cidobjs.h rename to src/eepp/helper/freetype2/src/cid/cidobjs.h diff --git a/src/helper/freetype2/src/cid/cidparse.c b/src/eepp/helper/freetype2/src/cid/cidparse.c similarity index 100% rename from src/helper/freetype2/src/cid/cidparse.c rename to src/eepp/helper/freetype2/src/cid/cidparse.c diff --git a/src/helper/freetype2/src/cid/cidparse.h b/src/eepp/helper/freetype2/src/cid/cidparse.h similarity index 100% rename from src/helper/freetype2/src/cid/cidparse.h rename to src/eepp/helper/freetype2/src/cid/cidparse.h diff --git a/src/helper/freetype2/src/cid/cidriver.c b/src/eepp/helper/freetype2/src/cid/cidriver.c similarity index 100% rename from src/helper/freetype2/src/cid/cidriver.c rename to src/eepp/helper/freetype2/src/cid/cidriver.c diff --git a/src/helper/freetype2/src/cid/cidriver.h b/src/eepp/helper/freetype2/src/cid/cidriver.h similarity index 100% rename from src/helper/freetype2/src/cid/cidriver.h rename to src/eepp/helper/freetype2/src/cid/cidriver.h diff --git a/src/helper/freetype2/src/cid/cidtoken.h b/src/eepp/helper/freetype2/src/cid/cidtoken.h similarity index 100% rename from src/helper/freetype2/src/cid/cidtoken.h rename to src/eepp/helper/freetype2/src/cid/cidtoken.h diff --git a/src/helper/freetype2/src/cid/module.mk b/src/eepp/helper/freetype2/src/cid/module.mk similarity index 100% rename from src/helper/freetype2/src/cid/module.mk rename to src/eepp/helper/freetype2/src/cid/module.mk diff --git a/src/helper/freetype2/src/cid/rules.mk b/src/eepp/helper/freetype2/src/cid/rules.mk similarity index 100% rename from src/helper/freetype2/src/cid/rules.mk rename to src/eepp/helper/freetype2/src/cid/rules.mk diff --git a/src/helper/freetype2/src/gxvalid/Jamfile b/src/eepp/helper/freetype2/src/gxvalid/Jamfile similarity index 100% rename from src/helper/freetype2/src/gxvalid/Jamfile rename to src/eepp/helper/freetype2/src/gxvalid/Jamfile diff --git a/src/helper/freetype2/src/gxvalid/README b/src/eepp/helper/freetype2/src/gxvalid/README similarity index 100% rename from src/helper/freetype2/src/gxvalid/README rename to src/eepp/helper/freetype2/src/gxvalid/README diff --git a/src/helper/freetype2/src/gxvalid/gxvalid.h b/src/eepp/helper/freetype2/src/gxvalid/gxvalid.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvalid.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvalid.h diff --git a/src/helper/freetype2/src/gxvalid/gxvbsln.c b/src/eepp/helper/freetype2/src/gxvalid/gxvbsln.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvbsln.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvbsln.c diff --git a/src/helper/freetype2/src/gxvalid/gxvcommn.c b/src/eepp/helper/freetype2/src/gxvalid/gxvcommn.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvcommn.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvcommn.c diff --git a/src/helper/freetype2/src/gxvalid/gxvcommn.h b/src/eepp/helper/freetype2/src/gxvalid/gxvcommn.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvcommn.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvcommn.h diff --git a/src/helper/freetype2/src/gxvalid/gxverror.h b/src/eepp/helper/freetype2/src/gxvalid/gxverror.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxverror.h rename to src/eepp/helper/freetype2/src/gxvalid/gxverror.h diff --git a/src/helper/freetype2/src/gxvalid/gxvfeat.c b/src/eepp/helper/freetype2/src/gxvalid/gxvfeat.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvfeat.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvfeat.c diff --git a/src/helper/freetype2/src/gxvalid/gxvfeat.h b/src/eepp/helper/freetype2/src/gxvalid/gxvfeat.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvfeat.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvfeat.h diff --git a/src/helper/freetype2/src/gxvalid/gxvjust.c b/src/eepp/helper/freetype2/src/gxvalid/gxvjust.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvjust.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvjust.c diff --git a/src/helper/freetype2/src/gxvalid/gxvkern.c b/src/eepp/helper/freetype2/src/gxvalid/gxvkern.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvkern.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvkern.c diff --git a/src/helper/freetype2/src/gxvalid/gxvlcar.c b/src/eepp/helper/freetype2/src/gxvalid/gxvlcar.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvlcar.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvlcar.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmod.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmod.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmod.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmod.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmod.h b/src/eepp/helper/freetype2/src/gxvalid/gxvmod.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmod.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvmod.h diff --git a/src/helper/freetype2/src/gxvalid/gxvmort.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmort.h b/src/eepp/helper/freetype2/src/gxvalid/gxvmort.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort.h diff --git a/src/helper/freetype2/src/gxvalid/gxvmort0.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort0.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort0.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort0.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmort1.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort1.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort1.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort1.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmort2.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort2.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort2.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort2.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmort4.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort4.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort4.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort4.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmort5.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmort5.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmort5.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmort5.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx.h b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx.h similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx.h rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx.h diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx0.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx0.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx0.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx0.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx1.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx1.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx1.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx1.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx2.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx2.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx2.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx2.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx4.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx4.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx4.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx4.c diff --git a/src/helper/freetype2/src/gxvalid/gxvmorx5.c b/src/eepp/helper/freetype2/src/gxvalid/gxvmorx5.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvmorx5.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvmorx5.c diff --git a/src/helper/freetype2/src/gxvalid/gxvopbd.c b/src/eepp/helper/freetype2/src/gxvalid/gxvopbd.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvopbd.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvopbd.c diff --git a/src/helper/freetype2/src/gxvalid/gxvprop.c b/src/eepp/helper/freetype2/src/gxvalid/gxvprop.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvprop.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvprop.c diff --git a/src/helper/freetype2/src/gxvalid/gxvtrak.c b/src/eepp/helper/freetype2/src/gxvalid/gxvtrak.c similarity index 100% rename from src/helper/freetype2/src/gxvalid/gxvtrak.c rename to src/eepp/helper/freetype2/src/gxvalid/gxvtrak.c diff --git a/src/helper/freetype2/src/gxvalid/module.mk b/src/eepp/helper/freetype2/src/gxvalid/module.mk similarity index 100% rename from src/helper/freetype2/src/gxvalid/module.mk rename to src/eepp/helper/freetype2/src/gxvalid/module.mk diff --git a/src/helper/freetype2/src/gxvalid/rules.mk b/src/eepp/helper/freetype2/src/gxvalid/rules.mk similarity index 100% rename from src/helper/freetype2/src/gxvalid/rules.mk rename to src/eepp/helper/freetype2/src/gxvalid/rules.mk diff --git a/src/helper/freetype2/src/gzip/Jamfile b/src/eepp/helper/freetype2/src/gzip/Jamfile similarity index 100% rename from src/helper/freetype2/src/gzip/Jamfile rename to src/eepp/helper/freetype2/src/gzip/Jamfile diff --git a/src/helper/freetype2/src/gzip/ftgzip.c b/src/eepp/helper/freetype2/src/gzip/ftgzip.c similarity index 100% rename from src/helper/freetype2/src/gzip/ftgzip.c rename to src/eepp/helper/freetype2/src/gzip/ftgzip.c diff --git a/src/helper/freetype2/src/gzip/rules.mk b/src/eepp/helper/freetype2/src/gzip/rules.mk similarity index 100% rename from src/helper/freetype2/src/gzip/rules.mk rename to src/eepp/helper/freetype2/src/gzip/rules.mk diff --git a/src/helper/freetype2/src/lzw/Jamfile b/src/eepp/helper/freetype2/src/lzw/Jamfile similarity index 100% rename from src/helper/freetype2/src/lzw/Jamfile rename to src/eepp/helper/freetype2/src/lzw/Jamfile diff --git a/src/helper/freetype2/src/lzw/ftlzw.c b/src/eepp/helper/freetype2/src/lzw/ftlzw.c similarity index 100% rename from src/helper/freetype2/src/lzw/ftlzw.c rename to src/eepp/helper/freetype2/src/lzw/ftlzw.c diff --git a/src/helper/freetype2/src/lzw/ftzopen.c b/src/eepp/helper/freetype2/src/lzw/ftzopen.c similarity index 100% rename from src/helper/freetype2/src/lzw/ftzopen.c rename to src/eepp/helper/freetype2/src/lzw/ftzopen.c diff --git a/src/helper/freetype2/src/lzw/ftzopen.h b/src/eepp/helper/freetype2/src/lzw/ftzopen.h similarity index 100% rename from src/helper/freetype2/src/lzw/ftzopen.h rename to src/eepp/helper/freetype2/src/lzw/ftzopen.h diff --git a/src/helper/freetype2/src/lzw/rules.mk b/src/eepp/helper/freetype2/src/lzw/rules.mk similarity index 100% rename from src/helper/freetype2/src/lzw/rules.mk rename to src/eepp/helper/freetype2/src/lzw/rules.mk diff --git a/src/helper/freetype2/src/otvalid/Jamfile b/src/eepp/helper/freetype2/src/otvalid/Jamfile similarity index 100% rename from src/helper/freetype2/src/otvalid/Jamfile rename to src/eepp/helper/freetype2/src/otvalid/Jamfile diff --git a/src/helper/freetype2/src/otvalid/module.mk b/src/eepp/helper/freetype2/src/otvalid/module.mk similarity index 100% rename from src/helper/freetype2/src/otvalid/module.mk rename to src/eepp/helper/freetype2/src/otvalid/module.mk diff --git a/src/helper/freetype2/src/otvalid/otvalid.h b/src/eepp/helper/freetype2/src/otvalid/otvalid.h similarity index 100% rename from src/helper/freetype2/src/otvalid/otvalid.h rename to src/eepp/helper/freetype2/src/otvalid/otvalid.h diff --git a/src/helper/freetype2/src/otvalid/otvbase.c b/src/eepp/helper/freetype2/src/otvalid/otvbase.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvbase.c rename to src/eepp/helper/freetype2/src/otvalid/otvbase.c diff --git a/src/helper/freetype2/src/otvalid/otvcommn.c b/src/eepp/helper/freetype2/src/otvalid/otvcommn.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvcommn.c rename to src/eepp/helper/freetype2/src/otvalid/otvcommn.c diff --git a/src/helper/freetype2/src/otvalid/otvcommn.h b/src/eepp/helper/freetype2/src/otvalid/otvcommn.h similarity index 100% rename from src/helper/freetype2/src/otvalid/otvcommn.h rename to src/eepp/helper/freetype2/src/otvalid/otvcommn.h diff --git a/src/helper/freetype2/src/otvalid/otverror.h b/src/eepp/helper/freetype2/src/otvalid/otverror.h similarity index 100% rename from src/helper/freetype2/src/otvalid/otverror.h rename to src/eepp/helper/freetype2/src/otvalid/otverror.h diff --git a/src/helper/freetype2/src/otvalid/otvgdef.c b/src/eepp/helper/freetype2/src/otvalid/otvgdef.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvgdef.c rename to src/eepp/helper/freetype2/src/otvalid/otvgdef.c diff --git a/src/helper/freetype2/src/otvalid/otvgpos.c b/src/eepp/helper/freetype2/src/otvalid/otvgpos.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvgpos.c rename to src/eepp/helper/freetype2/src/otvalid/otvgpos.c diff --git a/src/helper/freetype2/src/otvalid/otvgpos.h b/src/eepp/helper/freetype2/src/otvalid/otvgpos.h similarity index 100% rename from src/helper/freetype2/src/otvalid/otvgpos.h rename to src/eepp/helper/freetype2/src/otvalid/otvgpos.h diff --git a/src/helper/freetype2/src/otvalid/otvgsub.c b/src/eepp/helper/freetype2/src/otvalid/otvgsub.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvgsub.c rename to src/eepp/helper/freetype2/src/otvalid/otvgsub.c diff --git a/src/helper/freetype2/src/otvalid/otvjstf.c b/src/eepp/helper/freetype2/src/otvalid/otvjstf.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvjstf.c rename to src/eepp/helper/freetype2/src/otvalid/otvjstf.c diff --git a/src/helper/freetype2/src/otvalid/otvmath.c b/src/eepp/helper/freetype2/src/otvalid/otvmath.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvmath.c rename to src/eepp/helper/freetype2/src/otvalid/otvmath.c diff --git a/src/helper/freetype2/src/otvalid/otvmod.c b/src/eepp/helper/freetype2/src/otvalid/otvmod.c similarity index 100% rename from src/helper/freetype2/src/otvalid/otvmod.c rename to src/eepp/helper/freetype2/src/otvalid/otvmod.c diff --git a/src/helper/freetype2/src/otvalid/otvmod.h b/src/eepp/helper/freetype2/src/otvalid/otvmod.h similarity index 100% rename from src/helper/freetype2/src/otvalid/otvmod.h rename to src/eepp/helper/freetype2/src/otvalid/otvmod.h diff --git a/src/helper/freetype2/src/otvalid/rules.mk b/src/eepp/helper/freetype2/src/otvalid/rules.mk similarity index 100% rename from src/helper/freetype2/src/otvalid/rules.mk rename to src/eepp/helper/freetype2/src/otvalid/rules.mk diff --git a/src/helper/freetype2/src/pcf/Jamfile b/src/eepp/helper/freetype2/src/pcf/Jamfile similarity index 100% rename from src/helper/freetype2/src/pcf/Jamfile rename to src/eepp/helper/freetype2/src/pcf/Jamfile diff --git a/src/helper/freetype2/src/pcf/README b/src/eepp/helper/freetype2/src/pcf/README similarity index 100% rename from src/helper/freetype2/src/pcf/README rename to src/eepp/helper/freetype2/src/pcf/README diff --git a/src/helper/freetype2/src/pcf/module.mk b/src/eepp/helper/freetype2/src/pcf/module.mk similarity index 100% rename from src/helper/freetype2/src/pcf/module.mk rename to src/eepp/helper/freetype2/src/pcf/module.mk diff --git a/src/helper/freetype2/src/pcf/pcf.h b/src/eepp/helper/freetype2/src/pcf/pcf.h similarity index 100% rename from src/helper/freetype2/src/pcf/pcf.h rename to src/eepp/helper/freetype2/src/pcf/pcf.h diff --git a/src/helper/freetype2/src/pcf/pcfdrivr.c b/src/eepp/helper/freetype2/src/pcf/pcfdrivr.c similarity index 100% rename from src/helper/freetype2/src/pcf/pcfdrivr.c rename to src/eepp/helper/freetype2/src/pcf/pcfdrivr.c diff --git a/src/helper/freetype2/src/pcf/pcfdrivr.h b/src/eepp/helper/freetype2/src/pcf/pcfdrivr.h similarity index 100% rename from src/helper/freetype2/src/pcf/pcfdrivr.h rename to src/eepp/helper/freetype2/src/pcf/pcfdrivr.h diff --git a/src/helper/freetype2/src/pcf/pcferror.h b/src/eepp/helper/freetype2/src/pcf/pcferror.h similarity index 100% rename from src/helper/freetype2/src/pcf/pcferror.h rename to src/eepp/helper/freetype2/src/pcf/pcferror.h diff --git a/src/helper/freetype2/src/pcf/pcfread.c b/src/eepp/helper/freetype2/src/pcf/pcfread.c similarity index 100% rename from src/helper/freetype2/src/pcf/pcfread.c rename to src/eepp/helper/freetype2/src/pcf/pcfread.c diff --git a/src/helper/freetype2/src/pcf/pcfread.h b/src/eepp/helper/freetype2/src/pcf/pcfread.h similarity index 100% rename from src/helper/freetype2/src/pcf/pcfread.h rename to src/eepp/helper/freetype2/src/pcf/pcfread.h diff --git a/src/helper/freetype2/src/pcf/pcfutil.c b/src/eepp/helper/freetype2/src/pcf/pcfutil.c similarity index 100% rename from src/helper/freetype2/src/pcf/pcfutil.c rename to src/eepp/helper/freetype2/src/pcf/pcfutil.c diff --git a/src/helper/freetype2/src/pcf/pcfutil.h b/src/eepp/helper/freetype2/src/pcf/pcfutil.h similarity index 100% rename from src/helper/freetype2/src/pcf/pcfutil.h rename to src/eepp/helper/freetype2/src/pcf/pcfutil.h diff --git a/src/helper/freetype2/src/pcf/rules.mk b/src/eepp/helper/freetype2/src/pcf/rules.mk similarity index 100% rename from src/helper/freetype2/src/pcf/rules.mk rename to src/eepp/helper/freetype2/src/pcf/rules.mk diff --git a/src/helper/freetype2/src/pfr/Jamfile b/src/eepp/helper/freetype2/src/pfr/Jamfile similarity index 100% rename from src/helper/freetype2/src/pfr/Jamfile rename to src/eepp/helper/freetype2/src/pfr/Jamfile diff --git a/src/helper/freetype2/src/pfr/module.mk b/src/eepp/helper/freetype2/src/pfr/module.mk similarity index 100% rename from src/helper/freetype2/src/pfr/module.mk rename to src/eepp/helper/freetype2/src/pfr/module.mk diff --git a/src/helper/freetype2/src/pfr/pfrcmap.c b/src/eepp/helper/freetype2/src/pfr/pfrcmap.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrcmap.c rename to src/eepp/helper/freetype2/src/pfr/pfrcmap.c diff --git a/src/helper/freetype2/src/pfr/pfrcmap.h b/src/eepp/helper/freetype2/src/pfr/pfrcmap.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrcmap.h rename to src/eepp/helper/freetype2/src/pfr/pfrcmap.h diff --git a/src/helper/freetype2/src/pfr/pfrdrivr.c b/src/eepp/helper/freetype2/src/pfr/pfrdrivr.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrdrivr.c rename to src/eepp/helper/freetype2/src/pfr/pfrdrivr.c diff --git a/src/helper/freetype2/src/pfr/pfrdrivr.h b/src/eepp/helper/freetype2/src/pfr/pfrdrivr.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrdrivr.h rename to src/eepp/helper/freetype2/src/pfr/pfrdrivr.h diff --git a/src/helper/freetype2/src/pfr/pfrerror.h b/src/eepp/helper/freetype2/src/pfr/pfrerror.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrerror.h rename to src/eepp/helper/freetype2/src/pfr/pfrerror.h diff --git a/src/helper/freetype2/src/pfr/pfrgload.c b/src/eepp/helper/freetype2/src/pfr/pfrgload.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrgload.c rename to src/eepp/helper/freetype2/src/pfr/pfrgload.c diff --git a/src/helper/freetype2/src/pfr/pfrgload.h b/src/eepp/helper/freetype2/src/pfr/pfrgload.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrgload.h rename to src/eepp/helper/freetype2/src/pfr/pfrgload.h diff --git a/src/helper/freetype2/src/pfr/pfrload.c b/src/eepp/helper/freetype2/src/pfr/pfrload.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrload.c rename to src/eepp/helper/freetype2/src/pfr/pfrload.c diff --git a/src/helper/freetype2/src/pfr/pfrload.h b/src/eepp/helper/freetype2/src/pfr/pfrload.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrload.h rename to src/eepp/helper/freetype2/src/pfr/pfrload.h diff --git a/src/helper/freetype2/src/pfr/pfrobjs.c b/src/eepp/helper/freetype2/src/pfr/pfrobjs.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrobjs.c rename to src/eepp/helper/freetype2/src/pfr/pfrobjs.c diff --git a/src/helper/freetype2/src/pfr/pfrobjs.h b/src/eepp/helper/freetype2/src/pfr/pfrobjs.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrobjs.h rename to src/eepp/helper/freetype2/src/pfr/pfrobjs.h diff --git a/src/helper/freetype2/src/pfr/pfrsbit.c b/src/eepp/helper/freetype2/src/pfr/pfrsbit.c similarity index 100% rename from src/helper/freetype2/src/pfr/pfrsbit.c rename to src/eepp/helper/freetype2/src/pfr/pfrsbit.c diff --git a/src/helper/freetype2/src/pfr/pfrsbit.h b/src/eepp/helper/freetype2/src/pfr/pfrsbit.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrsbit.h rename to src/eepp/helper/freetype2/src/pfr/pfrsbit.h diff --git a/src/helper/freetype2/src/pfr/pfrtypes.h b/src/eepp/helper/freetype2/src/pfr/pfrtypes.h similarity index 100% rename from src/helper/freetype2/src/pfr/pfrtypes.h rename to src/eepp/helper/freetype2/src/pfr/pfrtypes.h diff --git a/src/helper/freetype2/src/pfr/rules.mk b/src/eepp/helper/freetype2/src/pfr/rules.mk similarity index 100% rename from src/helper/freetype2/src/pfr/rules.mk rename to src/eepp/helper/freetype2/src/pfr/rules.mk diff --git a/src/helper/freetype2/src/psaux/Jamfile b/src/eepp/helper/freetype2/src/psaux/Jamfile similarity index 100% rename from src/helper/freetype2/src/psaux/Jamfile rename to src/eepp/helper/freetype2/src/psaux/Jamfile diff --git a/src/helper/freetype2/src/psaux/afmparse.c b/src/eepp/helper/freetype2/src/psaux/afmparse.c similarity index 100% rename from src/helper/freetype2/src/psaux/afmparse.c rename to src/eepp/helper/freetype2/src/psaux/afmparse.c diff --git a/src/helper/freetype2/src/psaux/afmparse.h b/src/eepp/helper/freetype2/src/psaux/afmparse.h similarity index 100% rename from src/helper/freetype2/src/psaux/afmparse.h rename to src/eepp/helper/freetype2/src/psaux/afmparse.h diff --git a/src/helper/freetype2/src/psaux/module.mk b/src/eepp/helper/freetype2/src/psaux/module.mk similarity index 100% rename from src/helper/freetype2/src/psaux/module.mk rename to src/eepp/helper/freetype2/src/psaux/module.mk diff --git a/src/helper/freetype2/src/psaux/psauxerr.h b/src/eepp/helper/freetype2/src/psaux/psauxerr.h similarity index 100% rename from src/helper/freetype2/src/psaux/psauxerr.h rename to src/eepp/helper/freetype2/src/psaux/psauxerr.h diff --git a/src/helper/freetype2/src/psaux/psauxmod.c b/src/eepp/helper/freetype2/src/psaux/psauxmod.c similarity index 100% rename from src/helper/freetype2/src/psaux/psauxmod.c rename to src/eepp/helper/freetype2/src/psaux/psauxmod.c diff --git a/src/helper/freetype2/src/psaux/psauxmod.h b/src/eepp/helper/freetype2/src/psaux/psauxmod.h similarity index 100% rename from src/helper/freetype2/src/psaux/psauxmod.h rename to src/eepp/helper/freetype2/src/psaux/psauxmod.h diff --git a/src/helper/freetype2/src/psaux/psconv.c b/src/eepp/helper/freetype2/src/psaux/psconv.c similarity index 100% rename from src/helper/freetype2/src/psaux/psconv.c rename to src/eepp/helper/freetype2/src/psaux/psconv.c diff --git a/src/helper/freetype2/src/psaux/psconv.h b/src/eepp/helper/freetype2/src/psaux/psconv.h similarity index 100% rename from src/helper/freetype2/src/psaux/psconv.h rename to src/eepp/helper/freetype2/src/psaux/psconv.h diff --git a/src/helper/freetype2/src/psaux/psobjs.c b/src/eepp/helper/freetype2/src/psaux/psobjs.c similarity index 100% rename from src/helper/freetype2/src/psaux/psobjs.c rename to src/eepp/helper/freetype2/src/psaux/psobjs.c diff --git a/src/helper/freetype2/src/psaux/psobjs.h b/src/eepp/helper/freetype2/src/psaux/psobjs.h similarity index 100% rename from src/helper/freetype2/src/psaux/psobjs.h rename to src/eepp/helper/freetype2/src/psaux/psobjs.h diff --git a/src/helper/freetype2/src/psaux/rules.mk b/src/eepp/helper/freetype2/src/psaux/rules.mk similarity index 100% rename from src/helper/freetype2/src/psaux/rules.mk rename to src/eepp/helper/freetype2/src/psaux/rules.mk diff --git a/src/helper/freetype2/src/psaux/t1cmap.c b/src/eepp/helper/freetype2/src/psaux/t1cmap.c similarity index 100% rename from src/helper/freetype2/src/psaux/t1cmap.c rename to src/eepp/helper/freetype2/src/psaux/t1cmap.c diff --git a/src/helper/freetype2/src/psaux/t1cmap.h b/src/eepp/helper/freetype2/src/psaux/t1cmap.h similarity index 100% rename from src/helper/freetype2/src/psaux/t1cmap.h rename to src/eepp/helper/freetype2/src/psaux/t1cmap.h diff --git a/src/helper/freetype2/src/psaux/t1decode.c b/src/eepp/helper/freetype2/src/psaux/t1decode.c similarity index 100% rename from src/helper/freetype2/src/psaux/t1decode.c rename to src/eepp/helper/freetype2/src/psaux/t1decode.c diff --git a/src/helper/freetype2/src/psaux/t1decode.h b/src/eepp/helper/freetype2/src/psaux/t1decode.h similarity index 100% rename from src/helper/freetype2/src/psaux/t1decode.h rename to src/eepp/helper/freetype2/src/psaux/t1decode.h diff --git a/src/helper/freetype2/src/pshinter/Jamfile b/src/eepp/helper/freetype2/src/pshinter/Jamfile similarity index 100% rename from src/helper/freetype2/src/pshinter/Jamfile rename to src/eepp/helper/freetype2/src/pshinter/Jamfile diff --git a/src/helper/freetype2/src/pshinter/module.mk b/src/eepp/helper/freetype2/src/pshinter/module.mk similarity index 100% rename from src/helper/freetype2/src/pshinter/module.mk rename to src/eepp/helper/freetype2/src/pshinter/module.mk diff --git a/src/helper/freetype2/src/pshinter/pshalgo.c b/src/eepp/helper/freetype2/src/pshinter/pshalgo.c similarity index 100% rename from src/helper/freetype2/src/pshinter/pshalgo.c rename to src/eepp/helper/freetype2/src/pshinter/pshalgo.c diff --git a/src/helper/freetype2/src/pshinter/pshalgo.h b/src/eepp/helper/freetype2/src/pshinter/pshalgo.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshalgo.h rename to src/eepp/helper/freetype2/src/pshinter/pshalgo.h diff --git a/src/helper/freetype2/src/pshinter/pshglob.c b/src/eepp/helper/freetype2/src/pshinter/pshglob.c similarity index 100% rename from src/helper/freetype2/src/pshinter/pshglob.c rename to src/eepp/helper/freetype2/src/pshinter/pshglob.c diff --git a/src/helper/freetype2/src/pshinter/pshglob.h b/src/eepp/helper/freetype2/src/pshinter/pshglob.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshglob.h rename to src/eepp/helper/freetype2/src/pshinter/pshglob.h diff --git a/src/helper/freetype2/src/pshinter/pshmod.c b/src/eepp/helper/freetype2/src/pshinter/pshmod.c similarity index 100% rename from src/helper/freetype2/src/pshinter/pshmod.c rename to src/eepp/helper/freetype2/src/pshinter/pshmod.c diff --git a/src/helper/freetype2/src/pshinter/pshmod.h b/src/eepp/helper/freetype2/src/pshinter/pshmod.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshmod.h rename to src/eepp/helper/freetype2/src/pshinter/pshmod.h diff --git a/src/helper/freetype2/src/pshinter/pshnterr.h b/src/eepp/helper/freetype2/src/pshinter/pshnterr.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshnterr.h rename to src/eepp/helper/freetype2/src/pshinter/pshnterr.h diff --git a/src/helper/freetype2/src/pshinter/pshpic.c b/src/eepp/helper/freetype2/src/pshinter/pshpic.c similarity index 100% rename from src/helper/freetype2/src/pshinter/pshpic.c rename to src/eepp/helper/freetype2/src/pshinter/pshpic.c diff --git a/src/helper/freetype2/src/pshinter/pshpic.h b/src/eepp/helper/freetype2/src/pshinter/pshpic.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshpic.h rename to src/eepp/helper/freetype2/src/pshinter/pshpic.h diff --git a/src/helper/freetype2/src/pshinter/pshrec.c b/src/eepp/helper/freetype2/src/pshinter/pshrec.c similarity index 100% rename from src/helper/freetype2/src/pshinter/pshrec.c rename to src/eepp/helper/freetype2/src/pshinter/pshrec.c diff --git a/src/helper/freetype2/src/pshinter/pshrec.h b/src/eepp/helper/freetype2/src/pshinter/pshrec.h similarity index 100% rename from src/helper/freetype2/src/pshinter/pshrec.h rename to src/eepp/helper/freetype2/src/pshinter/pshrec.h diff --git a/src/helper/freetype2/src/pshinter/rules.mk b/src/eepp/helper/freetype2/src/pshinter/rules.mk similarity index 100% rename from src/helper/freetype2/src/pshinter/rules.mk rename to src/eepp/helper/freetype2/src/pshinter/rules.mk diff --git a/src/helper/freetype2/src/psnames/Jamfile b/src/eepp/helper/freetype2/src/psnames/Jamfile similarity index 100% rename from src/helper/freetype2/src/psnames/Jamfile rename to src/eepp/helper/freetype2/src/psnames/Jamfile diff --git a/src/helper/freetype2/src/psnames/module.mk b/src/eepp/helper/freetype2/src/psnames/module.mk similarity index 100% rename from src/helper/freetype2/src/psnames/module.mk rename to src/eepp/helper/freetype2/src/psnames/module.mk diff --git a/src/helper/freetype2/src/psnames/psmodule.c b/src/eepp/helper/freetype2/src/psnames/psmodule.c similarity index 100% rename from src/helper/freetype2/src/psnames/psmodule.c rename to src/eepp/helper/freetype2/src/psnames/psmodule.c diff --git a/src/helper/freetype2/src/psnames/psmodule.h b/src/eepp/helper/freetype2/src/psnames/psmodule.h similarity index 100% rename from src/helper/freetype2/src/psnames/psmodule.h rename to src/eepp/helper/freetype2/src/psnames/psmodule.h diff --git a/src/helper/freetype2/src/psnames/psnamerr.h b/src/eepp/helper/freetype2/src/psnames/psnamerr.h similarity index 100% rename from src/helper/freetype2/src/psnames/psnamerr.h rename to src/eepp/helper/freetype2/src/psnames/psnamerr.h diff --git a/src/helper/freetype2/src/psnames/pspic.c b/src/eepp/helper/freetype2/src/psnames/pspic.c similarity index 100% rename from src/helper/freetype2/src/psnames/pspic.c rename to src/eepp/helper/freetype2/src/psnames/pspic.c diff --git a/src/helper/freetype2/src/psnames/pspic.h b/src/eepp/helper/freetype2/src/psnames/pspic.h similarity index 100% rename from src/helper/freetype2/src/psnames/pspic.h rename to src/eepp/helper/freetype2/src/psnames/pspic.h diff --git a/src/helper/freetype2/src/psnames/pstables.h b/src/eepp/helper/freetype2/src/psnames/pstables.h similarity index 100% rename from src/helper/freetype2/src/psnames/pstables.h rename to src/eepp/helper/freetype2/src/psnames/pstables.h diff --git a/src/helper/freetype2/src/psnames/rules.mk b/src/eepp/helper/freetype2/src/psnames/rules.mk similarity index 100% rename from src/helper/freetype2/src/psnames/rules.mk rename to src/eepp/helper/freetype2/src/psnames/rules.mk diff --git a/src/helper/freetype2/src/raster/Jamfile b/src/eepp/helper/freetype2/src/raster/Jamfile similarity index 100% rename from src/helper/freetype2/src/raster/Jamfile rename to src/eepp/helper/freetype2/src/raster/Jamfile diff --git a/src/helper/freetype2/src/raster/ftmisc.h b/src/eepp/helper/freetype2/src/raster/ftmisc.h similarity index 100% rename from src/helper/freetype2/src/raster/ftmisc.h rename to src/eepp/helper/freetype2/src/raster/ftmisc.h diff --git a/src/helper/freetype2/src/raster/ftraster.c b/src/eepp/helper/freetype2/src/raster/ftraster.c similarity index 100% rename from src/helper/freetype2/src/raster/ftraster.c rename to src/eepp/helper/freetype2/src/raster/ftraster.c diff --git a/src/helper/freetype2/src/raster/ftraster.h b/src/eepp/helper/freetype2/src/raster/ftraster.h similarity index 100% rename from src/helper/freetype2/src/raster/ftraster.h rename to src/eepp/helper/freetype2/src/raster/ftraster.h diff --git a/src/helper/freetype2/src/raster/ftrend1.c b/src/eepp/helper/freetype2/src/raster/ftrend1.c similarity index 100% rename from src/helper/freetype2/src/raster/ftrend1.c rename to src/eepp/helper/freetype2/src/raster/ftrend1.c diff --git a/src/helper/freetype2/src/raster/ftrend1.h b/src/eepp/helper/freetype2/src/raster/ftrend1.h similarity index 100% rename from src/helper/freetype2/src/raster/ftrend1.h rename to src/eepp/helper/freetype2/src/raster/ftrend1.h diff --git a/src/helper/freetype2/src/raster/module.mk b/src/eepp/helper/freetype2/src/raster/module.mk similarity index 100% rename from src/helper/freetype2/src/raster/module.mk rename to src/eepp/helper/freetype2/src/raster/module.mk diff --git a/src/helper/freetype2/src/raster/rasterrs.h b/src/eepp/helper/freetype2/src/raster/rasterrs.h similarity index 100% rename from src/helper/freetype2/src/raster/rasterrs.h rename to src/eepp/helper/freetype2/src/raster/rasterrs.h diff --git a/src/helper/freetype2/src/raster/rastpic.c b/src/eepp/helper/freetype2/src/raster/rastpic.c similarity index 100% rename from src/helper/freetype2/src/raster/rastpic.c rename to src/eepp/helper/freetype2/src/raster/rastpic.c diff --git a/src/helper/freetype2/src/raster/rastpic.h b/src/eepp/helper/freetype2/src/raster/rastpic.h similarity index 100% rename from src/helper/freetype2/src/raster/rastpic.h rename to src/eepp/helper/freetype2/src/raster/rastpic.h diff --git a/src/helper/freetype2/src/raster/rules.mk b/src/eepp/helper/freetype2/src/raster/rules.mk similarity index 100% rename from src/helper/freetype2/src/raster/rules.mk rename to src/eepp/helper/freetype2/src/raster/rules.mk diff --git a/src/helper/freetype2/src/sfnt/Jamfile b/src/eepp/helper/freetype2/src/sfnt/Jamfile similarity index 100% rename from src/helper/freetype2/src/sfnt/Jamfile rename to src/eepp/helper/freetype2/src/sfnt/Jamfile diff --git a/src/helper/freetype2/src/sfnt/module.mk b/src/eepp/helper/freetype2/src/sfnt/module.mk similarity index 100% rename from src/helper/freetype2/src/sfnt/module.mk rename to src/eepp/helper/freetype2/src/sfnt/module.mk diff --git a/src/helper/freetype2/src/sfnt/rules.mk b/src/eepp/helper/freetype2/src/sfnt/rules.mk similarity index 100% rename from src/helper/freetype2/src/sfnt/rules.mk rename to src/eepp/helper/freetype2/src/sfnt/rules.mk diff --git a/src/helper/freetype2/src/sfnt/sfdriver.c b/src/eepp/helper/freetype2/src/sfnt/sfdriver.c similarity index 100% rename from src/helper/freetype2/src/sfnt/sfdriver.c rename to src/eepp/helper/freetype2/src/sfnt/sfdriver.c diff --git a/src/helper/freetype2/src/sfnt/sfdriver.h b/src/eepp/helper/freetype2/src/sfnt/sfdriver.h similarity index 100% rename from src/helper/freetype2/src/sfnt/sfdriver.h rename to src/eepp/helper/freetype2/src/sfnt/sfdriver.h diff --git a/src/helper/freetype2/src/sfnt/sferrors.h b/src/eepp/helper/freetype2/src/sfnt/sferrors.h similarity index 100% rename from src/helper/freetype2/src/sfnt/sferrors.h rename to src/eepp/helper/freetype2/src/sfnt/sferrors.h diff --git a/src/helper/freetype2/src/sfnt/sfntpic.c b/src/eepp/helper/freetype2/src/sfnt/sfntpic.c similarity index 100% rename from src/helper/freetype2/src/sfnt/sfntpic.c rename to src/eepp/helper/freetype2/src/sfnt/sfntpic.c diff --git a/src/helper/freetype2/src/sfnt/sfntpic.h b/src/eepp/helper/freetype2/src/sfnt/sfntpic.h similarity index 100% rename from src/helper/freetype2/src/sfnt/sfntpic.h rename to src/eepp/helper/freetype2/src/sfnt/sfntpic.h diff --git a/src/helper/freetype2/src/sfnt/sfobjs.c b/src/eepp/helper/freetype2/src/sfnt/sfobjs.c similarity index 100% rename from src/helper/freetype2/src/sfnt/sfobjs.c rename to src/eepp/helper/freetype2/src/sfnt/sfobjs.c diff --git a/src/helper/freetype2/src/sfnt/sfobjs.h b/src/eepp/helper/freetype2/src/sfnt/sfobjs.h similarity index 100% rename from src/helper/freetype2/src/sfnt/sfobjs.h rename to src/eepp/helper/freetype2/src/sfnt/sfobjs.h diff --git a/src/helper/freetype2/src/sfnt/ttbdf.c b/src/eepp/helper/freetype2/src/sfnt/ttbdf.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttbdf.c rename to src/eepp/helper/freetype2/src/sfnt/ttbdf.c diff --git a/src/helper/freetype2/src/sfnt/ttbdf.h b/src/eepp/helper/freetype2/src/sfnt/ttbdf.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttbdf.h rename to src/eepp/helper/freetype2/src/sfnt/ttbdf.h diff --git a/src/helper/freetype2/src/sfnt/ttcmap.c b/src/eepp/helper/freetype2/src/sfnt/ttcmap.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttcmap.c rename to src/eepp/helper/freetype2/src/sfnt/ttcmap.c diff --git a/src/helper/freetype2/src/sfnt/ttcmap.h b/src/eepp/helper/freetype2/src/sfnt/ttcmap.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttcmap.h rename to src/eepp/helper/freetype2/src/sfnt/ttcmap.h diff --git a/src/helper/freetype2/src/sfnt/ttcmapc.h b/src/eepp/helper/freetype2/src/sfnt/ttcmapc.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttcmapc.h rename to src/eepp/helper/freetype2/src/sfnt/ttcmapc.h diff --git a/src/helper/freetype2/src/sfnt/ttkern.c b/src/eepp/helper/freetype2/src/sfnt/ttkern.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttkern.c rename to src/eepp/helper/freetype2/src/sfnt/ttkern.c diff --git a/src/helper/freetype2/src/sfnt/ttkern.h b/src/eepp/helper/freetype2/src/sfnt/ttkern.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttkern.h rename to src/eepp/helper/freetype2/src/sfnt/ttkern.h diff --git a/src/helper/freetype2/src/sfnt/ttload.c b/src/eepp/helper/freetype2/src/sfnt/ttload.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttload.c rename to src/eepp/helper/freetype2/src/sfnt/ttload.c diff --git a/src/helper/freetype2/src/sfnt/ttload.h b/src/eepp/helper/freetype2/src/sfnt/ttload.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttload.h rename to src/eepp/helper/freetype2/src/sfnt/ttload.h diff --git a/src/helper/freetype2/src/sfnt/ttmtx.c b/src/eepp/helper/freetype2/src/sfnt/ttmtx.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttmtx.c rename to src/eepp/helper/freetype2/src/sfnt/ttmtx.c diff --git a/src/helper/freetype2/src/sfnt/ttmtx.h b/src/eepp/helper/freetype2/src/sfnt/ttmtx.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttmtx.h rename to src/eepp/helper/freetype2/src/sfnt/ttmtx.h diff --git a/src/helper/freetype2/src/sfnt/ttpost.c b/src/eepp/helper/freetype2/src/sfnt/ttpost.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttpost.c rename to src/eepp/helper/freetype2/src/sfnt/ttpost.c diff --git a/src/helper/freetype2/src/sfnt/ttpost.h b/src/eepp/helper/freetype2/src/sfnt/ttpost.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttpost.h rename to src/eepp/helper/freetype2/src/sfnt/ttpost.h diff --git a/src/helper/freetype2/src/sfnt/ttsbit.c b/src/eepp/helper/freetype2/src/sfnt/ttsbit.c similarity index 100% rename from src/helper/freetype2/src/sfnt/ttsbit.c rename to src/eepp/helper/freetype2/src/sfnt/ttsbit.c diff --git a/src/helper/freetype2/src/sfnt/ttsbit.h b/src/eepp/helper/freetype2/src/sfnt/ttsbit.h similarity index 100% rename from src/helper/freetype2/src/sfnt/ttsbit.h rename to src/eepp/helper/freetype2/src/sfnt/ttsbit.h diff --git a/src/helper/freetype2/src/smooth/Jamfile b/src/eepp/helper/freetype2/src/smooth/Jamfile similarity index 100% rename from src/helper/freetype2/src/smooth/Jamfile rename to src/eepp/helper/freetype2/src/smooth/Jamfile diff --git a/src/helper/freetype2/src/smooth/ftgrays.c b/src/eepp/helper/freetype2/src/smooth/ftgrays.c similarity index 100% rename from src/helper/freetype2/src/smooth/ftgrays.c rename to src/eepp/helper/freetype2/src/smooth/ftgrays.c diff --git a/src/helper/freetype2/src/smooth/ftgrays.h b/src/eepp/helper/freetype2/src/smooth/ftgrays.h similarity index 100% rename from src/helper/freetype2/src/smooth/ftgrays.h rename to src/eepp/helper/freetype2/src/smooth/ftgrays.h diff --git a/src/helper/freetype2/src/smooth/ftsmerrs.h b/src/eepp/helper/freetype2/src/smooth/ftsmerrs.h similarity index 100% rename from src/helper/freetype2/src/smooth/ftsmerrs.h rename to src/eepp/helper/freetype2/src/smooth/ftsmerrs.h diff --git a/src/helper/freetype2/src/smooth/ftsmooth.c b/src/eepp/helper/freetype2/src/smooth/ftsmooth.c similarity index 100% rename from src/helper/freetype2/src/smooth/ftsmooth.c rename to src/eepp/helper/freetype2/src/smooth/ftsmooth.c diff --git a/src/helper/freetype2/src/smooth/ftsmooth.h b/src/eepp/helper/freetype2/src/smooth/ftsmooth.h similarity index 100% rename from src/helper/freetype2/src/smooth/ftsmooth.h rename to src/eepp/helper/freetype2/src/smooth/ftsmooth.h diff --git a/src/helper/freetype2/src/smooth/ftspic.c b/src/eepp/helper/freetype2/src/smooth/ftspic.c similarity index 100% rename from src/helper/freetype2/src/smooth/ftspic.c rename to src/eepp/helper/freetype2/src/smooth/ftspic.c diff --git a/src/helper/freetype2/src/smooth/ftspic.h b/src/eepp/helper/freetype2/src/smooth/ftspic.h similarity index 100% rename from src/helper/freetype2/src/smooth/ftspic.h rename to src/eepp/helper/freetype2/src/smooth/ftspic.h diff --git a/src/helper/freetype2/src/smooth/module.mk b/src/eepp/helper/freetype2/src/smooth/module.mk similarity index 100% rename from src/helper/freetype2/src/smooth/module.mk rename to src/eepp/helper/freetype2/src/smooth/module.mk diff --git a/src/helper/freetype2/src/smooth/rules.mk b/src/eepp/helper/freetype2/src/smooth/rules.mk similarity index 100% rename from src/helper/freetype2/src/smooth/rules.mk rename to src/eepp/helper/freetype2/src/smooth/rules.mk diff --git a/src/helper/freetype2/src/truetype/Jamfile b/src/eepp/helper/freetype2/src/truetype/Jamfile similarity index 100% rename from src/helper/freetype2/src/truetype/Jamfile rename to src/eepp/helper/freetype2/src/truetype/Jamfile diff --git a/src/helper/freetype2/src/truetype/module.mk b/src/eepp/helper/freetype2/src/truetype/module.mk similarity index 100% rename from src/helper/freetype2/src/truetype/module.mk rename to src/eepp/helper/freetype2/src/truetype/module.mk diff --git a/src/helper/freetype2/src/truetype/rules.mk b/src/eepp/helper/freetype2/src/truetype/rules.mk similarity index 100% rename from src/helper/freetype2/src/truetype/rules.mk rename to src/eepp/helper/freetype2/src/truetype/rules.mk diff --git a/src/helper/freetype2/src/truetype/ttdriver.c b/src/eepp/helper/freetype2/src/truetype/ttdriver.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttdriver.c rename to src/eepp/helper/freetype2/src/truetype/ttdriver.c diff --git a/src/helper/freetype2/src/truetype/ttdriver.h b/src/eepp/helper/freetype2/src/truetype/ttdriver.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttdriver.h rename to src/eepp/helper/freetype2/src/truetype/ttdriver.h diff --git a/src/helper/freetype2/src/truetype/tterrors.h b/src/eepp/helper/freetype2/src/truetype/tterrors.h similarity index 100% rename from src/helper/freetype2/src/truetype/tterrors.h rename to src/eepp/helper/freetype2/src/truetype/tterrors.h diff --git a/src/helper/freetype2/src/truetype/ttgload.c b/src/eepp/helper/freetype2/src/truetype/ttgload.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttgload.c rename to src/eepp/helper/freetype2/src/truetype/ttgload.c diff --git a/src/helper/freetype2/src/truetype/ttgload.h b/src/eepp/helper/freetype2/src/truetype/ttgload.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttgload.h rename to src/eepp/helper/freetype2/src/truetype/ttgload.h diff --git a/src/helper/freetype2/src/truetype/ttgxvar.c b/src/eepp/helper/freetype2/src/truetype/ttgxvar.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttgxvar.c rename to src/eepp/helper/freetype2/src/truetype/ttgxvar.c diff --git a/src/helper/freetype2/src/truetype/ttgxvar.h b/src/eepp/helper/freetype2/src/truetype/ttgxvar.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttgxvar.h rename to src/eepp/helper/freetype2/src/truetype/ttgxvar.h diff --git a/src/helper/freetype2/src/truetype/ttinterp.c b/src/eepp/helper/freetype2/src/truetype/ttinterp.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttinterp.c rename to src/eepp/helper/freetype2/src/truetype/ttinterp.c diff --git a/src/helper/freetype2/src/truetype/ttinterp.h b/src/eepp/helper/freetype2/src/truetype/ttinterp.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttinterp.h rename to src/eepp/helper/freetype2/src/truetype/ttinterp.h diff --git a/src/helper/freetype2/src/truetype/ttobjs.c b/src/eepp/helper/freetype2/src/truetype/ttobjs.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttobjs.c rename to src/eepp/helper/freetype2/src/truetype/ttobjs.c diff --git a/src/helper/freetype2/src/truetype/ttobjs.h b/src/eepp/helper/freetype2/src/truetype/ttobjs.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttobjs.h rename to src/eepp/helper/freetype2/src/truetype/ttobjs.h diff --git a/src/helper/freetype2/src/truetype/ttpic.c b/src/eepp/helper/freetype2/src/truetype/ttpic.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttpic.c rename to src/eepp/helper/freetype2/src/truetype/ttpic.c diff --git a/src/helper/freetype2/src/truetype/ttpic.h b/src/eepp/helper/freetype2/src/truetype/ttpic.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttpic.h rename to src/eepp/helper/freetype2/src/truetype/ttpic.h diff --git a/src/helper/freetype2/src/truetype/ttpload.c b/src/eepp/helper/freetype2/src/truetype/ttpload.c similarity index 100% rename from src/helper/freetype2/src/truetype/ttpload.c rename to src/eepp/helper/freetype2/src/truetype/ttpload.c diff --git a/src/helper/freetype2/src/truetype/ttpload.h b/src/eepp/helper/freetype2/src/truetype/ttpload.h similarity index 100% rename from src/helper/freetype2/src/truetype/ttpload.h rename to src/eepp/helper/freetype2/src/truetype/ttpload.h diff --git a/src/helper/freetype2/src/type1/Jamfile b/src/eepp/helper/freetype2/src/type1/Jamfile similarity index 100% rename from src/helper/freetype2/src/type1/Jamfile rename to src/eepp/helper/freetype2/src/type1/Jamfile diff --git a/src/helper/freetype2/src/type1/module.mk b/src/eepp/helper/freetype2/src/type1/module.mk similarity index 100% rename from src/helper/freetype2/src/type1/module.mk rename to src/eepp/helper/freetype2/src/type1/module.mk diff --git a/src/helper/freetype2/src/type1/rules.mk b/src/eepp/helper/freetype2/src/type1/rules.mk similarity index 100% rename from src/helper/freetype2/src/type1/rules.mk rename to src/eepp/helper/freetype2/src/type1/rules.mk diff --git a/src/helper/freetype2/src/type1/t1afm.c b/src/eepp/helper/freetype2/src/type1/t1afm.c similarity index 100% rename from src/helper/freetype2/src/type1/t1afm.c rename to src/eepp/helper/freetype2/src/type1/t1afm.c diff --git a/src/helper/freetype2/src/type1/t1afm.h b/src/eepp/helper/freetype2/src/type1/t1afm.h similarity index 100% rename from src/helper/freetype2/src/type1/t1afm.h rename to src/eepp/helper/freetype2/src/type1/t1afm.h diff --git a/src/helper/freetype2/src/type1/t1driver.c b/src/eepp/helper/freetype2/src/type1/t1driver.c similarity index 100% rename from src/helper/freetype2/src/type1/t1driver.c rename to src/eepp/helper/freetype2/src/type1/t1driver.c diff --git a/src/helper/freetype2/src/type1/t1driver.h b/src/eepp/helper/freetype2/src/type1/t1driver.h similarity index 100% rename from src/helper/freetype2/src/type1/t1driver.h rename to src/eepp/helper/freetype2/src/type1/t1driver.h diff --git a/src/helper/freetype2/src/type1/t1errors.h b/src/eepp/helper/freetype2/src/type1/t1errors.h similarity index 100% rename from src/helper/freetype2/src/type1/t1errors.h rename to src/eepp/helper/freetype2/src/type1/t1errors.h diff --git a/src/helper/freetype2/src/type1/t1gload.c b/src/eepp/helper/freetype2/src/type1/t1gload.c similarity index 100% rename from src/helper/freetype2/src/type1/t1gload.c rename to src/eepp/helper/freetype2/src/type1/t1gload.c diff --git a/src/helper/freetype2/src/type1/t1gload.h b/src/eepp/helper/freetype2/src/type1/t1gload.h similarity index 100% rename from src/helper/freetype2/src/type1/t1gload.h rename to src/eepp/helper/freetype2/src/type1/t1gload.h diff --git a/src/helper/freetype2/src/type1/t1load.c b/src/eepp/helper/freetype2/src/type1/t1load.c similarity index 100% rename from src/helper/freetype2/src/type1/t1load.c rename to src/eepp/helper/freetype2/src/type1/t1load.c diff --git a/src/helper/freetype2/src/type1/t1load.h b/src/eepp/helper/freetype2/src/type1/t1load.h similarity index 100% rename from src/helper/freetype2/src/type1/t1load.h rename to src/eepp/helper/freetype2/src/type1/t1load.h diff --git a/src/helper/freetype2/src/type1/t1objs.c b/src/eepp/helper/freetype2/src/type1/t1objs.c similarity index 100% rename from src/helper/freetype2/src/type1/t1objs.c rename to src/eepp/helper/freetype2/src/type1/t1objs.c diff --git a/src/helper/freetype2/src/type1/t1objs.h b/src/eepp/helper/freetype2/src/type1/t1objs.h similarity index 100% rename from src/helper/freetype2/src/type1/t1objs.h rename to src/eepp/helper/freetype2/src/type1/t1objs.h diff --git a/src/helper/freetype2/src/type1/t1parse.c b/src/eepp/helper/freetype2/src/type1/t1parse.c similarity index 100% rename from src/helper/freetype2/src/type1/t1parse.c rename to src/eepp/helper/freetype2/src/type1/t1parse.c diff --git a/src/helper/freetype2/src/type1/t1parse.h b/src/eepp/helper/freetype2/src/type1/t1parse.h similarity index 100% rename from src/helper/freetype2/src/type1/t1parse.h rename to src/eepp/helper/freetype2/src/type1/t1parse.h diff --git a/src/helper/freetype2/src/type1/t1tokens.h b/src/eepp/helper/freetype2/src/type1/t1tokens.h similarity index 100% rename from src/helper/freetype2/src/type1/t1tokens.h rename to src/eepp/helper/freetype2/src/type1/t1tokens.h diff --git a/src/helper/freetype2/src/type42/Jamfile b/src/eepp/helper/freetype2/src/type42/Jamfile similarity index 100% rename from src/helper/freetype2/src/type42/Jamfile rename to src/eepp/helper/freetype2/src/type42/Jamfile diff --git a/src/helper/freetype2/src/type42/module.mk b/src/eepp/helper/freetype2/src/type42/module.mk similarity index 100% rename from src/helper/freetype2/src/type42/module.mk rename to src/eepp/helper/freetype2/src/type42/module.mk diff --git a/src/helper/freetype2/src/type42/rules.mk b/src/eepp/helper/freetype2/src/type42/rules.mk similarity index 100% rename from src/helper/freetype2/src/type42/rules.mk rename to src/eepp/helper/freetype2/src/type42/rules.mk diff --git a/src/helper/freetype2/src/type42/t42drivr.c b/src/eepp/helper/freetype2/src/type42/t42drivr.c similarity index 100% rename from src/helper/freetype2/src/type42/t42drivr.c rename to src/eepp/helper/freetype2/src/type42/t42drivr.c diff --git a/src/helper/freetype2/src/type42/t42drivr.h b/src/eepp/helper/freetype2/src/type42/t42drivr.h similarity index 100% rename from src/helper/freetype2/src/type42/t42drivr.h rename to src/eepp/helper/freetype2/src/type42/t42drivr.h diff --git a/src/helper/freetype2/src/type42/t42error.h b/src/eepp/helper/freetype2/src/type42/t42error.h similarity index 100% rename from src/helper/freetype2/src/type42/t42error.h rename to src/eepp/helper/freetype2/src/type42/t42error.h diff --git a/src/helper/freetype2/src/type42/t42objs.c b/src/eepp/helper/freetype2/src/type42/t42objs.c similarity index 100% rename from src/helper/freetype2/src/type42/t42objs.c rename to src/eepp/helper/freetype2/src/type42/t42objs.c diff --git a/src/helper/freetype2/src/type42/t42objs.h b/src/eepp/helper/freetype2/src/type42/t42objs.h similarity index 100% rename from src/helper/freetype2/src/type42/t42objs.h rename to src/eepp/helper/freetype2/src/type42/t42objs.h diff --git a/src/helper/freetype2/src/type42/t42parse.c b/src/eepp/helper/freetype2/src/type42/t42parse.c similarity index 100% rename from src/helper/freetype2/src/type42/t42parse.c rename to src/eepp/helper/freetype2/src/type42/t42parse.c diff --git a/src/helper/freetype2/src/type42/t42parse.h b/src/eepp/helper/freetype2/src/type42/t42parse.h similarity index 100% rename from src/helper/freetype2/src/type42/t42parse.h rename to src/eepp/helper/freetype2/src/type42/t42parse.h diff --git a/src/helper/freetype2/src/type42/t42types.h b/src/eepp/helper/freetype2/src/type42/t42types.h similarity index 100% rename from src/helper/freetype2/src/type42/t42types.h rename to src/eepp/helper/freetype2/src/type42/t42types.h diff --git a/src/helper/freetype2/src/winfonts/Jamfile b/src/eepp/helper/freetype2/src/winfonts/Jamfile similarity index 100% rename from src/helper/freetype2/src/winfonts/Jamfile rename to src/eepp/helper/freetype2/src/winfonts/Jamfile diff --git a/src/helper/freetype2/src/winfonts/fnterrs.h b/src/eepp/helper/freetype2/src/winfonts/fnterrs.h similarity index 100% rename from src/helper/freetype2/src/winfonts/fnterrs.h rename to src/eepp/helper/freetype2/src/winfonts/fnterrs.h diff --git a/src/helper/freetype2/src/winfonts/module.mk b/src/eepp/helper/freetype2/src/winfonts/module.mk similarity index 100% rename from src/helper/freetype2/src/winfonts/module.mk rename to src/eepp/helper/freetype2/src/winfonts/module.mk diff --git a/src/helper/freetype2/src/winfonts/rules.mk b/src/eepp/helper/freetype2/src/winfonts/rules.mk similarity index 100% rename from src/helper/freetype2/src/winfonts/rules.mk rename to src/eepp/helper/freetype2/src/winfonts/rules.mk diff --git a/src/helper/freetype2/src/winfonts/winfnt.c b/src/eepp/helper/freetype2/src/winfonts/winfnt.c similarity index 100% rename from src/helper/freetype2/src/winfonts/winfnt.c rename to src/eepp/helper/freetype2/src/winfonts/winfnt.c diff --git a/src/helper/freetype2/src/winfonts/winfnt.h b/src/eepp/helper/freetype2/src/winfonts/winfnt.h similarity index 100% rename from src/helper/freetype2/src/winfonts/winfnt.h rename to src/eepp/helper/freetype2/src/winfonts/winfnt.h diff --git a/src/helper/glew/glew.c b/src/eepp/helper/glew/glew.c similarity index 100% rename from src/helper/glew/glew.c rename to src/eepp/helper/glew/glew.c diff --git a/src/helper/haikuttf/haikuttf.hpp b/src/eepp/helper/haikuttf/haikuttf.hpp similarity index 100% rename from src/helper/haikuttf/haikuttf.hpp rename to src/eepp/helper/haikuttf/haikuttf.hpp diff --git a/src/helper/haikuttf/hkbase.hpp b/src/eepp/helper/haikuttf/hkbase.hpp similarity index 100% rename from src/helper/haikuttf/hkbase.hpp rename to src/eepp/helper/haikuttf/hkbase.hpp diff --git a/src/helper/haikuttf/hkfont.cpp b/src/eepp/helper/haikuttf/hkfont.cpp similarity index 100% rename from src/helper/haikuttf/hkfont.cpp rename to src/eepp/helper/haikuttf/hkfont.cpp diff --git a/src/helper/haikuttf/hkfont.hpp b/src/eepp/helper/haikuttf/hkfont.hpp similarity index 100% rename from src/helper/haikuttf/hkfont.hpp rename to src/eepp/helper/haikuttf/hkfont.hpp diff --git a/src/helper/haikuttf/hkfontmanager.cpp b/src/eepp/helper/haikuttf/hkfontmanager.cpp similarity index 100% rename from src/helper/haikuttf/hkfontmanager.cpp rename to src/eepp/helper/haikuttf/hkfontmanager.cpp diff --git a/src/helper/haikuttf/hkfontmanager.hpp b/src/eepp/helper/haikuttf/hkfontmanager.hpp similarity index 100% rename from src/helper/haikuttf/hkfontmanager.hpp rename to src/eepp/helper/haikuttf/hkfontmanager.hpp diff --git a/src/helper/haikuttf/hkglyph.cpp b/src/eepp/helper/haikuttf/hkglyph.cpp similarity index 100% rename from src/helper/haikuttf/hkglyph.cpp rename to src/eepp/helper/haikuttf/hkglyph.cpp diff --git a/src/helper/haikuttf/hkglyph.hpp b/src/eepp/helper/haikuttf/hkglyph.hpp similarity index 100% rename from src/helper/haikuttf/hkglyph.hpp rename to src/eepp/helper/haikuttf/hkglyph.hpp diff --git a/src/helper/haikuttf/hkmutex.cpp b/src/eepp/helper/haikuttf/hkmutex.cpp similarity index 100% rename from src/helper/haikuttf/hkmutex.cpp rename to src/eepp/helper/haikuttf/hkmutex.cpp diff --git a/src/helper/haikuttf/hkmutex.hpp b/src/eepp/helper/haikuttf/hkmutex.hpp similarity index 100% rename from src/helper/haikuttf/hkmutex.hpp rename to src/eepp/helper/haikuttf/hkmutex.hpp diff --git a/src/helper/sophist/sophist.h b/src/eepp/helper/haikuttf/sophist.h similarity index 100% rename from src/helper/sophist/sophist.h rename to src/eepp/helper/haikuttf/sophist.h diff --git a/src/helper/libzip/config.h b/src/eepp/helper/libzip/config.h similarity index 100% rename from src/helper/libzip/config.h rename to src/eepp/helper/libzip/config.h diff --git a/src/helper/libzip/mkstemp.c b/src/eepp/helper/libzip/mkstemp.c similarity index 100% rename from src/helper/libzip/mkstemp.c rename to src/eepp/helper/libzip/mkstemp.c diff --git a/src/helper/libzip/zip.h b/src/eepp/helper/libzip/zip.h similarity index 100% rename from src/helper/libzip/zip.h rename to src/eepp/helper/libzip/zip.h diff --git a/src/helper/libzip/zip_add.c b/src/eepp/helper/libzip/zip_add.c similarity index 100% rename from src/helper/libzip/zip_add.c rename to src/eepp/helper/libzip/zip_add.c diff --git a/src/helper/libzip/zip_add_dir.c b/src/eepp/helper/libzip/zip_add_dir.c similarity index 100% rename from src/helper/libzip/zip_add_dir.c rename to src/eepp/helper/libzip/zip_add_dir.c diff --git a/src/helper/libzip/zip_close.c b/src/eepp/helper/libzip/zip_close.c similarity index 100% rename from src/helper/libzip/zip_close.c rename to src/eepp/helper/libzip/zip_close.c diff --git a/src/helper/libzip/zip_delete.c b/src/eepp/helper/libzip/zip_delete.c similarity index 100% rename from src/helper/libzip/zip_delete.c rename to src/eepp/helper/libzip/zip_delete.c diff --git a/src/helper/libzip/zip_dirent.c b/src/eepp/helper/libzip/zip_dirent.c similarity index 100% rename from src/helper/libzip/zip_dirent.c rename to src/eepp/helper/libzip/zip_dirent.c diff --git a/src/helper/libzip/zip_entry_free.c b/src/eepp/helper/libzip/zip_entry_free.c similarity index 100% rename from src/helper/libzip/zip_entry_free.c rename to src/eepp/helper/libzip/zip_entry_free.c diff --git a/src/helper/libzip/zip_entry_new.c b/src/eepp/helper/libzip/zip_entry_new.c similarity index 100% rename from src/helper/libzip/zip_entry_new.c rename to src/eepp/helper/libzip/zip_entry_new.c diff --git a/src/helper/libzip/zip_err_str.c b/src/eepp/helper/libzip/zip_err_str.c similarity index 100% rename from src/helper/libzip/zip_err_str.c rename to src/eepp/helper/libzip/zip_err_str.c diff --git a/src/helper/libzip/zip_error.c b/src/eepp/helper/libzip/zip_error.c similarity index 100% rename from src/helper/libzip/zip_error.c rename to src/eepp/helper/libzip/zip_error.c diff --git a/src/helper/libzip/zip_error_clear.c b/src/eepp/helper/libzip/zip_error_clear.c similarity index 100% rename from src/helper/libzip/zip_error_clear.c rename to src/eepp/helper/libzip/zip_error_clear.c diff --git a/src/helper/libzip/zip_error_get.c b/src/eepp/helper/libzip/zip_error_get.c similarity index 100% rename from src/helper/libzip/zip_error_get.c rename to src/eepp/helper/libzip/zip_error_get.c diff --git a/src/helper/libzip/zip_error_get_sys_type.c b/src/eepp/helper/libzip/zip_error_get_sys_type.c similarity index 100% rename from src/helper/libzip/zip_error_get_sys_type.c rename to src/eepp/helper/libzip/zip_error_get_sys_type.c diff --git a/src/helper/libzip/zip_error_strerror.c b/src/eepp/helper/libzip/zip_error_strerror.c similarity index 100% rename from src/helper/libzip/zip_error_strerror.c rename to src/eepp/helper/libzip/zip_error_strerror.c diff --git a/src/helper/libzip/zip_error_to_str.c b/src/eepp/helper/libzip/zip_error_to_str.c similarity index 100% rename from src/helper/libzip/zip_error_to_str.c rename to src/eepp/helper/libzip/zip_error_to_str.c diff --git a/src/helper/libzip/zip_fclose.c b/src/eepp/helper/libzip/zip_fclose.c similarity index 100% rename from src/helper/libzip/zip_fclose.c rename to src/eepp/helper/libzip/zip_fclose.c diff --git a/src/helper/libzip/zip_fdopen.c b/src/eepp/helper/libzip/zip_fdopen.c similarity index 100% rename from src/helper/libzip/zip_fdopen.c rename to src/eepp/helper/libzip/zip_fdopen.c diff --git a/src/helper/libzip/zip_file_error_clear.c b/src/eepp/helper/libzip/zip_file_error_clear.c similarity index 100% rename from src/helper/libzip/zip_file_error_clear.c rename to src/eepp/helper/libzip/zip_file_error_clear.c diff --git a/src/helper/libzip/zip_file_error_get.c b/src/eepp/helper/libzip/zip_file_error_get.c similarity index 100% rename from src/helper/libzip/zip_file_error_get.c rename to src/eepp/helper/libzip/zip_file_error_get.c diff --git a/src/helper/libzip/zip_file_get_offset.c b/src/eepp/helper/libzip/zip_file_get_offset.c similarity index 100% rename from src/helper/libzip/zip_file_get_offset.c rename to src/eepp/helper/libzip/zip_file_get_offset.c diff --git a/src/helper/libzip/zip_file_strerror.c b/src/eepp/helper/libzip/zip_file_strerror.c similarity index 100% rename from src/helper/libzip/zip_file_strerror.c rename to src/eepp/helper/libzip/zip_file_strerror.c diff --git a/src/helper/libzip/zip_filerange_crc.c b/src/eepp/helper/libzip/zip_filerange_crc.c similarity index 100% rename from src/helper/libzip/zip_filerange_crc.c rename to src/eepp/helper/libzip/zip_filerange_crc.c diff --git a/src/helper/libzip/zip_fopen.c b/src/eepp/helper/libzip/zip_fopen.c similarity index 100% rename from src/helper/libzip/zip_fopen.c rename to src/eepp/helper/libzip/zip_fopen.c diff --git a/src/helper/libzip/zip_fopen_encrypted.c b/src/eepp/helper/libzip/zip_fopen_encrypted.c similarity index 100% rename from src/helper/libzip/zip_fopen_encrypted.c rename to src/eepp/helper/libzip/zip_fopen_encrypted.c diff --git a/src/helper/libzip/zip_fopen_index.c b/src/eepp/helper/libzip/zip_fopen_index.c similarity index 100% rename from src/helper/libzip/zip_fopen_index.c rename to src/eepp/helper/libzip/zip_fopen_index.c diff --git a/src/helper/libzip/zip_fopen_index_encrypted.c b/src/eepp/helper/libzip/zip_fopen_index_encrypted.c similarity index 100% rename from src/helper/libzip/zip_fopen_index_encrypted.c rename to src/eepp/helper/libzip/zip_fopen_index_encrypted.c diff --git a/src/helper/libzip/zip_fread.c b/src/eepp/helper/libzip/zip_fread.c similarity index 100% rename from src/helper/libzip/zip_fread.c rename to src/eepp/helper/libzip/zip_fread.c diff --git a/src/helper/libzip/zip_free.c b/src/eepp/helper/libzip/zip_free.c similarity index 100% rename from src/helper/libzip/zip_free.c rename to src/eepp/helper/libzip/zip_free.c diff --git a/src/helper/libzip/zip_get_archive_comment.c b/src/eepp/helper/libzip/zip_get_archive_comment.c similarity index 100% rename from src/helper/libzip/zip_get_archive_comment.c rename to src/eepp/helper/libzip/zip_get_archive_comment.c diff --git a/src/helper/libzip/zip_get_archive_flag.c b/src/eepp/helper/libzip/zip_get_archive_flag.c similarity index 100% rename from src/helper/libzip/zip_get_archive_flag.c rename to src/eepp/helper/libzip/zip_get_archive_flag.c diff --git a/src/helper/libzip/zip_get_compression_implementation.c b/src/eepp/helper/libzip/zip_get_compression_implementation.c similarity index 100% rename from src/helper/libzip/zip_get_compression_implementation.c rename to src/eepp/helper/libzip/zip_get_compression_implementation.c diff --git a/src/helper/libzip/zip_get_encryption_implementation.c b/src/eepp/helper/libzip/zip_get_encryption_implementation.c similarity index 100% rename from src/helper/libzip/zip_get_encryption_implementation.c rename to src/eepp/helper/libzip/zip_get_encryption_implementation.c diff --git a/src/helper/libzip/zip_get_file_comment.c b/src/eepp/helper/libzip/zip_get_file_comment.c similarity index 100% rename from src/helper/libzip/zip_get_file_comment.c rename to src/eepp/helper/libzip/zip_get_file_comment.c diff --git a/src/helper/libzip/zip_get_file_extra.c b/src/eepp/helper/libzip/zip_get_file_extra.c similarity index 100% rename from src/helper/libzip/zip_get_file_extra.c rename to src/eepp/helper/libzip/zip_get_file_extra.c diff --git a/src/helper/libzip/zip_get_name.c b/src/eepp/helper/libzip/zip_get_name.c similarity index 100% rename from src/helper/libzip/zip_get_name.c rename to src/eepp/helper/libzip/zip_get_name.c diff --git a/src/helper/libzip/zip_get_num_entries.c b/src/eepp/helper/libzip/zip_get_num_entries.c similarity index 100% rename from src/helper/libzip/zip_get_num_entries.c rename to src/eepp/helper/libzip/zip_get_num_entries.c diff --git a/src/helper/libzip/zip_get_num_files.c b/src/eepp/helper/libzip/zip_get_num_files.c similarity index 100% rename from src/helper/libzip/zip_get_num_files.c rename to src/eepp/helper/libzip/zip_get_num_files.c diff --git a/src/helper/libzip/zip_memdup.c b/src/eepp/helper/libzip/zip_memdup.c similarity index 100% rename from src/helper/libzip/zip_memdup.c rename to src/eepp/helper/libzip/zip_memdup.c diff --git a/src/helper/libzip/zip_name_locate.c b/src/eepp/helper/libzip/zip_name_locate.c similarity index 100% rename from src/helper/libzip/zip_name_locate.c rename to src/eepp/helper/libzip/zip_name_locate.c diff --git a/src/helper/libzip/zip_new.c b/src/eepp/helper/libzip/zip_new.c similarity index 100% rename from src/helper/libzip/zip_new.c rename to src/eepp/helper/libzip/zip_new.c diff --git a/src/helper/libzip/zip_open.c b/src/eepp/helper/libzip/zip_open.c similarity index 100% rename from src/helper/libzip/zip_open.c rename to src/eepp/helper/libzip/zip_open.c diff --git a/src/helper/libzip/zip_rename.c b/src/eepp/helper/libzip/zip_rename.c similarity index 100% rename from src/helper/libzip/zip_rename.c rename to src/eepp/helper/libzip/zip_rename.c diff --git a/src/helper/libzip/zip_replace.c b/src/eepp/helper/libzip/zip_replace.c similarity index 100% rename from src/helper/libzip/zip_replace.c rename to src/eepp/helper/libzip/zip_replace.c diff --git a/src/helper/libzip/zip_set_archive_comment.c b/src/eepp/helper/libzip/zip_set_archive_comment.c similarity index 100% rename from src/helper/libzip/zip_set_archive_comment.c rename to src/eepp/helper/libzip/zip_set_archive_comment.c diff --git a/src/helper/libzip/zip_set_archive_flag.c b/src/eepp/helper/libzip/zip_set_archive_flag.c similarity index 100% rename from src/helper/libzip/zip_set_archive_flag.c rename to src/eepp/helper/libzip/zip_set_archive_flag.c diff --git a/src/helper/libzip/zip_set_default_password.c b/src/eepp/helper/libzip/zip_set_default_password.c similarity index 100% rename from src/helper/libzip/zip_set_default_password.c rename to src/eepp/helper/libzip/zip_set_default_password.c diff --git a/src/helper/libzip/zip_set_file_comment.c b/src/eepp/helper/libzip/zip_set_file_comment.c similarity index 100% rename from src/helper/libzip/zip_set_file_comment.c rename to src/eepp/helper/libzip/zip_set_file_comment.c diff --git a/src/helper/libzip/zip_set_file_extra.c b/src/eepp/helper/libzip/zip_set_file_extra.c similarity index 100% rename from src/helper/libzip/zip_set_file_extra.c rename to src/eepp/helper/libzip/zip_set_file_extra.c diff --git a/src/helper/libzip/zip_set_name.c b/src/eepp/helper/libzip/zip_set_name.c similarity index 100% rename from src/helper/libzip/zip_set_name.c rename to src/eepp/helper/libzip/zip_set_name.c diff --git a/src/helper/libzip/zip_source_buffer.c b/src/eepp/helper/libzip/zip_source_buffer.c similarity index 100% rename from src/helper/libzip/zip_source_buffer.c rename to src/eepp/helper/libzip/zip_source_buffer.c diff --git a/src/helper/libzip/zip_source_close.c b/src/eepp/helper/libzip/zip_source_close.c similarity index 100% rename from src/helper/libzip/zip_source_close.c rename to src/eepp/helper/libzip/zip_source_close.c diff --git a/src/helper/libzip/zip_source_crc.c b/src/eepp/helper/libzip/zip_source_crc.c similarity index 100% rename from src/helper/libzip/zip_source_crc.c rename to src/eepp/helper/libzip/zip_source_crc.c diff --git a/src/helper/libzip/zip_source_deflate.c b/src/eepp/helper/libzip/zip_source_deflate.c similarity index 100% rename from src/helper/libzip/zip_source_deflate.c rename to src/eepp/helper/libzip/zip_source_deflate.c diff --git a/src/helper/libzip/zip_source_error.c b/src/eepp/helper/libzip/zip_source_error.c similarity index 100% rename from src/helper/libzip/zip_source_error.c rename to src/eepp/helper/libzip/zip_source_error.c diff --git a/src/helper/libzip/zip_source_file.c b/src/eepp/helper/libzip/zip_source_file.c similarity index 100% rename from src/helper/libzip/zip_source_file.c rename to src/eepp/helper/libzip/zip_source_file.c diff --git a/src/helper/libzip/zip_source_filep.c b/src/eepp/helper/libzip/zip_source_filep.c similarity index 100% rename from src/helper/libzip/zip_source_filep.c rename to src/eepp/helper/libzip/zip_source_filep.c diff --git a/src/helper/libzip/zip_source_free.c b/src/eepp/helper/libzip/zip_source_free.c similarity index 100% rename from src/helper/libzip/zip_source_free.c rename to src/eepp/helper/libzip/zip_source_free.c diff --git a/src/helper/libzip/zip_source_function.c b/src/eepp/helper/libzip/zip_source_function.c similarity index 100% rename from src/helper/libzip/zip_source_function.c rename to src/eepp/helper/libzip/zip_source_function.c diff --git a/src/helper/libzip/zip_source_layered.c b/src/eepp/helper/libzip/zip_source_layered.c similarity index 100% rename from src/helper/libzip/zip_source_layered.c rename to src/eepp/helper/libzip/zip_source_layered.c diff --git a/src/helper/libzip/zip_source_open.c b/src/eepp/helper/libzip/zip_source_open.c similarity index 100% rename from src/helper/libzip/zip_source_open.c rename to src/eepp/helper/libzip/zip_source_open.c diff --git a/src/helper/libzip/zip_source_pkware.c b/src/eepp/helper/libzip/zip_source_pkware.c similarity index 100% rename from src/helper/libzip/zip_source_pkware.c rename to src/eepp/helper/libzip/zip_source_pkware.c diff --git a/src/helper/libzip/zip_source_pop.c b/src/eepp/helper/libzip/zip_source_pop.c similarity index 100% rename from src/helper/libzip/zip_source_pop.c rename to src/eepp/helper/libzip/zip_source_pop.c diff --git a/src/helper/libzip/zip_source_read.c b/src/eepp/helper/libzip/zip_source_read.c similarity index 100% rename from src/helper/libzip/zip_source_read.c rename to src/eepp/helper/libzip/zip_source_read.c diff --git a/src/helper/libzip/zip_source_stat.c b/src/eepp/helper/libzip/zip_source_stat.c similarity index 100% rename from src/helper/libzip/zip_source_stat.c rename to src/eepp/helper/libzip/zip_source_stat.c diff --git a/src/helper/libzip/zip_source_zip.c b/src/eepp/helper/libzip/zip_source_zip.c similarity index 100% rename from src/helper/libzip/zip_source_zip.c rename to src/eepp/helper/libzip/zip_source_zip.c diff --git a/src/helper/libzip/zip_stat.c b/src/eepp/helper/libzip/zip_stat.c similarity index 100% rename from src/helper/libzip/zip_stat.c rename to src/eepp/helper/libzip/zip_stat.c diff --git a/src/helper/libzip/zip_stat_index.c b/src/eepp/helper/libzip/zip_stat_index.c similarity index 100% rename from src/helper/libzip/zip_stat_index.c rename to src/eepp/helper/libzip/zip_stat_index.c diff --git a/src/helper/libzip/zip_stat_init.c b/src/eepp/helper/libzip/zip_stat_init.c similarity index 100% rename from src/helper/libzip/zip_stat_init.c rename to src/eepp/helper/libzip/zip_stat_init.c diff --git a/src/helper/libzip/zip_strerror.c b/src/eepp/helper/libzip/zip_strerror.c similarity index 100% rename from src/helper/libzip/zip_strerror.c rename to src/eepp/helper/libzip/zip_strerror.c diff --git a/src/helper/libzip/zip_unchange.c b/src/eepp/helper/libzip/zip_unchange.c similarity index 100% rename from src/helper/libzip/zip_unchange.c rename to src/eepp/helper/libzip/zip_unchange.c diff --git a/src/helper/libzip/zip_unchange_all.c b/src/eepp/helper/libzip/zip_unchange_all.c similarity index 100% rename from src/helper/libzip/zip_unchange_all.c rename to src/eepp/helper/libzip/zip_unchange_all.c diff --git a/src/helper/libzip/zip_unchange_archive.c b/src/eepp/helper/libzip/zip_unchange_archive.c similarity index 100% rename from src/helper/libzip/zip_unchange_archive.c rename to src/eepp/helper/libzip/zip_unchange_archive.c diff --git a/src/helper/libzip/zip_unchange_data.c b/src/eepp/helper/libzip/zip_unchange_data.c similarity index 100% rename from src/helper/libzip/zip_unchange_data.c rename to src/eepp/helper/libzip/zip_unchange_data.c diff --git a/src/helper/libzip/zipconf.h b/src/eepp/helper/libzip/zipconf.h similarity index 100% rename from src/helper/libzip/zipconf.h rename to src/eepp/helper/libzip/zipconf.h diff --git a/src/helper/libzip/zipint.h b/src/eepp/helper/libzip/zipint.h similarity index 100% rename from src/helper/libzip/zipint.h rename to src/eepp/helper/libzip/zipint.h diff --git a/src/eepp/helper/sophist/sophist.h b/src/eepp/helper/sophist/sophist.h new file mode 100644 index 000000000..3818b6b8e --- /dev/null +++ b/src/eepp/helper/sophist/sophist.h @@ -0,0 +1,187 @@ +/* sophist.h - 0.3 - public domain - Sean Barrett 2010 +** Knowledge drawn from Brian Hook's posh.h and http://predef.sourceforge.net +** Sophist provides portable types; you typedef/#define them to your own names +** +** defines: +** - SOPHIST_endian - either SOPHIST_little_endian or SOPHIST_big_endian +** - SOPHIST_has_64 - either 0 or 1; if 0, int64 types aren't defined +** - SOPHIST_pointer64 - either 0 or 1; if 1, pointer is 64-bit +** +** - SOPHIST_intptr, SOPHIST_uintptr - integer same size as pointer +** - SOPHIST_int8, SOPHIST_uint8, SOPHIST_int16, SOPHIST_uint16 +** - SOPHIST_int32, SOPHIST_uint32, SOPHIST_int64, SOPHIST_uint64 +** - SOPHIST_int64_constant(number) - macros for creating 64-bit +** - SOPHIST_uint64_constant(number) integer constants +** - SOPHIST_printf_format64 - string for printf format for int64 +*/ + +#ifndef __INCLUDE_SOPHIST_H__ +#define __INCLUDE_SOPHIST_H__ + +#define SOPHIST_compiletime_assert(name,val) \ + typedef int SOPHIST__assert##name[(val) ? 1 : -1] + +/* define a couple synthetic rules to make code more readable */ +#if (defined(__sparc__) || defined(__sparc)) && \ + (defined(__arch64__) || defined(__sparcv9) || defined(__sparc_v9__)) + #define SOPHIST_sparc64 +#endif + +#if (defined(linux) || defined(__linux__)) && \ + (defined(__alpha)||defined(__alpha__)||defined(__x86_64__)||defined(_M_X64)) + #define SOPHIST_linux64 +#endif + +/* basic types */ +typedef signed char SOPHIST_int8; +typedef unsigned char SOPHIST_uint8; + +typedef signed short SOPHIST_int16; +typedef unsigned short SOPHIST_uint16; + +#ifdef __palmos__ + typedef signed long SOPHIST_int32; + typedef unsigned long SOPHIST_uint32; +#else + typedef signed int SOPHIST_int32; + typedef unsigned int SOPHIST_uint32; +#endif + +#ifndef SOPHIST_NO_64 + #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) \ + || (defined(__alpha) && defined(__DECC)) + + typedef signed __int64 SOPHIST_int64; + typedef unsigned __int64 SOPHIST_uint64; + #define SOPHIST_has_64 1 + #define SOPHIST_int64_constant(x) (x##i64) + #define SOPHIST_uint64_constant(x) (x##ui64) + #define SOPHIST_printf_format64 "I64" + + #elif defined(__LP64__) || defined(__powerpc64__) || defined(SOPHIST_sparc64) + + typedef signed long SOPHIST_int64; + typedef unsigned long SOPHIST_uint64; + + #define SOPHIST_has_64 1 + #define SOPHIST_int64_constant(x) ((SOPHIST_int64) x) + #define SOPHIST_uint64_constant(x) ((SOPHIST_uint64) x) + #define SOPHIST_printf_format64 "l" + + #elif defined(_LONG_LONG) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) \ + || defined(__GNUC__) || defined(__MWERKS__) || defined(__APPLE_CC__) \ + || defined(sgi) || defined (__sgi) || defined(__sgi__) \ + || defined(_CRAYC) + + typedef signed long long SOPHIST_int64; + typedef unsigned long long SOPHIST_uint64; + + #define SOPHIST_has_64 1 + #define SOPHIST_int64_constant(x) (x##LL) + #define SOPHIST_uint64_constant(x) (x##ULL) + #define SOPHIST_printf_format64 "ll" + #endif +#endif + +#ifndef SOPHIST_has_64 +#define SOPHIST_has_64 0 +#endif + +SOPHIST_compiletime_assert( int8 , sizeof(SOPHIST_int8 ) == 1); +SOPHIST_compiletime_assert(uint16, sizeof(SOPHIST_int16) == 2); +SOPHIST_compiletime_assert( int32, sizeof(SOPHIST_int32 ) == 4); +SOPHIST_compiletime_assert(uint32, sizeof(SOPHIST_uint32) == 4); + +#if SOPHIST_has_64 + SOPHIST_compiletime_assert( int64, sizeof(SOPHIST_int64 ) == 8); + SOPHIST_compiletime_assert(uint64, sizeof(SOPHIST_uint64) == 8); +#endif + +/* determine whether pointers are 64-bit */ + +#if defined(SOPHIST_linux64) || defined(SOPHIST_sparc64) \ + || defined(__osf__) || (defined(_WIN64) && !defined(_XBOX)) \ + || defined(__64BIT__) \ + || defined(__LP64) || defined(__LP64__) || defined(_LP64) \ + || defined(_ADDR64) || defined(_CRAYC) \ + + #define SOPHIST_pointer64 1 + + SOPHIST_compiletime_assert(pointer64, sizeof(void*) == 8); + + typedef SOPHIST_int64 SOPHIST_intptr; + typedef SOPHIST_uint64 SOPHIST_uintptr; +#else + + #define SOPHIST_pointer64 0 + + SOPHIST_compiletime_assert(pointer64, sizeof(void*) <= 4); + + /* do we care about pointers that are only 16-bit? */ + typedef SOPHIST_int32 SOPHIST_intptr; + typedef SOPHIST_uint32 SOPHIST_uintptr; + +#endif + +SOPHIST_compiletime_assert(intptr, sizeof(SOPHIST_intptr) == sizeof(char *)); + +/* enumerate known little endian cases; fallback to big-endian */ + +#define SOPHIST_little_endian 1 +#define SOPHIST_big_endian 2 + +#if defined(__386__) || defined(i386) || defined(__i386__) \ + || defined(__X86) || defined(_M_IX86) \ + || defined(_M_X64) || defined(__x86_64__) \ + || defined(alpha) || defined(__alpha) || defined(__alpha__) \ + || defined(_M_ALPHA) \ + || defined(ARM) || defined(_ARM) || defined(__arm__) \ + || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \ + || defined(_WIN32_WCE) || defined(__NT__) \ + || defined(__MIPSEL__) + #define SOPHIST_endian SOPHIST_little_endian +#else + #define SOPHIST_endian SOPHIST_big_endian +#endif + +#endif /* __INCLUDE_SOPHIST_H__ */ + +#ifdef SOPHIST_selftest +#include +#include +int main(int argc, char **argv) +{ + int fail=0; + union { + SOPHIST_uint8 bytes[4]; + SOPHIST_uint32 num; + } x; + + #if SOPHIST_has_64 + char buffer[32]; + sprintf(buffer, "%016" SOPHIST_printf_format64 "x", + SOPHIST_uint64_constant(0x0123456789abcdef)); + if (strcmp(buffer, "0123456789abcdef")) { + fail = 1; fputs("ERROR: 64-bit check failed.\n", stderr); + } + #endif + + #if SOPHIST_endian == SOPHIST_little_endian + x.bytes[0] = 7; x.bytes[1] = 5; x.bytes[2] = 3; x.bytes[3] = 1; + #elif SOPHIST_endian == SOPHIST_big_endian + x.bytes[0] = 1; x.bytes[1] = 3; x.bytes[2] = 5; x.bytes[3] = 7; + #else + #error "Failure: endianness unknown!" + #endif + if (x.num != 0x01030507) { + fail = 1; fputs("ERROR: endian check failed.\n", stderr); + } + + fputs(fail ? "Failed.\n" : "Passed.\n", stdout); + + argc = argc; /* attempt to suppress unused variable warnings */ + argv = argv; + + return 0; +} +#endif diff --git a/src/helper/stb_vorbis/stb_vorbis.c b/src/eepp/helper/stb_vorbis/stb_vorbis.c similarity index 100% rename from src/helper/stb_vorbis/stb_vorbis.c rename to src/eepp/helper/stb_vorbis/stb_vorbis.c diff --git a/src/helper/stb_vorbis/stb_vorbis.h b/src/eepp/helper/stb_vorbis/stb_vorbis.h similarity index 100% rename from src/helper/stb_vorbis/stb_vorbis.h rename to src/eepp/helper/stb_vorbis/stb_vorbis.h diff --git a/src/helper/zlib/adler32.c b/src/eepp/helper/zlib/adler32.c similarity index 100% rename from src/helper/zlib/adler32.c rename to src/eepp/helper/zlib/adler32.c diff --git a/src/helper/zlib/compress.c b/src/eepp/helper/zlib/compress.c similarity index 100% rename from src/helper/zlib/compress.c rename to src/eepp/helper/zlib/compress.c diff --git a/src/helper/zlib/crc32.c b/src/eepp/helper/zlib/crc32.c similarity index 100% rename from src/helper/zlib/crc32.c rename to src/eepp/helper/zlib/crc32.c diff --git a/src/helper/zlib/crc32.h b/src/eepp/helper/zlib/crc32.h similarity index 100% rename from src/helper/zlib/crc32.h rename to src/eepp/helper/zlib/crc32.h diff --git a/src/helper/zlib/deflate.c b/src/eepp/helper/zlib/deflate.c similarity index 100% rename from src/helper/zlib/deflate.c rename to src/eepp/helper/zlib/deflate.c diff --git a/src/helper/zlib/deflate.h b/src/eepp/helper/zlib/deflate.h similarity index 100% rename from src/helper/zlib/deflate.h rename to src/eepp/helper/zlib/deflate.h diff --git a/src/helper/zlib/infback.c b/src/eepp/helper/zlib/infback.c similarity index 100% rename from src/helper/zlib/infback.c rename to src/eepp/helper/zlib/infback.c diff --git a/src/helper/zlib/inffast.c b/src/eepp/helper/zlib/inffast.c similarity index 100% rename from src/helper/zlib/inffast.c rename to src/eepp/helper/zlib/inffast.c diff --git a/src/helper/zlib/inffast.h b/src/eepp/helper/zlib/inffast.h similarity index 100% rename from src/helper/zlib/inffast.h rename to src/eepp/helper/zlib/inffast.h diff --git a/src/helper/zlib/inffixed.h b/src/eepp/helper/zlib/inffixed.h similarity index 100% rename from src/helper/zlib/inffixed.h rename to src/eepp/helper/zlib/inffixed.h diff --git a/src/helper/zlib/inflate.c b/src/eepp/helper/zlib/inflate.c similarity index 100% rename from src/helper/zlib/inflate.c rename to src/eepp/helper/zlib/inflate.c diff --git a/src/helper/zlib/inflate.h b/src/eepp/helper/zlib/inflate.h similarity index 100% rename from src/helper/zlib/inflate.h rename to src/eepp/helper/zlib/inflate.h diff --git a/src/helper/zlib/inftrees.c b/src/eepp/helper/zlib/inftrees.c similarity index 100% rename from src/helper/zlib/inftrees.c rename to src/eepp/helper/zlib/inftrees.c diff --git a/src/helper/zlib/inftrees.h b/src/eepp/helper/zlib/inftrees.h similarity index 100% rename from src/helper/zlib/inftrees.h rename to src/eepp/helper/zlib/inftrees.h diff --git a/src/helper/zlib/trees.c b/src/eepp/helper/zlib/trees.c similarity index 100% rename from src/helper/zlib/trees.c rename to src/eepp/helper/zlib/trees.c diff --git a/src/helper/zlib/trees.h b/src/eepp/helper/zlib/trees.h similarity index 100% rename from src/helper/zlib/trees.h rename to src/eepp/helper/zlib/trees.h diff --git a/src/helper/zlib/uncompr.c b/src/eepp/helper/zlib/uncompr.c similarity index 100% rename from src/helper/zlib/uncompr.c rename to src/eepp/helper/zlib/uncompr.c diff --git a/src/helper/zlib/zconf.h b/src/eepp/helper/zlib/zconf.h similarity index 100% rename from src/helper/zlib/zconf.h rename to src/eepp/helper/zlib/zconf.h diff --git a/src/helper/zlib/zlib.h b/src/eepp/helper/zlib/zlib.h similarity index 100% rename from src/helper/zlib/zlib.h rename to src/eepp/helper/zlib/zlib.h diff --git a/src/helper/zlib/zutil.c b/src/eepp/helper/zlib/zutil.c similarity index 100% rename from src/helper/zlib/zutil.c rename to src/eepp/helper/zlib/zutil.c diff --git a/src/helper/zlib/zutil.h b/src/eepp/helper/zlib/zutil.h similarity index 100% rename from src/helper/zlib/zutil.h rename to src/eepp/helper/zlib/zutil.h diff --git a/src/math/cmtrand.cpp b/src/eepp/math/cmtrand.cpp similarity index 94% rename from src/math/cmtrand.cpp rename to src/eepp/math/cmtrand.cpp index 0640cb70c..11dce3d87 100755 --- a/src/math/cmtrand.cpp +++ b/src/eepp/math/cmtrand.cpp @@ -1,4 +1,4 @@ -#include "cmtrand.hpp" +#include namespace EE { namespace Math { diff --git a/src/math/math.cpp b/src/eepp/math/math.cpp similarity index 99% rename from src/math/math.cpp rename to src/eepp/math/math.cpp index 314652070..8f95b4687 100755 --- a/src/math/math.cpp +++ b/src/eepp/math/math.cpp @@ -1,4 +1,4 @@ -#include "math.hpp" +#include namespace EE { namespace Math { diff --git a/src/physics/carbiter.cpp b/src/eepp/physics/carbiter.cpp similarity index 98% rename from src/physics/carbiter.cpp rename to src/eepp/physics/carbiter.cpp index 61c1ac111..3b2ee31e6 100644 --- a/src/physics/carbiter.cpp +++ b/src/eepp/physics/carbiter.cpp @@ -1,4 +1,4 @@ -#include "carbiter.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cbody.cpp b/src/eepp/physics/cbody.cpp similarity index 97% rename from src/physics/cbody.cpp rename to src/eepp/physics/cbody.cpp index fb5fa5c55..608c4e16b 100644 --- a/src/physics/cbody.cpp +++ b/src/eepp/physics/cbody.cpp @@ -1,8 +1,8 @@ -#include "cbody.hpp" -#include "cphysicsmanager.hpp" -#include "cshape.hpp" -#include "constraints/cconstraint.hpp" -#include "carbiter.hpp" +#include +#include +#include +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cconstraint.cpp b/src/eepp/physics/constraints/cconstraint.cpp similarity index 94% rename from src/physics/constraints/cconstraint.cpp rename to src/eepp/physics/constraints/cconstraint.cpp index 5e5db5c6b..61b912091 100644 --- a/src/physics/constraints/cconstraint.cpp +++ b/src/eepp/physics/constraints/cconstraint.cpp @@ -1,5 +1,5 @@ -#include "cconstraint.hpp" -#include "../cphysicsmanager.hpp" +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cdampedrotaryspring.cpp b/src/eepp/physics/constraints/cdampedrotaryspring.cpp similarity index 94% rename from src/physics/constraints/cdampedrotaryspring.cpp rename to src/eepp/physics/constraints/cdampedrotaryspring.cpp index e08c2b04d..77edd1e0b 100644 --- a/src/physics/constraints/cdampedrotaryspring.cpp +++ b/src/eepp/physics/constraints/cdampedrotaryspring.cpp @@ -1,4 +1,4 @@ -#include "cdampedrotaryspring.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cdampedspring.cpp b/src/eepp/physics/constraints/cdampedspring.cpp similarity index 95% rename from src/physics/constraints/cdampedspring.cpp rename to src/eepp/physics/constraints/cdampedspring.cpp index 5fa06a1b1..9017331db 100644 --- a/src/physics/constraints/cdampedspring.cpp +++ b/src/eepp/physics/constraints/cdampedspring.cpp @@ -1,8 +1,8 @@ -#include "cdampedspring.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../../graphics/glhelper.hpp" -#include "../../graphics/cglobalbatchrenderer.hpp" +#include +#include using namespace EE::Graphics; #endif diff --git a/src/physics/constraints/cgearjoint.cpp b/src/eepp/physics/constraints/cgearjoint.cpp similarity index 92% rename from src/physics/constraints/cgearjoint.cpp rename to src/eepp/physics/constraints/cgearjoint.cpp index 6159bccbf..945e467a2 100644 --- a/src/physics/constraints/cgearjoint.cpp +++ b/src/eepp/physics/constraints/cgearjoint.cpp @@ -1,4 +1,4 @@ -#include "cgearjoint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cgroovejoint.cpp b/src/eepp/physics/constraints/cgroovejoint.cpp similarity index 94% rename from src/physics/constraints/cgroovejoint.cpp rename to src/eepp/physics/constraints/cgroovejoint.cpp index aa19b5c52..dc8a78d69 100644 --- a/src/physics/constraints/cgroovejoint.cpp +++ b/src/eepp/physics/constraints/cgroovejoint.cpp @@ -1,7 +1,7 @@ -#include "cgroovejoint.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../../graphics/cglobalbatchrenderer.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/constraints/cpinjoint.cpp b/src/eepp/physics/constraints/cpinjoint.cpp similarity index 94% rename from src/physics/constraints/cpinjoint.cpp rename to src/eepp/physics/constraints/cpinjoint.cpp index e0d477573..8e9325103 100644 --- a/src/physics/constraints/cpinjoint.cpp +++ b/src/eepp/physics/constraints/cpinjoint.cpp @@ -1,7 +1,7 @@ -#include "cpinjoint.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../../graphics/cglobalbatchrenderer.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/constraints/cpivotjoint.cpp b/src/eepp/physics/constraints/cpivotjoint.cpp similarity index 93% rename from src/physics/constraints/cpivotjoint.cpp rename to src/eepp/physics/constraints/cpivotjoint.cpp index f63f9e406..de21d8a75 100644 --- a/src/physics/constraints/cpivotjoint.cpp +++ b/src/eepp/physics/constraints/cpivotjoint.cpp @@ -1,7 +1,7 @@ -#include "cpivotjoint.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../../graphics/cglobalbatchrenderer.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/constraints/cratchetjoint.cpp b/src/eepp/physics/constraints/cratchetjoint.cpp similarity index 93% rename from src/physics/constraints/cratchetjoint.cpp rename to src/eepp/physics/constraints/cratchetjoint.cpp index 706df687d..a5cf764c1 100644 --- a/src/physics/constraints/cratchetjoint.cpp +++ b/src/eepp/physics/constraints/cratchetjoint.cpp @@ -1,4 +1,4 @@ -#include "cratchetjoint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/crotarylimitjoint.cpp b/src/eepp/physics/constraints/crotarylimitjoint.cpp similarity index 91% rename from src/physics/constraints/crotarylimitjoint.cpp rename to src/eepp/physics/constraints/crotarylimitjoint.cpp index 84ccea167..88a2fd91b 100644 --- a/src/physics/constraints/crotarylimitjoint.cpp +++ b/src/eepp/physics/constraints/crotarylimitjoint.cpp @@ -1,4 +1,4 @@ -#include "crotarylimitjoint.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/csimplemotor.cpp b/src/eepp/physics/constraints/csimplemotor.cpp similarity index 88% rename from src/physics/constraints/csimplemotor.cpp rename to src/eepp/physics/constraints/csimplemotor.cpp index 08d308351..55d6d1ee2 100644 --- a/src/physics/constraints/csimplemotor.cpp +++ b/src/eepp/physics/constraints/csimplemotor.cpp @@ -1,4 +1,4 @@ -#include "csimplemotor.hpp" +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/constraints/cslidejoint.cpp b/src/eepp/physics/constraints/cslidejoint.cpp similarity index 94% rename from src/physics/constraints/cslidejoint.cpp rename to src/eepp/physics/constraints/cslidejoint.cpp index e0cf02215..5f989dd35 100644 --- a/src/physics/constraints/cslidejoint.cpp +++ b/src/eepp/physics/constraints/cslidejoint.cpp @@ -1,7 +1,7 @@ -#include "cslidejoint.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../../graphics/cglobalbatchrenderer.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/cphysicsmanager.cpp b/src/eepp/physics/cphysicsmanager.cpp similarity index 92% rename from src/physics/cphysicsmanager.cpp rename to src/eepp/physics/cphysicsmanager.cpp index d8d91e37a..8958de7b8 100644 --- a/src/physics/cphysicsmanager.cpp +++ b/src/eepp/physics/cphysicsmanager.cpp @@ -1,8 +1,8 @@ -#include "cphysicsmanager.hpp" -#include "cbody.hpp" -#include "cshape.hpp" -#include "cspace.hpp" -#include "constraints/cconstraint.hpp" +#include +#include +#include +#include +#include CP_NAMESPACE_BEGIN diff --git a/src/physics/cshape.cpp b/src/eepp/physics/cshape.cpp similarity index 93% rename from src/physics/cshape.cpp rename to src/eepp/physics/cshape.cpp index fa0612911..d66694a06 100644 --- a/src/physics/cshape.cpp +++ b/src/eepp/physics/cshape.cpp @@ -1,11 +1,11 @@ -#include "cshape.hpp" -#include "cshapecircle.hpp" -#include "cshapesegment.hpp" -#include "cshapepoly.hpp" -#include "cphysicsmanager.hpp" +#include +#include +#include +#include +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/cprimitives.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/cshapecircle.cpp b/src/eepp/physics/cshapecircle.cpp similarity index 90% rename from src/physics/cshapecircle.cpp rename to src/eepp/physics/cshapecircle.cpp index 996716f7a..6744e049a 100644 --- a/src/physics/cshapecircle.cpp +++ b/src/eepp/physics/cshapecircle.cpp @@ -1,8 +1,8 @@ -#include "cshapecircle.hpp" -#include "cspace.hpp" +#include +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/cprimitives.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/cshapecirclesprite.cpp b/src/eepp/physics/cshapecirclesprite.cpp similarity index 96% rename from src/physics/cshapecirclesprite.cpp rename to src/eepp/physics/cshapecirclesprite.cpp index f3124ac78..4c4393b10 100644 --- a/src/physics/cshapecirclesprite.cpp +++ b/src/eepp/physics/cshapecirclesprite.cpp @@ -1,4 +1,4 @@ -#include "cshapecirclesprite.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED diff --git a/src/physics/cshapepoly.cpp b/src/eepp/physics/cshapepoly.cpp similarity index 95% rename from src/physics/cshapepoly.cpp rename to src/eepp/physics/cshapepoly.cpp index 89218498f..ed5c68ffa 100644 --- a/src/physics/cshapepoly.cpp +++ b/src/eepp/physics/cshapepoly.cpp @@ -1,8 +1,8 @@ -#include "cshapepoly.hpp" -#include "cspace.hpp" +#include +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/cglobalbatchrenderer.hpp" +#include using namespace EE::Graphics; #endif diff --git a/src/physics/cshapepolysprite.cpp b/src/eepp/physics/cshapepolysprite.cpp similarity index 97% rename from src/physics/cshapepolysprite.cpp rename to src/eepp/physics/cshapepolysprite.cpp index 5d7ee9e2b..18b68a2cb 100644 --- a/src/physics/cshapepolysprite.cpp +++ b/src/eepp/physics/cshapepolysprite.cpp @@ -1,4 +1,4 @@ -#include "cshapepolysprite.hpp" +#include #ifdef PHYSICS_RENDERER_ENABLED diff --git a/src/physics/cshapesegment.cpp b/src/eepp/physics/cshapesegment.cpp similarity index 95% rename from src/physics/cshapesegment.cpp rename to src/eepp/physics/cshapesegment.cpp index 01ae9bb23..24fdc3a83 100644 --- a/src/physics/cshapesegment.cpp +++ b/src/eepp/physics/cshapesegment.cpp @@ -1,9 +1,9 @@ -#include "cshapesegment.hpp" -#include "cspace.hpp" +#include +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../graphics/glhelper.hpp" -#include "../graphics/cprimitives.hpp" +#include +#include using namespace EE::Graphics; #endif diff --git a/src/physics/cspace.cpp b/src/eepp/physics/cspace.cpp similarity index 99% rename from src/physics/cspace.cpp rename to src/eepp/physics/cspace.cpp index 088477e90..a7e390c28 100644 --- a/src/physics/cspace.cpp +++ b/src/eepp/physics/cspace.cpp @@ -1,9 +1,9 @@ -#include "cspace.hpp" -#include "cphysicsmanager.hpp" +#include +#include #ifdef PHYSICS_RENDERER_ENABLED -#include "../window/cengine.hpp" -#include "../graphics/cglobalbatchrenderer.hpp" +#include +#include using namespace EE::Graphics; #endif diff --git a/src/system/cinifile.cpp b/src/eepp/system/cinifile.cpp similarity index 98% rename from src/system/cinifile.cpp rename to src/eepp/system/cinifile.cpp index 9dd02c405..6cdce236c 100755 --- a/src/system/cinifile.cpp +++ b/src/eepp/system/cinifile.cpp @@ -1,8 +1,8 @@ #include -#include "cinifile.hpp" -#include "cpackmanager.hpp" -#include "ciostreamfile.hpp" -#include "ciostreammemory.hpp" +#include +#include +#include +#include namespace EE { namespace System { diff --git a/src/system/ciostreamfile.cpp b/src/eepp/system/ciostreamfile.cpp similarity index 96% rename from src/system/ciostreamfile.cpp rename to src/eepp/system/ciostreamfile.cpp index d50f112ac..3483af746 100644 --- a/src/system/ciostreamfile.cpp +++ b/src/eepp/system/ciostreamfile.cpp @@ -1,4 +1,4 @@ -#include "ciostreamfile.hpp" +#include namespace EE { namespace System { diff --git a/src/system/ciostreammemory.cpp b/src/eepp/system/ciostreammemory.cpp similarity index 96% rename from src/system/ciostreammemory.cpp rename to src/eepp/system/ciostreammemory.cpp index e9eb98285..f1f2fd96c 100644 --- a/src/system/ciostreammemory.cpp +++ b/src/eepp/system/ciostreammemory.cpp @@ -1,4 +1,4 @@ -#include "ciostreammemory.hpp" +#include namespace EE { namespace System { diff --git a/src/system/clog.cpp b/src/eepp/system/clog.cpp similarity index 98% rename from src/system/clog.cpp rename to src/eepp/system/clog.cpp index c38adca29..afa1fa82e 100755 --- a/src/system/clog.cpp +++ b/src/eepp/system/clog.cpp @@ -1,4 +1,4 @@ -#include "clog.hpp" +#include namespace EE { namespace System { diff --git a/src/system/cmutex.cpp b/src/eepp/system/cmutex.cpp similarity index 75% rename from src/system/cmutex.cpp rename to src/eepp/system/cmutex.cpp index 2bffedfb0..48e6e3685 100755 --- a/src/system/cmutex.cpp +++ b/src/eepp/system/cmutex.cpp @@ -1,4 +1,5 @@ -#include "cmutex.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cobjectloader.cpp b/src/eepp/system/cobjectloader.cpp similarity index 96% rename from src/system/cobjectloader.cpp rename to src/eepp/system/cobjectloader.cpp index daac1ad31..5a061d4e5 100644 --- a/src/system/cobjectloader.cpp +++ b/src/eepp/system/cobjectloader.cpp @@ -1,4 +1,4 @@ -#include "cobjectloader.hpp" +#include namespace EE { namespace System { diff --git a/src/system/cpack.cpp b/src/eepp/system/cpack.cpp similarity index 76% rename from src/system/cpack.cpp rename to src/eepp/system/cpack.cpp index 58e3ba95c..9e47d2d17 100644 --- a/src/system/cpack.cpp +++ b/src/eepp/system/cpack.cpp @@ -1,5 +1,5 @@ -#include "cpack.hpp" -#include "cpackmanager.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cpackmanager.cpp b/src/eepp/system/cpackmanager.cpp similarity index 94% rename from src/system/cpackmanager.cpp rename to src/eepp/system/cpackmanager.cpp index 8359eb1a3..fa42c3acd 100644 --- a/src/system/cpackmanager.cpp +++ b/src/eepp/system/cpackmanager.cpp @@ -1,4 +1,4 @@ -#include "cpackmanager.hpp" +#include namespace EE { namespace System { diff --git a/src/system/cpak.cpp b/src/eepp/system/cpak.cpp similarity index 99% rename from src/system/cpak.cpp rename to src/eepp/system/cpak.cpp index 316a5157c..9c7241f5c 100755 --- a/src/system/cpak.cpp +++ b/src/eepp/system/cpak.cpp @@ -1,4 +1,4 @@ -#include "cpak.hpp" +#include namespace EE { namespace System { diff --git a/src/system/crc4.cpp b/src/eepp/system/crc4.cpp similarity index 98% rename from src/system/crc4.cpp rename to src/eepp/system/crc4.cpp index 0db2834f2..f88502027 100644 --- a/src/system/crc4.cpp +++ b/src/eepp/system/crc4.cpp @@ -1,5 +1,5 @@ -#include "crc4.hpp" -#include "ciostreamfile.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/cresourceloader.cpp b/src/eepp/system/cresourceloader.cpp similarity index 98% rename from src/system/cresourceloader.cpp rename to src/eepp/system/cresourceloader.cpp index 03e5f823e..7a2148de0 100644 --- a/src/system/cresourceloader.cpp +++ b/src/eepp/system/cresourceloader.cpp @@ -1,4 +1,4 @@ -#include "cresourceloader.hpp" +#include namespace EE { namespace System { diff --git a/src/system/cthread.cpp b/src/eepp/system/cthread.cpp similarity index 86% rename from src/system/cthread.cpp rename to src/eepp/system/cthread.cpp index e9e331ba6..b271a7e25 100755 --- a/src/system/cthread.cpp +++ b/src/eepp/system/cthread.cpp @@ -1,5 +1,5 @@ -#include "cthread.hpp" -#include "platform/platformimpl.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/ctimeelapsed.cpp b/src/eepp/system/ctimeelapsed.cpp similarity index 93% rename from src/system/ctimeelapsed.cpp rename to src/eepp/system/ctimeelapsed.cpp index a733323be..060de357c 100755 --- a/src/system/ctimeelapsed.cpp +++ b/src/eepp/system/ctimeelapsed.cpp @@ -1,4 +1,4 @@ -#include "ctimeelapsed.hpp" +#include namespace EE { namespace System { diff --git a/src/system/ctimer.cpp b/src/eepp/system/ctimer.cpp similarity index 82% rename from src/system/ctimer.cpp rename to src/eepp/system/ctimer.cpp index f8be908af..4ef1f8aaa 100755 --- a/src/system/ctimer.cpp +++ b/src/eepp/system/ctimer.cpp @@ -1,4 +1,5 @@ -#include "ctimer.hpp" +#include +#include namespace EE { namespace System { diff --git a/src/system/czip.cpp b/src/eepp/system/czip.cpp similarity index 97% rename from src/system/czip.cpp rename to src/eepp/system/czip.cpp index dc2f70a9a..17f5d9aa3 100644 --- a/src/system/czip.cpp +++ b/src/eepp/system/czip.cpp @@ -1,6 +1,6 @@ -#include "czip.hpp" -#include "../helper/libzip/zip.h" -#include "../helper/libzip/zipint.h" +#include +#include +#include namespace EE { namespace System { diff --git a/src/eepp/system/platform/platformimpl.hpp b/src/eepp/system/platform/platformimpl.hpp new file mode 100644 index 000000000..cda7f081a --- /dev/null +++ b/src/eepp/system/platform/platformimpl.hpp @@ -0,0 +1,18 @@ +#ifndef EE_SYSTEMPLATFORMIMPL_HPP +#define EE_SYSTEMPLATFORMIMPL_HPP + +#include + +#if defined( EE_PLATFORM_POSIX ) + #include + #include + #include +#elif EE_PLATFORM == EE_PLATFORM_WIN + #include + #include + #include +#else + #error Threads, mutexes and timers not implemented for this platform. +#endif + +#endif diff --git a/src/system/platform/posix/cmuteximpl.cpp b/src/eepp/system/platform/posix/cmuteximpl.cpp similarity index 90% rename from src/system/platform/posix/cmuteximpl.cpp rename to src/eepp/system/platform/posix/cmuteximpl.cpp index 9dde211fd..465764cbd 100644 --- a/src/system/platform/posix/cmuteximpl.cpp +++ b/src/eepp/system/platform/posix/cmuteximpl.cpp @@ -1,4 +1,4 @@ -#include "cmuteximpl.hpp" +#include #if defined( EE_PLATFORM_POSIX ) diff --git a/src/system/platform/posix/cmuteximpl.hpp b/src/eepp/system/platform/posix/cmuteximpl.hpp similarity index 91% rename from src/system/platform/posix/cmuteximpl.hpp rename to src/eepp/system/platform/posix/cmuteximpl.hpp index 29be15d60..1aee23938 100644 --- a/src/system/platform/posix/cmuteximpl.hpp +++ b/src/eepp/system/platform/posix/cmuteximpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCMUTEXIMPLPOSIX_HPP #define EE_SYSTEMCMUTEXIMPLPOSIX_HPP -#include "../../../declares.hpp" +#include #if defined( EE_PLATFORM_POSIX ) diff --git a/src/system/platform/posix/cthreadimpl.cpp b/src/eepp/system/platform/posix/cthreadimpl.cpp similarity index 92% rename from src/system/platform/posix/cthreadimpl.cpp rename to src/eepp/system/platform/posix/cthreadimpl.cpp index c3f5b21ef..7fdda9739 100644 --- a/src/system/platform/posix/cthreadimpl.cpp +++ b/src/eepp/system/platform/posix/cthreadimpl.cpp @@ -1,5 +1,5 @@ -#include "cthreadimpl.hpp" -#include "../../cthread.hpp" +#include +#include namespace EE { namespace System { namespace Platform { diff --git a/src/system/platform/posix/cthreadimpl.hpp b/src/eepp/system/platform/posix/cthreadimpl.hpp similarity index 92% rename from src/system/platform/posix/cthreadimpl.hpp rename to src/eepp/system/platform/posix/cthreadimpl.hpp index c609cf923..263c90d1e 100644 --- a/src/system/platform/posix/cthreadimpl.hpp +++ b/src/eepp/system/platform/posix/cthreadimpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCTHREADIMPLPOSIX_HPP #define EE_SYSTEMCTHREADIMPLPOSIX_HPP -#include "../../../declares.hpp" +#include #if defined( EE_PLATFORM_POSIX ) diff --git a/src/system/platform/posix/ctimerimpl.cpp b/src/eepp/system/platform/posix/ctimerimpl.cpp similarity index 95% rename from src/system/platform/posix/ctimerimpl.cpp rename to src/eepp/system/platform/posix/ctimerimpl.cpp index 8e804302a..61177355a 100644 --- a/src/system/platform/posix/ctimerimpl.cpp +++ b/src/eepp/system/platform/posix/ctimerimpl.cpp @@ -1,4 +1,4 @@ -#include "ctimerimpl.hpp" +#include #if defined( EE_PLATFORM_POSIX ) diff --git a/src/system/platform/posix/ctimerimpl.hpp b/src/eepp/system/platform/posix/ctimerimpl.hpp similarity index 94% rename from src/system/platform/posix/ctimerimpl.hpp rename to src/eepp/system/platform/posix/ctimerimpl.hpp index 77bc2046d..286515cbd 100644 --- a/src/system/platform/posix/ctimerimpl.hpp +++ b/src/eepp/system/platform/posix/ctimerimpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCTIMERIMPLPOSIX_H #define EE_SYSTEMCTIMERIMPLPOSIX_H -#include "../../../base.hpp" +#include #if defined( EE_PLATFORM_POSIX ) diff --git a/src/system/platform/win/cmuteximpl.cpp b/src/eepp/system/platform/win/cmuteximpl.cpp similarity index 87% rename from src/system/platform/win/cmuteximpl.cpp rename to src/eepp/system/platform/win/cmuteximpl.cpp index 0dc8f180f..443b2a75c 100644 --- a/src/system/platform/win/cmuteximpl.cpp +++ b/src/eepp/system/platform/win/cmuteximpl.cpp @@ -1,4 +1,4 @@ -#include "cmuteximpl.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/system/platform/win/cmuteximpl.hpp b/src/eepp/system/platform/win/cmuteximpl.hpp similarity index 92% rename from src/system/platform/win/cmuteximpl.hpp rename to src/eepp/system/platform/win/cmuteximpl.hpp index 21319c408..e49d1b7ff 100644 --- a/src/system/platform/win/cmuteximpl.hpp +++ b/src/eepp/system/platform/win/cmuteximpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCMUTEXIMPLWIN_HPP #define EE_SYSTEMCMUTEXIMPLWIN_HPP -#include "../../../declares.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/system/platform/win/cthreadimpl.cpp b/src/eepp/system/platform/win/cthreadimpl.cpp similarity index 91% rename from src/system/platform/win/cthreadimpl.cpp rename to src/eepp/system/platform/win/cthreadimpl.cpp index 74594b4f0..ca9a548b8 100644 --- a/src/system/platform/win/cthreadimpl.cpp +++ b/src/eepp/system/platform/win/cthreadimpl.cpp @@ -1,5 +1,5 @@ -#include "cthreadimpl.hpp" -#include "../../cthread.hpp" +#include +#include namespace EE { namespace System { namespace Platform { diff --git a/src/system/platform/win/cthreadimpl.hpp b/src/eepp/system/platform/win/cthreadimpl.hpp similarity index 94% rename from src/system/platform/win/cthreadimpl.hpp rename to src/eepp/system/platform/win/cthreadimpl.hpp index 95d177089..d43e1469b 100644 --- a/src/system/platform/win/cthreadimpl.hpp +++ b/src/eepp/system/platform/win/cthreadimpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCTHREADIMPLWIN_HPP #define EE_SYSTEMCTHREADIMPLWIN_HPP -#include "../../../declares.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/system/platform/win/ctimerimpl.cpp b/src/eepp/system/platform/win/ctimerimpl.cpp similarity index 98% rename from src/system/platform/win/ctimerimpl.cpp rename to src/eepp/system/platform/win/ctimerimpl.cpp index 06cef5d3b..982d4bad4 100644 --- a/src/system/platform/win/ctimerimpl.cpp +++ b/src/eepp/system/platform/win/ctimerimpl.cpp @@ -1,4 +1,4 @@ -#include "ctimerimpl.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/system/platform/win/ctimerimpl.hpp b/src/eepp/system/platform/win/ctimerimpl.hpp similarity index 96% rename from src/system/platform/win/ctimerimpl.hpp rename to src/eepp/system/platform/win/ctimerimpl.hpp index 99ecdd5ff..648543e8e 100644 --- a/src/system/platform/win/ctimerimpl.hpp +++ b/src/eepp/system/platform/win/ctimerimpl.hpp @@ -1,7 +1,7 @@ #ifndef EE_SYSTEMCTIMERIMPLWIN_H #define EE_SYSTEMCTIMERIMPLWIN_H -#include "../../../base.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/ui/cuiaquatheme.cpp b/src/eepp/ui/cuiaquatheme.cpp similarity index 96% rename from src/ui/cuiaquatheme.cpp rename to src/eepp/ui/cuiaquatheme.cpp index 62d46c4db..6d19b9e28 100644 --- a/src/ui/cuiaquatheme.cpp +++ b/src/eepp/ui/cuiaquatheme.cpp @@ -1,11 +1,11 @@ -#include "cuiaquatheme.hpp" -#include "cuiwindow.hpp" -#include "cuiwinmenu.hpp" -#include "cuipopupmenu.hpp" -#include "cuiprogressbar.hpp" -#include "cuicommondialog.hpp" -#include "cuimessagebox.hpp" -#include "cuitabwidget.hpp" +#include +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuibackground.cpp b/src/eepp/ui/cuibackground.cpp similarity index 98% rename from src/ui/cuibackground.cpp rename to src/eepp/ui/cuibackground.cpp index 730362073..6c9de8bcb 100644 --- a/src/ui/cuibackground.cpp +++ b/src/eepp/ui/cuibackground.cpp @@ -1,4 +1,4 @@ -#include "cuibackground.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiborder.cpp b/src/eepp/ui/cuiborder.cpp similarity index 93% rename from src/ui/cuiborder.cpp rename to src/eepp/ui/cuiborder.cpp index dc1e2f45f..3612b39e4 100644 --- a/src/ui/cuiborder.cpp +++ b/src/eepp/ui/cuiborder.cpp @@ -1,4 +1,4 @@ -#include "cuiborder.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuicheckbox.cpp b/src/eepp/ui/cuicheckbox.cpp similarity index 98% rename from src/ui/cuicheckbox.cpp rename to src/eepp/ui/cuicheckbox.cpp index 5d6a41547..3ef9bc984 100644 --- a/src/ui/cuicheckbox.cpp +++ b/src/eepp/ui/cuicheckbox.cpp @@ -1,5 +1,5 @@ -#include "cuicheckbox.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicombobox.cpp b/src/eepp/ui/cuicombobox.cpp similarity index 98% rename from src/ui/cuicombobox.cpp rename to src/eepp/ui/cuicombobox.cpp index cb5557959..c93c9682a 100644 --- a/src/ui/cuicombobox.cpp +++ b/src/eepp/ui/cuicombobox.cpp @@ -1,4 +1,4 @@ -#include "cuicombobox.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuicommondialog.cpp b/src/eepp/ui/cuicommondialog.cpp similarity index 98% rename from src/ui/cuicommondialog.cpp rename to src/eepp/ui/cuicommondialog.cpp index 3cbca552c..63d26aec8 100644 --- a/src/ui/cuicommondialog.cpp +++ b/src/eepp/ui/cuicommondialog.cpp @@ -1,7 +1,7 @@ -#include "cuicommondialog.hpp" -#include "cuimanager.hpp" -#include "cuilistboxitem.hpp" -#include "cuithememanager.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicomplexcontrol.cpp b/src/eepp/ui/cuicomplexcontrol.cpp similarity index 98% rename from src/ui/cuicomplexcontrol.cpp rename to src/eepp/ui/cuicomplexcontrol.cpp index 203cd84c6..fcb6d0a60 100644 --- a/src/ui/cuicomplexcontrol.cpp +++ b/src/eepp/ui/cuicomplexcontrol.cpp @@ -1,5 +1,5 @@ -#include "cuicomplexcontrol.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicontrol.cpp b/src/eepp/ui/cuicontrol.cpp similarity index 99% rename from src/ui/cuicontrol.cpp rename to src/eepp/ui/cuicontrol.cpp index 1e063b5ab..992d119fd 100644 --- a/src/ui/cuicontrol.cpp +++ b/src/eepp/ui/cuicontrol.cpp @@ -1,5 +1,5 @@ -#include "cuicontrol.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuicontrolanim.cpp b/src/eepp/ui/cuicontrolanim.cpp similarity index 99% rename from src/ui/cuicontrolanim.cpp rename to src/eepp/ui/cuicontrolanim.cpp index 8cc48ff5a..94e3b0cfb 100644 --- a/src/ui/cuicontrolanim.cpp +++ b/src/eepp/ui/cuicontrolanim.cpp @@ -1,5 +1,5 @@ -#include "cuicontrolanim.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuidragable.cpp b/src/eepp/ui/cuidragable.cpp similarity index 95% rename from src/ui/cuidragable.cpp rename to src/eepp/ui/cuidragable.cpp index a9b9e7fd5..ee55009a3 100644 --- a/src/ui/cuidragable.cpp +++ b/src/eepp/ui/cuidragable.cpp @@ -1,6 +1,6 @@ -#include "cuidragable.hpp" -#include "cuimanager.hpp" -#include "../window/cinput.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuidropdownlist.cpp b/src/eepp/ui/cuidropdownlist.cpp similarity index 98% rename from src/ui/cuidropdownlist.cpp rename to src/eepp/ui/cuidropdownlist.cpp index 92995c0ed..ce453daa6 100644 --- a/src/ui/cuidropdownlist.cpp +++ b/src/eepp/ui/cuidropdownlist.cpp @@ -1,5 +1,5 @@ -#include "cuidropdownlist.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuievent.cpp b/src/eepp/ui/cuievent.cpp similarity index 81% rename from src/ui/cuievent.cpp rename to src/eepp/ui/cuievent.cpp index 4c9d85c62..1fa77afe4 100644 --- a/src/ui/cuievent.cpp +++ b/src/eepp/ui/cuievent.cpp @@ -1,5 +1,5 @@ -#include "cuievent.hpp" -#include "cuicontrol.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuieventkey.cpp b/src/eepp/ui/cuieventkey.cpp similarity index 87% rename from src/ui/cuieventkey.cpp rename to src/eepp/ui/cuieventkey.cpp index c470174ae..898b908ab 100644 --- a/src/ui/cuieventkey.cpp +++ b/src/eepp/ui/cuieventkey.cpp @@ -1,5 +1,5 @@ -#include "cuieventkey.hpp" -#include "cuicontrol.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuieventmouse.cpp b/src/eepp/ui/cuieventmouse.cpp similarity index 84% rename from src/ui/cuieventmouse.cpp rename to src/eepp/ui/cuieventmouse.cpp index 798262087..7a3bc9448 100644 --- a/src/ui/cuieventmouse.cpp +++ b/src/eepp/ui/cuieventmouse.cpp @@ -1,5 +1,5 @@ -#include "cuieventmouse.hpp" -#include "cuicontrol.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuigenericgrid.cpp b/src/eepp/ui/cuigenericgrid.cpp similarity index 99% rename from src/ui/cuigenericgrid.cpp rename to src/eepp/ui/cuigenericgrid.cpp index 88bfb99f2..8ed7f5844 100644 --- a/src/ui/cuigenericgrid.cpp +++ b/src/eepp/ui/cuigenericgrid.cpp @@ -1,5 +1,5 @@ -#include "cuigenericgrid.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuigfx.cpp b/src/eepp/ui/cuigfx.cpp similarity index 99% rename from src/ui/cuigfx.cpp rename to src/eepp/ui/cuigfx.cpp index 28581d3f3..eadfac5ab 100644 --- a/src/ui/cuigfx.cpp +++ b/src/eepp/ui/cuigfx.cpp @@ -1,4 +1,4 @@ -#include "cuigfx.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuigridcell.cpp b/src/eepp/ui/cuigridcell.cpp similarity index 97% rename from src/ui/cuigridcell.cpp rename to src/eepp/ui/cuigridcell.cpp index 46a5ed548..ee053d5c9 100644 --- a/src/ui/cuigridcell.cpp +++ b/src/eepp/ui/cuigridcell.cpp @@ -1,6 +1,6 @@ -#include "cuigridcell.hpp" -#include "cuigenericgrid.hpp" -#include "cuimanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuilistbox.cpp b/src/eepp/ui/cuilistbox.cpp similarity index 99% rename from src/ui/cuilistbox.cpp rename to src/eepp/ui/cuilistbox.cpp index 014c28111..c4adf3dec 100644 --- a/src/ui/cuilistbox.cpp +++ b/src/eepp/ui/cuilistbox.cpp @@ -1,7 +1,7 @@ -#include "cuilistbox.hpp" -#include "cuimanager.hpp" -#include "cuilistboxitem.hpp" -#include "tuiitemcontainer.hpp" +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuilistboxitem.cpp b/src/eepp/ui/cuilistboxitem.cpp similarity index 96% rename from src/ui/cuilistboxitem.cpp rename to src/eepp/ui/cuilistboxitem.cpp index 59e577865..64ee21d7f 100644 --- a/src/ui/cuilistboxitem.cpp +++ b/src/eepp/ui/cuilistboxitem.cpp @@ -1,6 +1,6 @@ -#include "cuilistboxitem.hpp" -#include "cuilistbox.hpp" -#include "cuimanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimanager.cpp b/src/eepp/ui/cuimanager.cpp similarity index 99% rename from src/ui/cuimanager.cpp rename to src/eepp/ui/cuimanager.cpp index 150be768c..cae3b8f31 100644 --- a/src/ui/cuimanager.cpp +++ b/src/eepp/ui/cuimanager.cpp @@ -1,5 +1,5 @@ -#include "cuimanager.hpp" -#include "../window/cengine.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenu.cpp b/src/eepp/ui/cuimenu.cpp similarity index 99% rename from src/ui/cuimenu.cpp rename to src/eepp/ui/cuimenu.cpp index cfd9bfb84..1fcbcbaa5 100644 --- a/src/ui/cuimenu.cpp +++ b/src/eepp/ui/cuimenu.cpp @@ -1,5 +1,5 @@ -#include "cuimenu.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenucheckbox.cpp b/src/eepp/ui/cuimenucheckbox.cpp similarity index 97% rename from src/ui/cuimenucheckbox.cpp rename to src/eepp/ui/cuimenucheckbox.cpp index 194e15918..bd8c3eb9f 100644 --- a/src/ui/cuimenucheckbox.cpp +++ b/src/eepp/ui/cuimenucheckbox.cpp @@ -1,5 +1,5 @@ -#include "cuimenucheckbox.hpp" -#include "cuimenu.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenuitem.cpp b/src/eepp/ui/cuimenuitem.cpp similarity index 94% rename from src/ui/cuimenuitem.cpp rename to src/eepp/ui/cuimenuitem.cpp index 8669cbfb0..c3dc6433d 100644 --- a/src/ui/cuimenuitem.cpp +++ b/src/eepp/ui/cuimenuitem.cpp @@ -1,5 +1,5 @@ -#include "cuimenuitem.hpp" -#include "cuimenu.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimenusubmenu.cpp b/src/eepp/ui/cuimenusubmenu.cpp similarity index 97% rename from src/ui/cuimenusubmenu.cpp rename to src/eepp/ui/cuimenusubmenu.cpp index e425a959d..1c69d6fb5 100644 --- a/src/ui/cuimenusubmenu.cpp +++ b/src/eepp/ui/cuimenusubmenu.cpp @@ -1,6 +1,6 @@ -#include "cuimenusubmenu.hpp" -#include "cuimenu.hpp" -#include "cuimanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimessage.cpp b/src/eepp/ui/cuimessage.cpp similarity index 84% rename from src/ui/cuimessage.cpp rename to src/eepp/ui/cuimessage.cpp index 7bc15a867..9fc601e9b 100644 --- a/src/ui/cuimessage.cpp +++ b/src/eepp/ui/cuimessage.cpp @@ -1,5 +1,5 @@ -#include "cuimessage.hpp" -#include "cuicontrol.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuimessagebox.cpp b/src/eepp/ui/cuimessagebox.cpp similarity index 98% rename from src/ui/cuimessagebox.cpp rename to src/eepp/ui/cuimessagebox.cpp index cc64470f5..199b966af 100644 --- a/src/ui/cuimessagebox.cpp +++ b/src/eepp/ui/cuimessagebox.cpp @@ -1,4 +1,4 @@ -#include "cuimessagebox.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuipopupmenu.cpp b/src/eepp/ui/cuipopupmenu.cpp similarity index 96% rename from src/ui/cuipopupmenu.cpp rename to src/eepp/ui/cuipopupmenu.cpp index 31bbad756..2ff0e6317 100644 --- a/src/ui/cuipopupmenu.cpp +++ b/src/eepp/ui/cuipopupmenu.cpp @@ -1,5 +1,5 @@ -#include "cuipopupmenu.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiprogressbar.cpp b/src/eepp/ui/cuiprogressbar.cpp similarity index 99% rename from src/ui/cuiprogressbar.cpp rename to src/eepp/ui/cuiprogressbar.cpp index 434d2c517..8d84229ae 100644 --- a/src/ui/cuiprogressbar.cpp +++ b/src/eepp/ui/cuiprogressbar.cpp @@ -1,4 +1,4 @@ -#include "cuiprogressbar.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuipushbutton.cpp b/src/eepp/ui/cuipushbutton.cpp similarity index 99% rename from src/ui/cuipushbutton.cpp rename to src/eepp/ui/cuipushbutton.cpp index 168ad941e..56986e462 100644 --- a/src/ui/cuipushbutton.cpp +++ b/src/eepp/ui/cuipushbutton.cpp @@ -1,4 +1,4 @@ -#include "cuipushbutton.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiradiobutton.cpp b/src/eepp/ui/cuiradiobutton.cpp similarity index 98% rename from src/ui/cuiradiobutton.cpp rename to src/eepp/ui/cuiradiobutton.cpp index 9b13c8ec3..94291da4b 100644 --- a/src/ui/cuiradiobutton.cpp +++ b/src/eepp/ui/cuiradiobutton.cpp @@ -1,5 +1,5 @@ -#include "cuiradiobutton.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiscrollbar.cpp b/src/eepp/ui/cuiscrollbar.cpp similarity index 98% rename from src/ui/cuiscrollbar.cpp rename to src/eepp/ui/cuiscrollbar.cpp index 29801b523..00588d17b 100644 --- a/src/ui/cuiscrollbar.cpp +++ b/src/eepp/ui/cuiscrollbar.cpp @@ -1,5 +1,5 @@ -#include "cuiscrollbar.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiselectbutton.cpp b/src/eepp/ui/cuiselectbutton.cpp similarity index 95% rename from src/ui/cuiselectbutton.cpp rename to src/eepp/ui/cuiselectbutton.cpp index 5be7cd4b3..d0b01c082 100644 --- a/src/ui/cuiselectbutton.cpp +++ b/src/eepp/ui/cuiselectbutton.cpp @@ -1,5 +1,5 @@ -#include "cuiselectbutton.hpp" -#include "cuiwinmenu.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiseparator.cpp b/src/eepp/ui/cuiseparator.cpp similarity index 95% rename from src/ui/cuiseparator.cpp rename to src/eepp/ui/cuiseparator.cpp index 6fa7f664a..e8958bac0 100644 --- a/src/ui/cuiseparator.cpp +++ b/src/eepp/ui/cuiseparator.cpp @@ -1,4 +1,4 @@ -#include "cuiseparator.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskin.cpp b/src/eepp/ui/cuiskin.cpp similarity index 97% rename from src/ui/cuiskin.cpp rename to src/eepp/ui/cuiskin.cpp index c5128dfd6..c8e08363c 100644 --- a/src/ui/cuiskin.cpp +++ b/src/eepp/ui/cuiskin.cpp @@ -1,4 +1,4 @@ -#include "cuiskin.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskincomplex.cpp b/src/eepp/ui/cuiskincomplex.cpp similarity index 98% rename from src/ui/cuiskincomplex.cpp rename to src/eepp/ui/cuiskincomplex.cpp index 39367cefd..1e93ad716 100644 --- a/src/ui/cuiskincomplex.cpp +++ b/src/eepp/ui/cuiskincomplex.cpp @@ -1,5 +1,5 @@ -#include "cuiskincomplex.hpp" -#include "../graphics/cshapegroupmanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskinsimple.cpp b/src/eepp/ui/cuiskinsimple.cpp similarity index 95% rename from src/ui/cuiskinsimple.cpp rename to src/eepp/ui/cuiskinsimple.cpp index 437cedf84..fc3f27b3b 100644 --- a/src/ui/cuiskinsimple.cpp +++ b/src/eepp/ui/cuiskinsimple.cpp @@ -1,5 +1,5 @@ -#include "cuiskinsimple.hpp" -#include "../graphics/cshapegroupmanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiskinstate.cpp b/src/eepp/ui/cuiskinstate.cpp similarity index 97% rename from src/ui/cuiskinstate.cpp rename to src/eepp/ui/cuiskinstate.cpp index c396cc7bd..46db44427 100644 --- a/src/ui/cuiskinstate.cpp +++ b/src/eepp/ui/cuiskinstate.cpp @@ -1,5 +1,5 @@ -#include "cuiskinstate.hpp" -#include "cuiskin.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuislider.cpp b/src/eepp/ui/cuislider.cpp similarity index 99% rename from src/ui/cuislider.cpp rename to src/eepp/ui/cuislider.cpp index 42a5fae0d..b721a132d 100644 --- a/src/ui/cuislider.cpp +++ b/src/eepp/ui/cuislider.cpp @@ -1,5 +1,5 @@ -#include "cuislider.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuisliderbutton.cpp b/src/eepp/ui/cuisliderbutton.cpp similarity index 84% rename from src/ui/cuisliderbutton.cpp rename to src/eepp/ui/cuisliderbutton.cpp index 85f383669..58a59d30f 100644 --- a/src/ui/cuisliderbutton.cpp +++ b/src/eepp/ui/cuisliderbutton.cpp @@ -1,5 +1,5 @@ -#include "cuisliderbutton.hpp" -#include "cuislider.hpp" +#include +#include namespace EE { namespace UI { namespace Private { diff --git a/src/ui/cuispinbox.cpp b/src/eepp/ui/cuispinbox.cpp similarity index 99% rename from src/ui/cuispinbox.cpp rename to src/eepp/ui/cuispinbox.cpp index 4a966f207..6be016103 100644 --- a/src/ui/cuispinbox.cpp +++ b/src/eepp/ui/cuispinbox.cpp @@ -1,4 +1,4 @@ -#include "cuispinbox.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuisprite.cpp b/src/eepp/ui/cuisprite.cpp similarity index 98% rename from src/ui/cuisprite.cpp rename to src/eepp/ui/cuisprite.cpp index fed69dc1a..75737add8 100644 --- a/src/ui/cuisprite.cpp +++ b/src/eepp/ui/cuisprite.cpp @@ -1,4 +1,4 @@ -#include "cuisprite.hpp" +#include namespace EE { namespace UI { diff --git a/src/ui/cuitab.cpp b/src/eepp/ui/cuitab.cpp similarity index 96% rename from src/ui/cuitab.cpp rename to src/eepp/ui/cuitab.cpp index d8818f6df..8f86d637c 100644 --- a/src/ui/cuitab.cpp +++ b/src/eepp/ui/cuitab.cpp @@ -1,6 +1,6 @@ -#include "cuitab.hpp" -#include "cuitabwidget.hpp" -#include "cuimanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitabwidget.cpp b/src/eepp/ui/cuitabwidget.cpp similarity index 99% rename from src/ui/cuitabwidget.cpp rename to src/eepp/ui/cuitabwidget.cpp index 274450da0..9df40a2a6 100644 --- a/src/ui/cuitabwidget.cpp +++ b/src/eepp/ui/cuitabwidget.cpp @@ -1,5 +1,5 @@ -#include "cuitabwidget.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextbox.cpp b/src/eepp/ui/cuitextbox.cpp similarity index 97% rename from src/ui/cuitextbox.cpp rename to src/eepp/ui/cuitextbox.cpp index aec845af7..bd94f4e68 100644 --- a/src/ui/cuitextbox.cpp +++ b/src/eepp/ui/cuitextbox.cpp @@ -1,6 +1,6 @@ -#include "cuitextbox.hpp" -#include "cuimanager.hpp" -#include "cuithememanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextedit.cpp b/src/eepp/ui/cuitextedit.cpp similarity index 99% rename from src/ui/cuitextedit.cpp rename to src/eepp/ui/cuitextedit.cpp index 3623541ce..9a45d7099 100644 --- a/src/ui/cuitextedit.cpp +++ b/src/eepp/ui/cuitextedit.cpp @@ -1,5 +1,5 @@ -#include "cuitextedit.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitextinput.cpp b/src/eepp/ui/cuitextinput.cpp similarity index 97% rename from src/ui/cuitextinput.cpp rename to src/eepp/ui/cuitextinput.cpp index 5b9eb5898..c173c7871 100644 --- a/src/ui/cuitextinput.cpp +++ b/src/eepp/ui/cuitextinput.cpp @@ -1,6 +1,6 @@ -#include "cuitextinput.hpp" -#include "cuimanager.hpp" -#include "../window/cengine.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitheme.cpp b/src/eepp/ui/cuitheme.cpp similarity index 96% rename from src/ui/cuitheme.cpp rename to src/eepp/ui/cuitheme.cpp index ad9b985e4..8c19bdc82 100644 --- a/src/ui/cuitheme.cpp +++ b/src/eepp/ui/cuitheme.cpp @@ -1,31 +1,31 @@ -#include "cuitheme.hpp" -#include "cuiskinsimple.hpp" -#include "cuiskincomplex.hpp" -#include "../graphics/ctexturefactory.hpp" -#include "../graphics/cshapegroupmanager.hpp" +#include +#include +#include +#include +#include -#include "cuicheckbox.hpp" -#include "cuicombobox.hpp" -#include "cuidropdownlist.hpp" -#include "cuilistbox.hpp" -#include "cuipopupmenu.hpp" -#include "cuiprogressbar.hpp" -#include "cuipushbutton.hpp" -#include "cuiradiobutton.hpp" -#include "cuiscrollbar.hpp" -#include "cuislider.hpp" -#include "cuispinbox.hpp" -#include "cuitextbox.hpp" -#include "cuitextedit.hpp" -#include "cuitextinput.hpp" -#include "cuitooltip.hpp" -#include "cuiwindow.hpp" -#include "cuiwinmenu.hpp" -#include "cuigfx.hpp" -#include "cuisprite.hpp" -#include "cuicommondialog.hpp" -#include "cuimessagebox.hpp" -#include "cuitabwidget.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuithememanager.cpp b/src/eepp/ui/cuithememanager.cpp similarity index 96% rename from src/ui/cuithememanager.cpp rename to src/eepp/ui/cuithememanager.cpp index a5b437797..6a8d71865 100644 --- a/src/ui/cuithememanager.cpp +++ b/src/eepp/ui/cuithememanager.cpp @@ -1,6 +1,6 @@ -#include "cuithememanager.hpp" -#include "cuicontrol.hpp" -#include "cuimanager.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuitooltip.cpp b/src/eepp/ui/cuitooltip.cpp similarity index 98% rename from src/ui/cuitooltip.cpp rename to src/eepp/ui/cuitooltip.cpp index 3fa556b51..e25e13e0b 100644 --- a/src/ui/cuitooltip.cpp +++ b/src/eepp/ui/cuitooltip.cpp @@ -1,6 +1,6 @@ -#include "cuitooltip.hpp" -#include "cuimanager.hpp" -#include "cuicomplexcontrol.hpp" +#include +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiwindow.cpp b/src/eepp/ui/cuiwindow.cpp similarity index 99% rename from src/ui/cuiwindow.cpp rename to src/eepp/ui/cuiwindow.cpp index 75802b499..14dd92976 100644 --- a/src/ui/cuiwindow.cpp +++ b/src/eepp/ui/cuiwindow.cpp @@ -1,5 +1,5 @@ -#include "cuiwindow.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/cuiwinmenu.cpp b/src/eepp/ui/cuiwinmenu.cpp similarity index 99% rename from src/ui/cuiwinmenu.cpp rename to src/eepp/ui/cuiwinmenu.cpp index b83fcf0b9..6b16b6ba2 100644 --- a/src/ui/cuiwinmenu.cpp +++ b/src/eepp/ui/cuiwinmenu.cpp @@ -1,5 +1,5 @@ -#include "cuiwinmenu.hpp" -#include "cuimanager.hpp" +#include +#include namespace EE { namespace UI { diff --git a/src/ui/tools/ctexturegroupeditor.cpp b/src/eepp/ui/tools/ctexturegroupeditor.cpp similarity index 98% rename from src/ui/tools/ctexturegroupeditor.cpp rename to src/eepp/ui/tools/ctexturegroupeditor.cpp index 0c26cce0a..621b270da 100644 --- a/src/ui/tools/ctexturegroupeditor.cpp +++ b/src/eepp/ui/tools/ctexturegroupeditor.cpp @@ -1,10 +1,10 @@ -#include "ctexturegroupeditor.hpp" -#include "ctexturegroupnew.hpp" -#include "../cuimanager.hpp" -#include "../cuipopupmenu.hpp" -#include "../cuimenuitem.hpp" -#include "../cuicommondialog.hpp" -#include "../cuimessagebox.hpp" +#include +#include +#include +#include +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/tools/ctexturegroupnew.cpp b/src/eepp/ui/tools/ctexturegroupnew.cpp similarity index 98% rename from src/ui/tools/ctexturegroupnew.cpp rename to src/eepp/ui/tools/ctexturegroupnew.cpp index 710dc209e..b21da4cbd 100644 --- a/src/ui/tools/ctexturegroupnew.cpp +++ b/src/eepp/ui/tools/ctexturegroupnew.cpp @@ -1,6 +1,6 @@ -#include "ctexturegroupnew.hpp" -#include "../cuicommondialog.hpp" -#include "../cuimessagebox.hpp" +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/tools/ctexturegroupshapeeditor.cpp b/src/eepp/ui/tools/ctexturegroupshapeeditor.cpp similarity index 91% rename from src/ui/tools/ctexturegroupshapeeditor.cpp rename to src/eepp/ui/tools/ctexturegroupshapeeditor.cpp index 6641b84f3..32ce7d5ff 100644 --- a/src/ui/tools/ctexturegroupshapeeditor.cpp +++ b/src/eepp/ui/tools/ctexturegroupshapeeditor.cpp @@ -1,7 +1,7 @@ -#include "ctexturegroupshapeeditor.hpp" -#include "ctexturegroupeditor.hpp" -#include "../../graphics/cprimitives.hpp" -#include "../cuimanager.hpp" +#include +#include +#include +#include namespace EE { namespace UI { namespace Tools { diff --git a/src/ui/uihelper.cpp b/src/eepp/ui/uihelper.cpp similarity index 84% rename from src/ui/uihelper.cpp rename to src/eepp/ui/uihelper.cpp index cf8cddf2a..25d581310 100644 --- a/src/ui/uihelper.cpp +++ b/src/eepp/ui/uihelper.cpp @@ -1,4 +1,4 @@ -#include "uihelper.hpp" +#include namespace EE { namespace UI { diff --git a/src/utils/cinterpolation.cpp b/src/eepp/utils/cinterpolation.cpp similarity index 98% rename from src/utils/cinterpolation.cpp rename to src/eepp/utils/cinterpolation.cpp index 928166d89..74645eac1 100644 --- a/src/utils/cinterpolation.cpp +++ b/src/eepp/utils/cinterpolation.cpp @@ -1,5 +1,5 @@ -#include "cinterpolation.hpp" -#include "easing.hpp" +#include +#include using namespace EE::Utils::easing; namespace EE { namespace Utils { diff --git a/src/utils/cperlinnoise.cpp b/src/eepp/utils/cperlinnoise.cpp similarity index 98% rename from src/utils/cperlinnoise.cpp rename to src/eepp/utils/cperlinnoise.cpp index bc116f030..1530fa306 100755 --- a/src/utils/cperlinnoise.cpp +++ b/src/eepp/utils/cperlinnoise.cpp @@ -1,4 +1,4 @@ -#include "cperlinnoise.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/cwaypoints.cpp b/src/eepp/utils/cwaypoints.cpp similarity index 98% rename from src/utils/cwaypoints.cpp rename to src/eepp/utils/cwaypoints.cpp index b54a06d01..9179862fe 100755 --- a/src/utils/cwaypoints.cpp +++ b/src/eepp/utils/cwaypoints.cpp @@ -1,5 +1,5 @@ -#include "cwaypoints.hpp" -#include "easing.hpp" +#include +#include using namespace EE::Utils::easing; namespace EE { namespace Utils { diff --git a/src/utils/easing.cpp b/src/eepp/utils/easing.cpp similarity index 99% rename from src/utils/easing.cpp rename to src/eepp/utils/easing.cpp index 61efb7289..3f5fa718d 100644 --- a/src/utils/easing.cpp +++ b/src/eepp/utils/easing.cpp @@ -1,4 +1,4 @@ -#include "easing.hpp" +#include namespace EE { namespace Utils { namespace easing { diff --git a/src/utils/safedatapointer.cpp b/src/eepp/utils/safedatapointer.cpp similarity index 81% rename from src/utils/safedatapointer.cpp rename to src/eepp/utils/safedatapointer.cpp index 264120482..5c48dbae3 100644 --- a/src/utils/safedatapointer.cpp +++ b/src/eepp/utils/safedatapointer.cpp @@ -1,4 +1,4 @@ -#include "safedatapointer.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/string.cpp b/src/eepp/utils/string.cpp similarity index 99% rename from src/utils/string.cpp rename to src/eepp/utils/string.cpp index 842ff70b7..75ec32f20 100644 --- a/src/utils/string.cpp +++ b/src/eepp/utils/string.cpp @@ -1,5 +1,5 @@ #include -#include "string.hpp" +#include namespace EE { namespace Utils { diff --git a/src/utils/utils.cpp b/src/eepp/utils/utils.cpp similarity index 99% rename from src/utils/utils.cpp rename to src/eepp/utils/utils.cpp index c443c1583..3eaea8bde 100755 --- a/src/utils/utils.cpp +++ b/src/eepp/utils/utils.cpp @@ -1,6 +1,6 @@ -#include "utils.hpp" -#include "string.hpp" -#include "../system/ciostreamfile.hpp" +#include +#include +#include #include diff --git a/src/window/backend/SDL/base.hpp b/src/eepp/window/backend/SDL/base.hpp similarity index 89% rename from src/window/backend/SDL/base.hpp rename to src/eepp/window/backend/SDL/base.hpp index 00ae93507..c36c9968d 100644 --- a/src/window/backend/SDL/base.hpp +++ b/src/eepp/window/backend/SDL/base.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWBACKEND_BASE_SDL12_HPP #define EE_WINDOWBACKEND_BASE_SDL12_HPP -#include "../../base.hpp" +#include #ifdef EE_BACKEND_SDL_ACTIVE diff --git a/src/window/backend/SDL/cbackendsdl.hpp b/src/eepp/window/backend/SDL/cbackendsdl.hpp similarity index 71% rename from src/window/backend/SDL/cbackendsdl.hpp rename to src/eepp/window/backend/SDL/cbackendsdl.hpp index abeb8c261..25e7dcaa0 100644 --- a/src/window/backend/SDL/cbackendsdl.hpp +++ b/src/eepp/window/backend/SDL/cbackendsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCBACKENDSDL_HPP #define EE_WINDOWCBACKENDSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "cwindowsdl.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL { diff --git a/src/window/backend/SDL/cclipboardsdl.cpp b/src/eepp/window/backend/SDL/cclipboardsdl.cpp similarity index 98% rename from src/window/backend/SDL/cclipboardsdl.cpp rename to src/eepp/window/backend/SDL/cclipboardsdl.cpp index 436a8296e..ec4793345 100644 --- a/src/window/backend/SDL/cclipboardsdl.cpp +++ b/src/eepp/window/backend/SDL/cclipboardsdl.cpp @@ -1,5 +1,5 @@ -#include "cclipboardsdl.hpp" -#include "cwindowsdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/cclipboardsdl.hpp b/src/eepp/window/backend/SDL/cclipboardsdl.hpp similarity index 89% rename from src/window/backend/SDL/cclipboardsdl.hpp rename to src/eepp/window/backend/SDL/cclipboardsdl.hpp index daa3cc9f5..5553dce65 100644 --- a/src/window/backend/SDL/cclipboardsdl.hpp +++ b/src/eepp/window/backend/SDL/cclipboardsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCCLIPBOARDSDL_HPP #define EE_WINDOWCCLIPBOARDSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "../../cclipboard.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM ) #include diff --git a/src/window/backend/SDL/ccursormanagersdl.cpp b/src/eepp/window/backend/SDL/ccursormanagersdl.cpp similarity index 95% rename from src/window/backend/SDL/ccursormanagersdl.cpp rename to src/eepp/window/backend/SDL/ccursormanagersdl.cpp index e12e819b7..6d49e9a46 100644 --- a/src/window/backend/SDL/ccursormanagersdl.cpp +++ b/src/eepp/window/backend/SDL/ccursormanagersdl.cpp @@ -1,5 +1,5 @@ -#include "ccursormanagersdl.hpp" -#include "ccursorsdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/ccursormanagersdl.hpp b/src/eepp/window/backend/SDL/ccursormanagersdl.hpp similarity index 90% rename from src/window/backend/SDL/ccursormanagersdl.hpp rename to src/eepp/window/backend/SDL/ccursormanagersdl.hpp index c4bec7629..72c80bae0 100644 --- a/src/window/backend/SDL/ccursormanagersdl.hpp +++ b/src/eepp/window/backend/SDL/ccursormanagersdl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCCURSORMANAGERSDL_HPP #define EE_WINDOWCCURSORMANAGERSDL_HPP -#include "../../ccursormanager.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/ccursorsdl.cpp b/src/eepp/window/backend/SDL/ccursorsdl.cpp similarity index 92% rename from src/window/backend/SDL/ccursorsdl.cpp rename to src/eepp/window/backend/SDL/ccursorsdl.cpp index 6586279dc..629780f98 100644 --- a/src/window/backend/SDL/ccursorsdl.cpp +++ b/src/eepp/window/backend/SDL/ccursorsdl.cpp @@ -1,4 +1,4 @@ -#include "ccursorsdl.hpp" +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/ccursorsdl.hpp b/src/eepp/window/backend/SDL/ccursorsdl.hpp similarity index 89% rename from src/window/backend/SDL/ccursorsdl.hpp rename to src/eepp/window/backend/SDL/ccursorsdl.hpp index c6be4e576..e6896e633 100644 --- a/src/window/backend/SDL/ccursorsdl.hpp +++ b/src/eepp/window/backend/SDL/ccursorsdl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCCURSORSDL_HPP #define EE_WINDOWCCURSORSDL_HPP -#include "../../ccursor.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/cinputsdl.cpp b/src/eepp/window/backend/SDL/cinputsdl.cpp similarity index 96% rename from src/window/backend/SDL/cinputsdl.cpp rename to src/eepp/window/backend/SDL/cinputsdl.cpp index d13fb9012..3885e8268 100644 --- a/src/window/backend/SDL/cinputsdl.cpp +++ b/src/eepp/window/backend/SDL/cinputsdl.cpp @@ -1,6 +1,6 @@ -#include "cinputsdl.hpp" -#include "cjoystickmanagersdl.hpp" -#include "ccursormanagersdl.hpp" +#include +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/cinputsdl.hpp b/src/eepp/window/backend/SDL/cinputsdl.hpp similarity index 84% rename from src/window/backend/SDL/cinputsdl.hpp rename to src/eepp/window/backend/SDL/cinputsdl.hpp index 202f2be05..d3a5e57ac 100644 --- a/src/window/backend/SDL/cinputsdl.hpp +++ b/src/eepp/window/backend/SDL/cinputsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCINPUTSDL_HPP #define EE_WINDOWCINPUTSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "../../cinput.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM ) #include diff --git a/src/window/backend/SDL/cjoystickmanagersdl.cpp b/src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp similarity index 89% rename from src/window/backend/SDL/cjoystickmanagersdl.cpp rename to src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp index 07ed667b3..8314c73eb 100644 --- a/src/window/backend/SDL/cjoystickmanagersdl.cpp +++ b/src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp @@ -1,5 +1,5 @@ -#include "cjoystickmanagersdl.hpp" -#include "cjoysticksdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/cjoystickmanagersdl.hpp b/src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp similarity index 77% rename from src/window/backend/SDL/cjoystickmanagersdl.hpp rename to src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp index 6eacb4ba1..4626f8e1c 100644 --- a/src/window/backend/SDL/cjoystickmanagersdl.hpp +++ b/src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCJOYSTICKMANAGERSDL_HPP #define EE_WINDOWCJOYSTICKMANAGERSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "../../cjoystickmanager.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL { diff --git a/src/window/backend/SDL/cjoysticksdl.cpp b/src/eepp/window/backend/SDL/cjoysticksdl.cpp similarity index 96% rename from src/window/backend/SDL/cjoysticksdl.cpp rename to src/eepp/window/backend/SDL/cjoysticksdl.cpp index 1aa626aa3..71f6cbcee 100644 --- a/src/window/backend/SDL/cjoysticksdl.cpp +++ b/src/eepp/window/backend/SDL/cjoysticksdl.cpp @@ -1,4 +1,4 @@ -#include "cjoysticksdl.hpp" +#include #ifdef EE_BACKEND_SDL_1_2 diff --git a/src/window/backend/SDL/cjoysticksdl.hpp b/src/eepp/window/backend/SDL/cjoysticksdl.hpp similarity index 82% rename from src/window/backend/SDL/cjoysticksdl.hpp rename to src/eepp/window/backend/SDL/cjoysticksdl.hpp index b488fa61a..80238397c 100644 --- a/src/window/backend/SDL/cjoysticksdl.hpp +++ b/src/eepp/window/backend/SDL/cjoysticksdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCJOYSTICKSDL_HPP #define EE_WINDOWCJOYSTICKSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "../../cjoystick.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL { diff --git a/src/window/backend/SDL/cwindowsdl.cpp b/src/eepp/window/backend/SDL/cwindowsdl.cpp similarity index 95% rename from src/window/backend/SDL/cwindowsdl.cpp rename to src/eepp/window/backend/SDL/cwindowsdl.cpp index f505127fa..b7fef9174 100644 --- a/src/window/backend/SDL/cwindowsdl.cpp +++ b/src/eepp/window/backend/SDL/cwindowsdl.cpp @@ -1,17 +1,17 @@ -#include "cwindowsdl.hpp" +#include #ifdef EE_BACKEND_SDL_1_2 -#include "cclipboardsdl.hpp" -#include "cinputsdl.hpp" -#include "ccursormanagersdl.hpp" +#include +#include +#include -#include "../../../graphics/cglobalbatchrenderer.hpp" -#include "../../../graphics/cshaderprogrammanager.hpp" -#include "../../../graphics/cvertexbuffermanager.hpp" -#include "../../../graphics/cframebuffermanager.hpp" -#include "../../../graphics/ctexturefactory.hpp" -#include "../../platform/platformimpl.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace Window { namespace Backend { namespace SDL { diff --git a/src/window/backend/SDL/cwindowsdl.hpp b/src/eepp/window/backend/SDL/cwindowsdl.hpp similarity index 91% rename from src/window/backend/SDL/cwindowsdl.hpp rename to src/eepp/window/backend/SDL/cwindowsdl.hpp index 8a295f662..6e757e669 100644 --- a/src/window/backend/SDL/cwindowsdl.hpp +++ b/src/eepp/window/backend/SDL/cwindowsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCWINDOWSDL_HPP #define EE_WINDOWCWINDOWSDL_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL_1_2 -#include "../../cwindow.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM ) #include diff --git a/src/window/backend/SDL2/base.hpp b/src/eepp/window/backend/SDL2/base.hpp similarity index 93% rename from src/window/backend/SDL2/base.hpp rename to src/eepp/window/backend/SDL2/base.hpp index a0f7720ab..2f843566b 100644 --- a/src/window/backend/SDL2/base.hpp +++ b/src/eepp/window/backend/SDL2/base.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWBACKEND_BASE_SDL2_HPP #define EE_WINDOWBACKEND_BASE_SDL2_HPP -#include "../../base.hpp" +#include #ifdef EE_BACKEND_SDL_ACTIVE diff --git a/src/window/backend/SDL2/cbackendsdl.hpp b/src/eepp/window/backend/SDL2/cbackendsdl.hpp similarity index 79% rename from src/window/backend/SDL2/cbackendsdl.hpp rename to src/eepp/window/backend/SDL2/cbackendsdl.hpp index 22489fbc1..bec7500ce 100644 --- a/src/window/backend/SDL2/cbackendsdl.hpp +++ b/src/eepp/window/backend/SDL2/cbackendsdl.hpp @@ -1,11 +1,11 @@ #ifndef EE_WINDOWCBACKENDSDL2_HPP #define EE_WINDOWCBACKENDSDL2_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_SDL_ACTIVE -#include "cwindowsdl.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/cclipboardsdl.cpp b/src/eepp/window/backend/SDL2/cclipboardsdl.cpp similarity index 85% rename from src/window/backend/SDL2/cclipboardsdl.cpp rename to src/eepp/window/backend/SDL2/cclipboardsdl.cpp index 134d08d79..bd26ccd75 100644 --- a/src/window/backend/SDL2/cclipboardsdl.cpp +++ b/src/eepp/window/backend/SDL2/cclipboardsdl.cpp @@ -1,5 +1,5 @@ -#include "cclipboardsdl.hpp" -#include "cwindowsdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/cclipboardsdl.hpp b/src/eepp/window/backend/SDL2/cclipboardsdl.hpp similarity index 75% rename from src/window/backend/SDL2/cclipboardsdl.hpp rename to src/eepp/window/backend/SDL2/cclipboardsdl.hpp index 16b5c97c9..da607723f 100644 --- a/src/window/backend/SDL2/cclipboardsdl.hpp +++ b/src/eepp/window/backend/SDL2/cclipboardsdl.hpp @@ -1,13 +1,13 @@ #ifndef EE_WINDOWCCLIPBOARDSDL2_HPP #define EE_WINDOWCCLIPBOARDSDL2_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 -#include "../../base.hpp" -#include "../../cclipboard.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/ccursormanagersdl.cpp b/src/eepp/window/backend/SDL2/ccursormanagersdl.cpp similarity index 94% rename from src/window/backend/SDL2/ccursormanagersdl.cpp rename to src/eepp/window/backend/SDL2/ccursormanagersdl.cpp index 92a74e6f8..e07eeb216 100644 --- a/src/window/backend/SDL2/ccursormanagersdl.cpp +++ b/src/eepp/window/backend/SDL2/ccursormanagersdl.cpp @@ -1,5 +1,5 @@ -#include "ccursormanagersdl.hpp" -#include "ccursorsdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/ccursormanagersdl.hpp b/src/eepp/window/backend/SDL2/ccursormanagersdl.hpp similarity index 90% rename from src/window/backend/SDL2/ccursormanagersdl.hpp rename to src/eepp/window/backend/SDL2/ccursormanagersdl.hpp index 0eb3c52d7..7656989fb 100644 --- a/src/window/backend/SDL2/ccursormanagersdl.hpp +++ b/src/eepp/window/backend/SDL2/ccursormanagersdl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCCURSORMANAGERSDL2_HPP #define EE_WINDOWCCURSORMANAGERSDL2_HPP -#include "../../ccursormanager.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/ccursorsdl.cpp b/src/eepp/window/backend/SDL2/ccursorsdl.cpp similarity index 97% rename from src/window/backend/SDL2/ccursorsdl.cpp rename to src/eepp/window/backend/SDL2/ccursorsdl.cpp index 0020b908c..1dd383238 100644 --- a/src/window/backend/SDL2/ccursorsdl.cpp +++ b/src/eepp/window/backend/SDL2/ccursorsdl.cpp @@ -1,4 +1,4 @@ -#include "ccursorsdl.hpp" +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/ccursorsdl.hpp b/src/eepp/window/backend/SDL2/ccursorsdl.hpp similarity index 90% rename from src/window/backend/SDL2/ccursorsdl.hpp rename to src/eepp/window/backend/SDL2/ccursorsdl.hpp index 4ea870c91..c185e9437 100644 --- a/src/window/backend/SDL2/ccursorsdl.hpp +++ b/src/eepp/window/backend/SDL2/ccursorsdl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCCURSORSDL2_HPP #define EE_WINDOWCCURSORSDL2_HPP -#include "../../ccursor.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/cinputsdl.cpp b/src/eepp/window/backend/SDL2/cinputsdl.cpp similarity index 98% rename from src/window/backend/SDL2/cinputsdl.cpp rename to src/eepp/window/backend/SDL2/cinputsdl.cpp index 0502752da..585c0782c 100644 --- a/src/window/backend/SDL2/cinputsdl.cpp +++ b/src/eepp/window/backend/SDL2/cinputsdl.cpp @@ -1,7 +1,7 @@ -#include "cinputsdl.hpp" -#include "cjoystickmanagersdl.hpp" -#include "ccursormanagersdl.hpp" -#include "cwindowsdl.hpp" +#include +#include +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/cinputsdl.hpp b/src/eepp/window/backend/SDL2/cinputsdl.hpp similarity index 83% rename from src/window/backend/SDL2/cinputsdl.hpp rename to src/eepp/window/backend/SDL2/cinputsdl.hpp index 66b075a40..2b449ae6f 100644 --- a/src/window/backend/SDL2/cinputsdl.hpp +++ b/src/eepp/window/backend/SDL2/cinputsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCINPUTSDL2_HPP #define EE_WINDOWCINPUTSDL2_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 -#include "../../cinput.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/cjoystickmanagersdl.cpp b/src/eepp/window/backend/SDL2/cjoystickmanagersdl.cpp similarity index 89% rename from src/window/backend/SDL2/cjoystickmanagersdl.cpp rename to src/eepp/window/backend/SDL2/cjoystickmanagersdl.cpp index 3f2bdda29..6fb80259b 100644 --- a/src/window/backend/SDL2/cjoystickmanagersdl.cpp +++ b/src/eepp/window/backend/SDL2/cjoystickmanagersdl.cpp @@ -1,5 +1,5 @@ -#include "cjoystickmanagersdl.hpp" -#include "cjoysticksdl.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/cjoystickmanagersdl.hpp b/src/eepp/window/backend/SDL2/cjoystickmanagersdl.hpp similarity index 77% rename from src/window/backend/SDL2/cjoystickmanagersdl.hpp rename to src/eepp/window/backend/SDL2/cjoystickmanagersdl.hpp index 554ad3dcb..4708ad6b6 100644 --- a/src/window/backend/SDL2/cjoystickmanagersdl.hpp +++ b/src/eepp/window/backend/SDL2/cjoystickmanagersdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCJOYSTICKMANAGERSDL2_HPP #define EE_WINDOWCJOYSTICKMANAGERSDL2_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 -#include "../../cjoystickmanager.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/cjoysticksdl.cpp b/src/eepp/window/backend/SDL2/cjoysticksdl.cpp similarity index 96% rename from src/window/backend/SDL2/cjoysticksdl.cpp rename to src/eepp/window/backend/SDL2/cjoysticksdl.cpp index 4c01dd711..9e68666cd 100644 --- a/src/window/backend/SDL2/cjoysticksdl.cpp +++ b/src/eepp/window/backend/SDL2/cjoysticksdl.cpp @@ -1,4 +1,4 @@ -#include "cjoysticksdl.hpp" +#include #ifdef EE_BACKEND_SDL2 diff --git a/src/window/backend/SDL2/cjoysticksdl.hpp b/src/eepp/window/backend/SDL2/cjoysticksdl.hpp similarity index 82% rename from src/window/backend/SDL2/cjoysticksdl.hpp rename to src/eepp/window/backend/SDL2/cjoysticksdl.hpp index 3ffbe6596..0cfd7648f 100644 --- a/src/window/backend/SDL2/cjoysticksdl.hpp +++ b/src/eepp/window/backend/SDL2/cjoysticksdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCJOYSTICKSDL2_HPP #define EE_WINDOWCJOYSTICKSDL2_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 -#include "../../cjoystick.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/cwindowsdl.cpp b/src/eepp/window/backend/SDL2/cwindowsdl.cpp similarity index 95% rename from src/window/backend/SDL2/cwindowsdl.cpp rename to src/eepp/window/backend/SDL2/cwindowsdl.cpp index 5a00844e2..4ef4cd43d 100644 --- a/src/window/backend/SDL2/cwindowsdl.cpp +++ b/src/eepp/window/backend/SDL2/cwindowsdl.cpp @@ -1,17 +1,17 @@ -#include "cwindowsdl.hpp" +#include #ifdef EE_BACKEND_SDL2 -#include "cclipboardsdl.hpp" -#include "cinputsdl.hpp" -#include "ccursormanagersdl.hpp" +#include +#include +#include -#include "../../../graphics/cglobalbatchrenderer.hpp" -#include "../../../graphics/cshaderprogrammanager.hpp" -#include "../../../graphics/cvertexbuffermanager.hpp" -#include "../../../graphics/cframebuffermanager.hpp" -#include "../../../graphics/ctexturefactory.hpp" -#include "../../platform/platformimpl.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace Window { namespace Backend { namespace SDL2 { diff --git a/src/window/backend/SDL2/cwindowsdl.hpp b/src/eepp/window/backend/SDL2/cwindowsdl.hpp similarity index 93% rename from src/window/backend/SDL2/cwindowsdl.hpp rename to src/eepp/window/backend/SDL2/cwindowsdl.hpp index 4d6ea07ce..04b168ef0 100644 --- a/src/window/backend/SDL2/cwindowsdl.hpp +++ b/src/eepp/window/backend/SDL2/cwindowsdl.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCWINDOWSDL2_HPP #define EE_WINDOWCWINDOWSDL2_HPP -#include "../../cbackend.hpp" -#include "base.hpp" +#include +#include #ifdef EE_BACKEND_SDL2 -#include "../../cwindow.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM ) #if defined( EE_SDL_VERSION_1_3 ) diff --git a/src/window/backend/allegro5/cbackendal.hpp b/src/eepp/window/backend/allegro5/cbackendal.hpp similarity index 80% rename from src/window/backend/allegro5/cbackendal.hpp rename to src/eepp/window/backend/allegro5/cbackendal.hpp index 289bd953d..907f0c307 100644 --- a/src/window/backend/allegro5/cbackendal.hpp +++ b/src/eepp/window/backend/allegro5/cbackendal.hpp @@ -1,11 +1,11 @@ #ifndef EE_WINDOWCBACKENDAl_HPP #define EE_WINDOWCBACKENDAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "cwindowal.hpp" +#include #include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cclipboardal.cpp b/src/eepp/window/backend/allegro5/cclipboardal.cpp similarity index 92% rename from src/window/backend/allegro5/cclipboardal.cpp rename to src/eepp/window/backend/allegro5/cclipboardal.cpp index bea1bcc7b..3bd2bf499 100644 --- a/src/window/backend/allegro5/cclipboardal.cpp +++ b/src/eepp/window/backend/allegro5/cclipboardal.cpp @@ -1,6 +1,6 @@ -#include "cclipboardal.hpp" -#include "cwindowal.hpp" -#include "../../base.hpp" +#include +#include +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cclipboardal.hpp b/src/eepp/window/backend/allegro5/cclipboardal.hpp similarity index 81% rename from src/window/backend/allegro5/cclipboardal.hpp rename to src/eepp/window/backend/allegro5/cclipboardal.hpp index bbae02f99..a17a2068b 100644 --- a/src/window/backend/allegro5/cclipboardal.hpp +++ b/src/eepp/window/backend/allegro5/cclipboardal.hpp @@ -1,12 +1,12 @@ #ifndef EE_WINDOWCCLIPBOARDAl_HPP #define EE_WINDOWCCLIPBOARDAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "../../base.hpp" -#include "../../cclipboard.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/ccursoral.cpp b/src/eepp/window/backend/allegro5/ccursoral.cpp similarity index 94% rename from src/window/backend/allegro5/ccursoral.cpp rename to src/eepp/window/backend/allegro5/ccursoral.cpp index e1ddd5a62..6fd9f260e 100644 --- a/src/window/backend/allegro5/ccursoral.cpp +++ b/src/eepp/window/backend/allegro5/ccursoral.cpp @@ -1,5 +1,5 @@ -#include "ccursoral.hpp" -#include "cwindowal.hpp" +#include +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/ccursoral.hpp b/src/eepp/window/backend/allegro5/ccursoral.hpp similarity index 95% rename from src/window/backend/allegro5/ccursoral.hpp rename to src/eepp/window/backend/allegro5/ccursoral.hpp index 5bf0386a8..91067abe5 100644 --- a/src/window/backend/allegro5/ccursoral.hpp +++ b/src/eepp/window/backend/allegro5/ccursoral.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORAL_HPP #define EE_WINDOWCCURSORAL_HPP -#include "../../ccursor.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/ccursormanageral.cpp b/src/eepp/window/backend/allegro5/ccursormanageral.cpp similarity index 92% rename from src/window/backend/allegro5/ccursormanageral.cpp rename to src/eepp/window/backend/allegro5/ccursormanageral.cpp index 495862ba4..49e155cce 100644 --- a/src/window/backend/allegro5/ccursormanageral.cpp +++ b/src/eepp/window/backend/allegro5/ccursormanageral.cpp @@ -1,6 +1,6 @@ -#include "ccursormanageral.hpp" -#include "ccursoral.hpp" -#include "cwindowal.hpp" +#include +#include +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/ccursormanageral.hpp b/src/eepp/window/backend/allegro5/ccursormanageral.hpp similarity index 95% rename from src/window/backend/allegro5/ccursormanageral.hpp rename to src/eepp/window/backend/allegro5/ccursormanageral.hpp index edfd60a71..c6128cd16 100644 --- a/src/window/backend/allegro5/ccursormanageral.hpp +++ b/src/eepp/window/backend/allegro5/ccursormanageral.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORMANAGERAL_HPP #define EE_WINDOWCCURSORMANAGERAL_HPP -#include "../../ccursormanager.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/cinputal.cpp b/src/eepp/window/backend/allegro5/cinputal.cpp similarity index 98% rename from src/window/backend/allegro5/cinputal.cpp rename to src/eepp/window/backend/allegro5/cinputal.cpp index 101f939cc..59a649527 100644 --- a/src/window/backend/allegro5/cinputal.cpp +++ b/src/eepp/window/backend/allegro5/cinputal.cpp @@ -1,6 +1,6 @@ -#include "cinputal.hpp" -#include "cjoystickmanageral.hpp" -#include "cwindowal.hpp" +#include +#include +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/cinputal.hpp b/src/eepp/window/backend/allegro5/cinputal.hpp similarity index 91% rename from src/window/backend/allegro5/cinputal.hpp rename to src/eepp/window/backend/allegro5/cinputal.hpp index 837956100..f297cfb68 100644 --- a/src/window/backend/allegro5/cinputal.hpp +++ b/src/eepp/window/backend/allegro5/cinputal.hpp @@ -1,11 +1,11 @@ #ifndef EE_WINDOWCINPUTAl_HPP #define EE_WINDOWCINPUTAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "../../cinput.hpp" +#include #include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cjoystickal.cpp b/src/eepp/window/backend/allegro5/cjoystickal.cpp similarity index 97% rename from src/window/backend/allegro5/cjoystickal.cpp rename to src/eepp/window/backend/allegro5/cjoystickal.cpp index ffb34563b..966ba79b0 100644 --- a/src/window/backend/allegro5/cjoystickal.cpp +++ b/src/eepp/window/backend/allegro5/cjoystickal.cpp @@ -1,4 +1,4 @@ -#include "cjoystickal.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/cjoystickal.hpp b/src/eepp/window/backend/allegro5/cjoystickal.hpp similarity index 90% rename from src/window/backend/allegro5/cjoystickal.hpp rename to src/eepp/window/backend/allegro5/cjoystickal.hpp index 720a238f4..a8fa4e80a 100644 --- a/src/window/backend/allegro5/cjoystickal.hpp +++ b/src/eepp/window/backend/allegro5/cjoystickal.hpp @@ -1,11 +1,11 @@ #ifndef EE_WINDOWCJOYSTICKAl_HPP #define EE_WINDOWCJOYSTICKAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "../../cjoystick.hpp" +#include #include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cjoystickmanageral.cpp b/src/eepp/window/backend/allegro5/cjoystickmanageral.cpp similarity index 87% rename from src/window/backend/allegro5/cjoystickmanageral.cpp rename to src/eepp/window/backend/allegro5/cjoystickmanageral.cpp index e28b40aaf..e973923ef 100644 --- a/src/window/backend/allegro5/cjoystickmanageral.cpp +++ b/src/eepp/window/backend/allegro5/cjoystickmanageral.cpp @@ -1,5 +1,5 @@ -#include "cjoystickmanageral.hpp" -#include "cjoystickal.hpp" +#include +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE diff --git a/src/window/backend/allegro5/cjoystickmanageral.hpp b/src/eepp/window/backend/allegro5/cjoystickmanageral.hpp similarity index 85% rename from src/window/backend/allegro5/cjoystickmanageral.hpp rename to src/eepp/window/backend/allegro5/cjoystickmanageral.hpp index db181318b..17cbd3581 100644 --- a/src/window/backend/allegro5/cjoystickmanageral.hpp +++ b/src/eepp/window/backend/allegro5/cjoystickmanageral.hpp @@ -1,11 +1,11 @@ #ifndef EE_WINDOWCJOYSTICKMANAGERAl_HPP #define EE_WINDOWCJOYSTICKMANAGERAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "../../cjoystickmanager.hpp" +#include #include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cwindowal.cpp b/src/eepp/window/backend/allegro5/cwindowal.cpp similarity index 95% rename from src/window/backend/allegro5/cwindowal.cpp rename to src/eepp/window/backend/allegro5/cwindowal.cpp index 2f626455d..4a9e28c01 100644 --- a/src/window/backend/allegro5/cwindowal.cpp +++ b/src/eepp/window/backend/allegro5/cwindowal.cpp @@ -1,14 +1,14 @@ -#include "cwindowal.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE -#include "../../../graphics/cglobalbatchrenderer.hpp" -#include "../../../graphics/cshaderprogrammanager.hpp" -#include "../../../graphics/cvertexbuffermanager.hpp" -#include "../../../graphics/cframebuffermanager.hpp" -#include "../../../graphics/ctexturefactory.hpp" +#include +#include +#include +#include +#include -#include "../../platform/platformimpl.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN #include @@ -101,9 +101,9 @@ static void al_display_unlock() { #include #include -#include "cclipboardal.hpp" -#include "cinputal.hpp" -#include "ccursormanageral.hpp" +#include +#include +#include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/allegro5/cwindowal.hpp b/src/eepp/window/backend/allegro5/cwindowal.hpp similarity index 95% rename from src/window/backend/allegro5/cwindowal.hpp rename to src/eepp/window/backend/allegro5/cwindowal.hpp index 129155b64..88c29ad9d 100644 --- a/src/window/backend/allegro5/cwindowal.hpp +++ b/src/eepp/window/backend/allegro5/cwindowal.hpp @@ -1,14 +1,14 @@ #ifndef EE_WINDOWCWINDOWAl_HPP #define EE_WINDOWCWINDOWAl_HPP -#include "../../cbackend.hpp" +#include #ifdef EE_BACKEND_ALLEGRO_ACTIVE #define ALLEGRO_LIB_BUILD #include #include -#include "../../cwindow.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Al { diff --git a/src/window/backend/null/cbackendnull.hpp b/src/eepp/window/backend/null/cbackendnull.hpp similarity index 89% rename from src/window/backend/null/cbackendnull.hpp rename to src/eepp/window/backend/null/cbackendnull.hpp index 7f230ead8..5293b8c42 100644 --- a/src/window/backend/null/cbackendnull.hpp +++ b/src/eepp/window/backend/null/cbackendnull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCBACKENDNULL_HPP #define EE_WINDOWCBACKENDNULL_HPP -#include "../../cbackend.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cclipboardnull.cpp b/src/eepp/window/backend/null/cclipboardnull.cpp similarity index 79% rename from src/window/backend/null/cclipboardnull.cpp rename to src/eepp/window/backend/null/cclipboardnull.cpp index e691a42a9..edc8c1fd3 100644 --- a/src/window/backend/null/cclipboardnull.cpp +++ b/src/eepp/window/backend/null/cclipboardnull.cpp @@ -1,5 +1,5 @@ -#include "cclipboardnull.hpp" -#include "cwindownull.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cclipboardnull.hpp b/src/eepp/window/backend/null/cclipboardnull.hpp similarity index 86% rename from src/window/backend/null/cclipboardnull.hpp rename to src/eepp/window/backend/null/cclipboardnull.hpp index 23c794d20..8683a13ea 100644 --- a/src/window/backend/null/cclipboardnull.hpp +++ b/src/eepp/window/backend/null/cclipboardnull.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCCLIPBOARDNULL_HPP #define EE_WINDOWCCLIPBOARDNULL_HPP -#include "../../base.hpp" -#include "../../cclipboard.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/ccursormanagernull.cpp b/src/eepp/window/backend/null/ccursormanagernull.cpp similarity index 90% rename from src/window/backend/null/ccursormanagernull.cpp rename to src/eepp/window/backend/null/ccursormanagernull.cpp index 83873d386..7af625032 100644 --- a/src/window/backend/null/ccursormanagernull.cpp +++ b/src/eepp/window/backend/null/ccursormanagernull.cpp @@ -1,5 +1,5 @@ -#include "ccursormanagernull.hpp" -#include "ccursornull.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/ccursormanagernull.hpp b/src/eepp/window/backend/null/ccursormanagernull.hpp similarity index 95% rename from src/window/backend/null/ccursormanagernull.hpp rename to src/eepp/window/backend/null/ccursormanagernull.hpp index 7db3d6ea0..120c80179 100644 --- a/src/window/backend/null/ccursormanagernull.hpp +++ b/src/eepp/window/backend/null/ccursormanagernull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORMANAGERNULL_HPP #define EE_WINDOWCCURSORMANAGERNULL_HPP -#include "../../ccursormanager.hpp" +#include using namespace EE::Window; diff --git a/src/window/backend/null/ccursornull.cpp b/src/eepp/window/backend/null/ccursornull.cpp similarity index 92% rename from src/window/backend/null/ccursornull.cpp rename to src/eepp/window/backend/null/ccursornull.cpp index 6f39a4967..0c754cb39 100644 --- a/src/window/backend/null/ccursornull.cpp +++ b/src/eepp/window/backend/null/ccursornull.cpp @@ -1,4 +1,4 @@ -#include "ccursornull.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/ccursornull.hpp b/src/eepp/window/backend/null/ccursornull.hpp similarity index 94% rename from src/window/backend/null/ccursornull.hpp rename to src/eepp/window/backend/null/ccursornull.hpp index 6909ac6cf..447728d46 100644 --- a/src/window/backend/null/ccursornull.hpp +++ b/src/eepp/window/backend/null/ccursornull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORNULL_HPP #define EE_WINDOWCCURSORNULL_HPP -#include "../../ccursor.hpp" +#include using namespace EE::Window; diff --git a/src/window/backend/null/cinputnull.cpp b/src/eepp/window/backend/null/cinputnull.cpp similarity index 79% rename from src/window/backend/null/cinputnull.cpp rename to src/eepp/window/backend/null/cinputnull.cpp index cee014e12..a3014e073 100644 --- a/src/window/backend/null/cinputnull.cpp +++ b/src/eepp/window/backend/null/cinputnull.cpp @@ -1,5 +1,5 @@ -#include "cinputnull.hpp" -#include "cjoystickmanagernull.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cinputnull.hpp b/src/eepp/window/backend/null/cinputnull.hpp similarity index 93% rename from src/window/backend/null/cinputnull.hpp rename to src/eepp/window/backend/null/cinputnull.hpp index 73898712a..a1fb2c8e9 100644 --- a/src/window/backend/null/cinputnull.hpp +++ b/src/eepp/window/backend/null/cinputnull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCINPUTNULL_HPP #define EE_WINDOWCINPUTNULL_HPP -#include "../../cinput.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cjoystickmanagernull.cpp b/src/eepp/window/backend/null/cjoystickmanagernull.cpp similarity index 76% rename from src/window/backend/null/cjoystickmanagernull.cpp rename to src/eepp/window/backend/null/cjoystickmanagernull.cpp index 41cd6e91b..be234ea96 100644 --- a/src/window/backend/null/cjoystickmanagernull.cpp +++ b/src/eepp/window/backend/null/cjoystickmanagernull.cpp @@ -1,5 +1,5 @@ -#include "cjoystickmanagernull.hpp" -#include "cjoysticknull.hpp" +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cjoystickmanagernull.hpp b/src/eepp/window/backend/null/cjoystickmanagernull.hpp similarity index 90% rename from src/window/backend/null/cjoystickmanagernull.hpp rename to src/eepp/window/backend/null/cjoystickmanagernull.hpp index 5fa3f6663..395fcec01 100644 --- a/src/window/backend/null/cjoystickmanagernull.hpp +++ b/src/eepp/window/backend/null/cjoystickmanagernull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCJOYSTICKMANAGERNULL_HPP #define EE_WINDOWCJOYSTICKMANAGERNULL_HPP -#include "../../cjoystickmanager.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cjoysticknull.cpp b/src/eepp/window/backend/null/cjoysticknull.cpp similarity index 91% rename from src/window/backend/null/cjoysticknull.cpp rename to src/eepp/window/backend/null/cjoysticknull.cpp index 6858ccd85..fced5957a 100644 --- a/src/window/backend/null/cjoysticknull.cpp +++ b/src/eepp/window/backend/null/cjoysticknull.cpp @@ -1,4 +1,4 @@ -#include "cjoysticknull.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cjoysticknull.hpp b/src/eepp/window/backend/null/cjoysticknull.hpp similarity index 93% rename from src/window/backend/null/cjoysticknull.hpp rename to src/eepp/window/backend/null/cjoysticknull.hpp index 945eda129..1397f4fff 100644 --- a/src/window/backend/null/cjoysticknull.hpp +++ b/src/eepp/window/backend/null/cjoysticknull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCJOYSTICKNULL_HPP #define EE_WINDOWCJOYSTICKNULL_HPP -#include "../../cjoystick.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cwindownull.cpp b/src/eepp/window/backend/null/cwindownull.cpp similarity index 88% rename from src/window/backend/null/cwindownull.cpp rename to src/eepp/window/backend/null/cwindownull.cpp index 578f8e97a..03bfd6e4e 100644 --- a/src/window/backend/null/cwindownull.cpp +++ b/src/eepp/window/backend/null/cwindownull.cpp @@ -1,7 +1,7 @@ -#include "cwindownull.hpp" -#include "cclipboardnull.hpp" -#include "cinputnull.hpp" -#include "ccursormanagernull.hpp" +#include +#include +#include +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/backend/null/cwindownull.hpp b/src/eepp/window/backend/null/cwindownull.hpp similarity index 97% rename from src/window/backend/null/cwindownull.hpp rename to src/eepp/window/backend/null/cwindownull.hpp index c660acab7..2d3864a48 100644 --- a/src/window/backend/null/cwindownull.hpp +++ b/src/eepp/window/backend/null/cwindownull.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCWINDOWNULL_HPP #define EE_WINDOWCWINDOWNULL_HPP -#include "../../cwindow.hpp" +#include namespace EE { namespace Window { namespace Backend { namespace Null { diff --git a/src/window/cclipboard.cpp b/src/eepp/window/cclipboard.cpp similarity index 83% rename from src/window/cclipboard.cpp rename to src/eepp/window/cclipboard.cpp index cba1464b8..58482df3c 100644 --- a/src/window/cclipboard.cpp +++ b/src/eepp/window/cclipboard.cpp @@ -1,4 +1,4 @@ -#include "cclipboard.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/ccursor.cpp b/src/eepp/window/ccursor.cpp similarity index 97% rename from src/window/ccursor.cpp rename to src/eepp/window/ccursor.cpp index 368f80a64..abfc31006 100644 --- a/src/window/ccursor.cpp +++ b/src/eepp/window/ccursor.cpp @@ -1,4 +1,4 @@ -#include "ccursor.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/ccursormanager.cpp b/src/eepp/window/ccursormanager.cpp similarity index 97% rename from src/window/ccursormanager.cpp rename to src/eepp/window/ccursormanager.cpp index 80d43e68e..2a60131fc 100644 --- a/src/window/ccursormanager.cpp +++ b/src/eepp/window/ccursormanager.cpp @@ -1,4 +1,4 @@ -#include "ccursormanager.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cengine.cpp b/src/eepp/window/cengine.cpp similarity index 80% rename from src/window/cengine.cpp rename to src/eepp/window/cengine.cpp index 3085dea97..0f95fd41b 100755 --- a/src/window/cengine.cpp +++ b/src/eepp/window/cengine.cpp @@ -1,21 +1,21 @@ -#include "cengine.hpp" -#include "../system/cpackmanager.hpp" -#include "../graphics/ctexturefactory.hpp" -#include "../graphics/cfontmanager.hpp" -#include "../graphics/cglobalbatchrenderer.hpp" -#include "../graphics/cshaderprogrammanager.hpp" -#include "../graphics/cshapegroupmanager.hpp" -#include "../graphics/cframebuffermanager.hpp" -#include "../graphics/cvertexbuffermanager.hpp" -#include "../ui/cuimanager.hpp" -#include "../audio/caudiolistener.hpp" -#include "../graphics/glhelper.hpp" -#include "../helper/haikuttf/hkfontmanager.hpp" -#include "../physics/cphysicsmanager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "backend/SDL/cbackendsdl.hpp" -#include "backend/SDL2/cbackendsdl.hpp" -#include "backend/allegro5/cbackendal.hpp" +#include +#include +#include #define BACKEND_SDL 1 #define BACKEND_ALLEGRO 2 diff --git a/src/window/cinput.cpp b/src/eepp/window/cinput.cpp similarity index 99% rename from src/window/cinput.cpp rename to src/eepp/window/cinput.cpp index 188088deb..4331832c3 100644 --- a/src/window/cinput.cpp +++ b/src/eepp/window/cinput.cpp @@ -1,5 +1,5 @@ -#include "cinput.hpp" -#include "cview.hpp" +#include +#include namespace EE { namespace Window { diff --git a/src/window/cinputfinger.cpp b/src/eepp/window/cinputfinger.cpp similarity index 92% rename from src/window/cinputfinger.cpp rename to src/eepp/window/cinputfinger.cpp index c18c1cba9..b49758097 100644 --- a/src/window/cinputfinger.cpp +++ b/src/eepp/window/cinputfinger.cpp @@ -1,4 +1,4 @@ -#include "cinputfinger.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cinputtextbuffer.cpp b/src/eepp/window/cinputtextbuffer.cpp similarity index 99% rename from src/window/cinputtextbuffer.cpp rename to src/eepp/window/cinputtextbuffer.cpp index f25209f8d..3ff4ff6d5 100755 --- a/src/window/cinputtextbuffer.cpp +++ b/src/eepp/window/cinputtextbuffer.cpp @@ -1,6 +1,6 @@ -#include "cinputtextbuffer.hpp" -#include "cengine.hpp" -#include "cclipboard.hpp" +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/cjoystick.cpp b/src/eepp/window/cjoystick.cpp similarity index 94% rename from src/window/cjoystick.cpp rename to src/eepp/window/cjoystick.cpp index 68963c142..b70eb3a6f 100644 --- a/src/window/cjoystick.cpp +++ b/src/eepp/window/cjoystick.cpp @@ -1,5 +1,5 @@ -#include "cjoystick.hpp" -#include "cjoystickmanager.hpp" +#include +#include namespace EE { namespace Window { diff --git a/src/window/cjoystickmanager.cpp b/src/eepp/window/cjoystickmanager.cpp similarity index 93% rename from src/window/cjoystickmanager.cpp rename to src/eepp/window/cjoystickmanager.cpp index d2c8d4245..1a6f58b95 100644 --- a/src/window/cjoystickmanager.cpp +++ b/src/eepp/window/cjoystickmanager.cpp @@ -1,4 +1,4 @@ -#include "cjoystickmanager.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cplatformimpl.cpp b/src/eepp/window/cplatformimpl.cpp similarity index 69% rename from src/window/cplatformimpl.cpp rename to src/eepp/window/cplatformimpl.cpp index f19d0f655..7afa2b2cc 100644 --- a/src/window/cplatformimpl.cpp +++ b/src/eepp/window/cplatformimpl.cpp @@ -1,5 +1,5 @@ -#include "cplatformimpl.hpp" -#include "cwindow.hpp" +#include +#include namespace EE { namespace Window { namespace Platform { diff --git a/src/window/cview.cpp b/src/eepp/window/cview.cpp similarity index 98% rename from src/window/cview.cpp rename to src/eepp/window/cview.cpp index 6b6160022..d6403b3a7 100755 --- a/src/window/cview.cpp +++ b/src/eepp/window/cview.cpp @@ -1,4 +1,4 @@ -#include "cview.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/cwindow.cpp b/src/eepp/window/cwindow.cpp similarity index 97% rename from src/window/cwindow.cpp rename to src/eepp/window/cwindow.cpp index 1bc307c89..064627a4b 100644 --- a/src/window/cwindow.cpp +++ b/src/eepp/window/cwindow.cpp @@ -1,9 +1,9 @@ -#include "cwindow.hpp" -#include "cclipboard.hpp" -#include "cinput.hpp" -#include "ccursormanager.hpp" -#include "../graphics/ctexturefactory.hpp" -#include "platform/null/cnullimpl.hpp" +#include +#include +#include +#include +#include +#include namespace EE { namespace Window { diff --git a/src/window/inputhelper.cpp b/src/eepp/window/inputhelper.cpp similarity index 98% rename from src/window/inputhelper.cpp rename to src/eepp/window/inputhelper.cpp index 2e87ec1a2..b49c88cdf 100644 --- a/src/window/inputhelper.cpp +++ b/src/eepp/window/inputhelper.cpp @@ -1,4 +1,4 @@ -#include "inputhelper.hpp" +#include namespace EE { namespace Window { diff --git a/src/window/platform/null/cnullimpl.cpp b/src/eepp/window/platform/null/cnullimpl.cpp similarity index 95% rename from src/window/platform/null/cnullimpl.cpp rename to src/eepp/window/platform/null/cnullimpl.cpp index 2ad80f1f4..524289c57 100644 --- a/src/window/platform/null/cnullimpl.cpp +++ b/src/eepp/window/platform/null/cnullimpl.cpp @@ -1,4 +1,4 @@ -#include "cnullimpl.hpp" +#include namespace EE { namespace Window { namespace Platform { diff --git a/src/window/platform/null/cnullimpl.hpp b/src/eepp/window/platform/null/cnullimpl.hpp similarity index 93% rename from src/window/platform/null/cnullimpl.hpp rename to src/eepp/window/platform/null/cnullimpl.hpp index 193491345..f237a9f96 100644 --- a/src/window/platform/null/cnullimpl.hpp +++ b/src/eepp/window/platform/null/cnullimpl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWcNullImpl_HPP #define EE_WINDOWcNullImpl_HPP -#include "../../base.hpp" -#include "../../cplatformimpl.hpp" +#include +#include namespace EE { namespace Window { namespace Platform { diff --git a/src/window/platform/osx/cosximpl.cpp b/src/eepp/window/platform/osx/cosximpl.cpp similarity index 96% rename from src/window/platform/osx/cosximpl.cpp rename to src/eepp/window/platform/osx/cosximpl.cpp index 00fd389fc..ccdf1def7 100644 --- a/src/window/platform/osx/cosximpl.cpp +++ b/src/eepp/window/platform/osx/cosximpl.cpp @@ -1,4 +1,4 @@ -#include "cosximpl.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_MACOSX diff --git a/src/window/platform/osx/cosximpl.hpp b/src/eepp/window/platform/osx/cosximpl.hpp similarity index 93% rename from src/window/platform/osx/cosximpl.hpp rename to src/eepp/window/platform/osx/cosximpl.hpp index 26a0d6316..903530198 100644 --- a/src/window/platform/osx/cosximpl.hpp +++ b/src/eepp/window/platform/osx/cosximpl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCOSXIMPL_HPP #define EE_WINDOWCOSXIMPL_HPP -#include "../../base.hpp" -#include "../../cplatformimpl.hpp" +#include +#include #if EE_PLATFORM == EE_PLATFORM_MACOSX diff --git a/src/eepp/window/platform/platformimpl.hpp b/src/eepp/window/platform/platformimpl.hpp new file mode 100644 index 000000000..fb4242cbe --- /dev/null +++ b/src/eepp/window/platform/platformimpl.hpp @@ -0,0 +1,16 @@ +#ifndef EE_WINDOWPLATFORMIMPL_HPP +#define EE_WINDOWPLATFORMIMPL_HPP + +#include + +#if defined( EE_X11_PLATFORM ) +#include +#elif EE_PLATFORM == EE_PLATFORM_WIN +#include +#elif EE_PLATFORM == EE_PLATFORM_MACOSX +#include +#else +#include +#endif + +#endif diff --git a/src/window/platform/win/ccursorwin.cpp b/src/eepp/window/platform/win/ccursorwin.cpp similarity index 95% rename from src/window/platform/win/ccursorwin.cpp rename to src/eepp/window/platform/win/ccursorwin.cpp index 239290c7c..1051c3ca5 100644 --- a/src/window/platform/win/ccursorwin.cpp +++ b/src/eepp/window/platform/win/ccursorwin.cpp @@ -1,8 +1,8 @@ -#include "ccursorwin.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN -#include "cwinimpl.hpp" +#include #define WINDOWS_RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16))) diff --git a/src/window/platform/win/ccursorwin.hpp b/src/eepp/window/platform/win/ccursorwin.hpp similarity index 94% rename from src/window/platform/win/ccursorwin.hpp rename to src/eepp/window/platform/win/ccursorwin.hpp index a2cab3dc6..54dd55c4a 100644 --- a/src/window/platform/win/ccursorwin.hpp +++ b/src/eepp/window/platform/win/ccursorwin.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORWIN_HPP #define EE_WINDOWCCURSORWIN_HPP -#include "../../ccursor.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/window/platform/win/cwinimpl.cpp b/src/eepp/window/platform/win/cwinimpl.cpp similarity index 96% rename from src/window/platform/win/cwinimpl.cpp rename to src/eepp/window/platform/win/cwinimpl.cpp index 801141cf9..78eeb2512 100644 --- a/src/window/platform/win/cwinimpl.cpp +++ b/src/eepp/window/platform/win/cwinimpl.cpp @@ -1,10 +1,10 @@ -#include "cwinimpl.hpp" +#include #if EE_PLATFORM == EE_PLATFORM_WIN -#include "../../cwindow.hpp" +#include -#include "ccursorwin.hpp" +#include using namespace EE::Window::Cursor; diff --git a/src/window/platform/win/cwinimpl.hpp b/src/eepp/window/platform/win/cwinimpl.hpp similarity index 94% rename from src/window/platform/win/cwinimpl.hpp rename to src/eepp/window/platform/win/cwinimpl.hpp index a096424c1..ffe237d95 100644 --- a/src/window/platform/win/cwinimpl.hpp +++ b/src/eepp/window/platform/win/cwinimpl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCWINIMPL_HPP #define EE_WINDOWCWINIMPL_HPP -#include "../../base.hpp" -#include "../../cplatformimpl.hpp" +#include +#include #if EE_PLATFORM == EE_PLATFORM_WIN diff --git a/src/window/platform/x11/ccursorx11.cpp b/src/eepp/window/platform/x11/ccursorx11.cpp similarity index 94% rename from src/window/platform/x11/ccursorx11.cpp rename to src/eepp/window/platform/x11/ccursorx11.cpp index 520bb6ac3..59533e4d7 100644 --- a/src/window/platform/x11/ccursorx11.cpp +++ b/src/eepp/window/platform/x11/ccursorx11.cpp @@ -1,5 +1,5 @@ -#include "ccursorx11.hpp" -#include "cx11impl.hpp" +#include +#include #if defined( EE_X11_PLATFORM ) diff --git a/src/window/platform/x11/ccursorx11.hpp b/src/eepp/window/platform/x11/ccursorx11.hpp similarity index 95% rename from src/window/platform/x11/ccursorx11.hpp rename to src/eepp/window/platform/x11/ccursorx11.hpp index aee363291..afa2b9caa 100644 --- a/src/window/platform/x11/ccursorx11.hpp +++ b/src/eepp/window/platform/x11/ccursorx11.hpp @@ -1,7 +1,7 @@ #ifndef EE_WINDOWCCURSORX11_HPP #define EE_WINDOWCCURSORX11_HPP -#include "../../ccursor.hpp" +#include #if defined( EE_X11_PLATFORM ) diff --git a/src/window/platform/x11/cx11impl.cpp b/src/eepp/window/platform/x11/cx11impl.cpp similarity index 98% rename from src/window/platform/x11/cx11impl.cpp rename to src/eepp/window/platform/x11/cx11impl.cpp index d2cb9ac09..43e117492 100644 --- a/src/window/platform/x11/cx11impl.cpp +++ b/src/eepp/window/platform/x11/cx11impl.cpp @@ -1,5 +1,5 @@ -#include "cx11impl.hpp" -#include "ccursorx11.hpp" +#include +#include #if defined( EE_X11_PLATFORM ) diff --git a/src/window/platform/x11/cx11impl.hpp b/src/eepp/window/platform/x11/cx11impl.hpp similarity index 95% rename from src/window/platform/x11/cx11impl.hpp rename to src/eepp/window/platform/x11/cx11impl.hpp index cd52cf241..401a56a4d 100644 --- a/src/window/platform/x11/cx11impl.hpp +++ b/src/eepp/window/platform/x11/cx11impl.hpp @@ -1,8 +1,8 @@ #ifndef EE_WINDOWCX11IMPL_HPP #define EE_WINDOWCX11IMPL_HPP -#include "../../base.hpp" -#include "../../cplatformimpl.hpp" +#include +#include #if defined( EE_X11_PLATFORM ) diff --git a/src/test/empty_window/empty_window.cpp b/src/examples/empty_window/empty_window.cpp similarity index 98% rename from src/test/empty_window/empty_window.cpp rename to src/examples/empty_window/empty_window.cpp index 6ec2a3a63..b60f6dd0a 100644 --- a/src/test/empty_window/empty_window.cpp +++ b/src/examples/empty_window/empty_window.cpp @@ -1,4 +1,4 @@ -#include "../../ee.h" +#include // EE_MAIN_FUNC is needed for some platforms to export the main function as C function. EE_MAIN_FUNC int main (int argc, char * argv []) diff --git a/src/gaming/base.hpp b/src/gaming/base.hpp deleted file mode 100644 index 13028bacc..000000000 --- a/src/gaming/base.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef EE_GAMING_BASE -#define EE_GAMING_BASE - -#include "../base.hpp" - -#include "../utils/utils.hpp" -#include "../utils/vector2.hpp" -#include "../utils/colors.hpp" -#include "../utils/rect.hpp" -using namespace EE::Utils; - -#include "../math/math.hpp" -using namespace EE::Math; - -#include "../system/ciostream.hpp" -#include "../system/ciostreamfile.hpp" -#include "../system/ciostreammemory.hpp" -using namespace EE::System; - -#endif diff --git a/src/graphics/glhelper.cpp b/src/graphics/glhelper.cpp deleted file mode 100644 index 58700c3f7..000000000 --- a/src/graphics/glhelper.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "glhelper.hpp" - diff --git a/src/helper/android/SDL1.3/Android.mk b/src/helper/android/SDL1.3/Android.mk deleted file mode 100755 index bc3287437..000000000 --- a/src/helper/android/SDL1.3/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -########################### -# -# SDL shared library -# -########################### - -include $(CLEAR_VARS) - -LOCAL_MODULE := SDL - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include - -LOCAL_SRC_FILES := \ - $(subst $(LOCAL_PATH)/,, \ - $(wildcard $(LOCAL_PATH)/src/*.c) \ - $(wildcard $(LOCAL_PATH)/src/audio/*.c) \ - $(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \ - $(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \ - $(LOCAL_PATH)/src/atomic/SDL_atomic.c \ - $(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \ - $(wildcard $(LOCAL_PATH)/src/core/android/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \ - $(wildcard $(LOCAL_PATH)/src/events/*.c) \ - $(wildcard $(LOCAL_PATH)/src/file/*.c) \ - $(wildcard $(LOCAL_PATH)/src/haptic/*.c) \ - $(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \ - $(wildcard $(LOCAL_PATH)/src/joystick/*.c) \ - $(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \ - $(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \ - $(wildcard $(LOCAL_PATH)/src/power/*.c) \ - $(wildcard $(LOCAL_PATH)/src/render/*.c) \ - $(wildcard $(LOCAL_PATH)/src/render/*/*.c) \ - $(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \ - $(wildcard $(LOCAL_PATH)/src/thread/*.c) \ - $(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \ - $(wildcard $(LOCAL_PATH)/src/timer/*.c) \ - $(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \ - $(wildcard $(LOCAL_PATH)/src/video/*.c) \ - $(wildcard $(LOCAL_PATH)/src/video/android/*.c)) - -LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog - -include $(BUILD_SHARED_LIBRARY) diff --git a/src/helper/android/SDL1.3/README.android b/src/helper/android/SDL1.3/README.android deleted file mode 100644 index e556db074..000000000 --- a/src/helper/android/SDL1.3/README.android +++ /dev/null @@ -1,174 +0,0 @@ -================================================================================ -Simple DirectMedia Layer for Android -================================================================================ - -Requirements: - -Android SDK -http://developer.android.com/sdk/index.html - -Android NDK r4 or later -http://developer.android.com/sdk/ndk/index.html - - -================================================================================ - How the port works -================================================================================ - -- Android applications are Java-based, optionally with parts written in C -- As SDL apps are C-based, we use a small Java shim that uses JNI to talk to -the SDL library -- This means that your application C code must be placed inside an android -Java project, along with some C support code that communicates with Java -- This eventually produces a standard Android .apk package - -The Android Java code implements an "activity" and can be found in: -android-project/src/org/libsdl/app/SDLActivity.java - -The Java code loads your game code, the SDL shared library, and -dispatches to native functions implemented in the SDL library: -src/SDL_android.cpp - -Your project must include some glue code that starts your main() routine: -src/main/android/SDL_android_main.cpp - - -================================================================================ - Building an app -================================================================================ - -Instructions: -1. Copy the android-project directory wherever you want to keep your projects and rename it to the name of your project. -2. Move this SDL directory into the /jni directory -3. Place your application source files in the /jni/src directory -4. Edit /jni/src/Android.mk to include your source files -5. Run 'ndk-build' (a script provided by the NDK). This compiles the C source - -If you want to use the Eclipse IDE, skip to the Eclipse section below. - -6. Edit /local.properties to point to the Android SDK directory -7. Run 'ant debug' in android/project. This compiles the .java and eventually -creates a .apk with the native code embedded -8. 'ant install' will push the apk to the device or emulator (if connected) - -Here's an explanation of the files in the Android project, so you can customize them: - -android-project/ - AndroidManifest.xml - package manifest, do not modify - build.properties - empty - build.xml - build description file, used by ant - default.properties - holds the ABI for the application, currently android-4 which corresponds to the Android 1.6 system image - local.properties - holds the SDK path, you should change this to the path to your SDK - jni/ - directory holding native code - jni/Android.mk - Android makefile that includes all subdirectories - jni/SDL/ - directory holding the SDL library files - jni/SDL/Android.mk - Android makefile for creating the SDL shared library - jni/src/ - directory holding your C/C++ source - jni/src/Android.mk - Android makefile that you should customize to include your source code and any library references - res/ - directory holding resources for your application - res/drawable-* - directories holding icons for different phone hardware - res/layout/main.xml - place holder for the main screen layout, overridden by the SDL video output - res/values/strings.xml - strings used in your application, including the application name shown on the phone. - src/org/libsdl/app/SDLActivity.java - the Java class handling the initialization and binding to SDL. Be very careful changing this, as the SDL library relies on this implementation. - - -================================================================================ - Additional documentation -================================================================================ - -The documentation in the NDK docs directory is very helpful in understanding the build process and how to work with native code on the Android platform. - -The best place to start is with docs/OVERVIEW.TXT - - -================================================================================ - Using Eclipse -================================================================================ - -First make sure that you've installed Eclipse and the Android extensions as described here: - http://developer.android.com/sdk/eclipse-adt.html - -Once you've copied the SDL android project and customized it, you can create an Eclipse project from it: - * File -> New -> Other - * Select the Android -> Android Project wizard and click Next - * Enter the name you'd like your project to have - * Select "Create project from existing source" and browse for your project directory - * Make sure the Build Target is set to Android 1.6 - * Click Finish - - -================================================================================ - Loading files and resources -================================================================================ - -NEED CONTENT - - -================================================================================ - Troubleshooting -================================================================================ - -You can create and run an emulator from the Eclipse IDE: - * Window -> Android SDK and AVD Manager - -You can see if adb can see any devices with the following command: - adb devices - -You can see the output of log messages on the default device with: - adb logcat - -You can push files to the device with: - adb push local_file remote_path_and_file - -You can push files to the SD Card at /sdcard, for example: - adb push moose.dat /sdcard/moose.dat - -You can see the files on the SD card with a shell command: - adb shell ls /sdcard/ - -You can start a command shell on the default device with: - adb shell - -You can do a clean build with the following commands: - ndk-build clean - ndk-build - -You can see the complete command line that ndk-build is using by passing V=1 on the command line: - ndk-build V=1 - -If your application crashes in native code, you can use addr2line to convert the addresses in the stack trace to lines in your code. - -For example, if your crash looks like this: -I/DEBUG ( 31): signal 11 (SIGSEGV), code 2 (SEGV_ACCERR), fault addr 400085d0 -I/DEBUG ( 31): r0 00000000 r1 00001000 r2 00000003 r3 400085d4 -I/DEBUG ( 31): r4 400085d0 r5 40008000 r6 afd41504 r7 436c6a7c -I/DEBUG ( 31): r8 436c6b30 r9 435c6fb0 10 435c6f9c fp 4168d82c -I/DEBUG ( 31): ip 8346aff0 sp 436c6a60 lr afd1c8ff pc afd1c902 cpsr 60000030 -I/DEBUG ( 31): #00 pc 0001c902 /system/lib/libc.so -I/DEBUG ( 31): #01 pc 0001ccf6 /system/lib/libc.so -I/DEBUG ( 31): #02 pc 000014bc /data/data/org.libsdl.app/lib/libmain.so -I/DEBUG ( 31): #03 pc 00001506 /data/data/org.libsdl.app/lib/libmain.so - -You can see that there's a crash in the C library being called from the main code. I run addr2line with the debug version of my code: - arm-eabi-addr2line -C -f -e obj/local/armeabi/libmain.so -and then paste in the number after "pc" in the call stack, from the line that I care about: -000014bc - -I get output from addr2line showing that it's in the quit function, in testspriteminimal.c, on line 23. - -You can add logging to your code to help show what's happening: - -#include - - __android_log_print(ANDROID_LOG_INFO, "foo", "Something happened! x = %d", x); - -If you need to build without optimization turned on, you can create a file called "Application.mk" in the jni directory, with the following line in it: -APP_OPTIM := debug - - -================================================================================ - Known issues -================================================================================ - -- SDL audio (although it's mostly written, just not working properly yet) -- TODO. I'm sure there's a bunch more stuff I haven't thought of diff --git a/src/helper/android/SDL1.3/README.touch b/src/helper/android/SDL1.3/README.touch deleted file mode 100644 index 68b97c1be..000000000 --- a/src/helper/android/SDL1.3/README.touch +++ /dev/null @@ -1,101 +0,0 @@ -=========================================================================== -System Specific Notes -=========================================================================== -Linux: -The linux touch system is currently based off event streams, and proc/bus/devices. The active user must be given permissions to read /dev/input/TOUCHDEVICE, where TOUCHDEVICE is the event stream for your device. Currently only Wacom tablets are supported. If you have an unsupported tablet contact me at jim.tla+sdl_touch@gmail.com and I will help you get support for it. - -Mac: -The Mac and Iphone API's are pretty. If your touch device supports them then you'll be fine. If it doesn't, then there isn't much we can do. - -iPhone: -Works out of box. - -Windows: -Unfortunately there is no windows support as of yet. Support for Windows 7 is planned, but we currently have no way to test. If you have a Windows 7 WM_TOUCH supported device, and are willing to help test please contact me at jim.tla+sdl_touch@gmail.com - -=========================================================================== -Events -=========================================================================== -SDL_FINGERDOWN: -Sent when a finger (or stylus) is placed on a touch device. -Fields: -event.tfinger.touchId - the Id of the touch device. -event.tfinger.fingerId - the Id of the finger which just went down. -event.tfinger.x - the x coordinate of the touch (0..touch.xres) -event.tfinger.y - the y coordinate of the touch (0..touch.yres) -event.tfinger.pressure - the pressure of the touch (0..touch.pressureres) - -SDL_FINGERMOTION: -Sent when a finger (or stylus) is moved on the touch device. -Fields: -Same as FINGERDOWN but with additional: -event.tfginer.dx - change in x coordinate during this motion event. -event.tfginer.dy - change in y coordinate during this motion event. - -SDL_FINGERMOTION: -Sent when a finger (or stylus) is lifted from the touch device. -Fields: -Same as FINGERDOWN. - - -=========================================================================== -Functions -=========================================================================== -SDL provides the ability to access the underlying Touch and Finger structures. -These structures should _never_ be modified. - -The following functions are included from SDL_Touch.h - -To get a SDL_Touch device call SDL_GetTouch(touchId). -This returns an SDL_Touch*. -IMPORTANT: If the touch has been removed, or there is no touch with the given ID, SDL_GetTouch will return null. Be sure to check for this! - -An SDL_Touch has the following fields: ->xres,yres,pressures: - The resolution at which x,y, and pressure values are reported. Currently these will always be equal to 2^15, but this may not always be the case. - ->pressure_max, pressure_min, x_max, x_min, y_max, y_min - Which give, respectively, the maximum and minumum values that the touch digitizer can return for pressure, x coordiniate, and y coordinate AS REPORTED BY THE OPERATING SYSTEM. -On Mac/iPhone systems _max will always be 0, and _min will always be 1. - ->native_xres,native_yres,native_pressureres: - The native resolution of the touch device AS REPORTED BY THE OPERATING SYSTEM. -On Mac/iPhone systems these will always be 1. - ->num_fingers: - The number of fingers currently down on the device. - ->fingers: - An array of pointers to the fingers which are on the device. - - -The most common reason to access a touch device is to normalize inputs. This would be accomplished by code like the following: - - SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId); - if(inTouch == NULL) continue; //The touch has been removed - - float x = ((float)event.tfinger.x)/inTouch->xres; - float y = ((float)event.tfinger.y)/inTouch->yres; - - - -To get an SDL_Finger, call SDL_GetFinger(touch,fingerId), where touch is a pointer to an SDL_Touch device, and fingerId is the id of the requested finger. -This returns an SDL_Finger*, or null if the finger does not exist, or has been removed. -An SDL_Finger is guaranteed to be persistent for the duration of a touch, but it will be de-allocated as soon as the finger is removed. This occurs when the SDL_FINGERUP event is _added_ to the event queue, and thus _before_ the FINGERUP event is polled. -As a result, be very careful to check for null return values. - -An SDL_Finger has the following fields: ->x,y,pressure: - The current coordinates of the touch. ->xdelta,ydelta: - The change in position resulting from the last finger motion. ->last_x, last_y, last_pressure: - The previous coordinates of the touch. - -=========================================================================== -Notes -=========================================================================== -For a complete example see test/testgesture.c - -Please direct questions/comments to: - jim.tla+sdl_touch@gmail.com diff --git a/src/helper/android/SDL1.3/include/SDL b/src/helper/android/SDL1.3/include/SDL deleted file mode 120000 index 945c9b46d..000000000 --- a/src/helper/android/SDL1.3/include/SDL +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/src/helper/android/SDL1.3/include/SDL.h b/src/helper/android/SDL1.3/include/SDL.h deleted file mode 100644 index 2c5dded00..000000000 --- a/src/helper/android/SDL1.3/include/SDL.h +++ /dev/null @@ -1,163 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL.h - * - * Main include header for the SDL library - */ - -/** - * \mainpage Simple DirectMedia Layer (SDL) - * - * http://www.libsdl.org/ - * - * \section intro_sec Introduction - * - * This is the Simple DirectMedia Layer, a general API that provides low - * level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, - * and 2D framebuffer across multiple platforms. - * - * SDL is written in C, but works with C++ natively, and has bindings to - * several other languages, including Ada, C#, Eiffel, Erlang, Euphoria, - * Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP, - * Pike, Pliant, Python, Ruby, and Smalltalk. - * - * This library is distributed under GNU LGPL version 2, which can be - * found in the file "COPYING". This license allows you to use SDL - * freely in commercial programs as long as you link with the dynamic - * library. - * - * 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 is available in HTML format in "docs/index.html", and - * a documentation wiki is available online at: - * http://www.libsdl.org/cgi/docwiki.cgi - * - * The test programs in the "test" subdirectory are in the public domain. - * - * Frequently asked questions are answered online: - * http://www.libsdl.org/faq.php - * - * 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_hints.h" -#include "SDL_loadso.h" -#include "SDL_log.h" -#include "SDL_mutex.h" -#include "SDL_power.h" -#include "SDL_render.h" -#include "SDL_rwops.h" -#include "SDL_thread.h" -#include "SDL_timer.h" -#include "SDL_version.h" -#include "SDL_video.h" -#include "SDL_compat.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 -#define SDL_INIT_JOYSTICK 0x00000200 -#define SDL_INIT_HAPTIC 0x00001000 -#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */ -#define SDL_INIT_EVERYTHING 0x0000FFFF -/*@}*/ - -/** - * 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_H */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_assert.h b/src/helper/android/SDL1.3/include/SDL_assert.h deleted file mode 100644 index c485fb5f9..000000000 --- a/src/helper/android/SDL1.3/include/SDL_assert.h +++ /dev/null @@ -1,243 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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) && !defined(_WIN32_WCE) -/* Don't include intrin.h here because it contains C++ code */ -extern void __cdecl __debugbreak(void); - #define SDL_TriggerBreakpoint() __debugbreak() -#elif (defined(__GNUC__) && ((__i386__) || (__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 (__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. -*/ - -#define SDL_disabled_assert(condition) \ - do { (void) sizeof ((condition)); } while (0) - -#if (SDL_ASSERT_LEVEL > 0) - -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; - -/* 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); - -/* 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 (0) - -#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 - - -typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)( - const SDL_assert_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 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->condition) { - * 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. This never returns NULL, - * even if there are no items. - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_assert_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_atomic.h b/src/helper/android/SDL1.3/include/SDL_atomic.h deleted file mode 100644 index 42c29f96c..000000000 --- a/src/helper/android/SDL1.3/include/SDL_atomic.h +++ /dev/null @@ -1,319 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - */ - -/** - * \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 - * - * 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" - -/* 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(_WIN32_WCE) -#include -#define HAVE_MSC_ATOMICS 1 -#endif - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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. - */ -#ifdef _MSC_VER -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 - -/* Platform specific optimized versions of the atomic functions, - * you can disable these by defining SDL_DISABLE_ATOMIC_INLINE - */ -#if SDL_ATOMIC_DISABLED -#define SDL_DISABLE_ATOMIC_INLINE -#endif -#ifndef SDL_DISABLE_ATOMIC_INLINE - -#ifdef HAVE_MSC_ATOMICS - -#define SDL_AtomicSet(a, v) _InterlockedExchange((long*)&(a)->value, (v)) -#define SDL_AtomicAdd(a, v) _InterlockedExchangeAdd((long*)&(a)->value, (v)) -#define SDL_AtomicCAS(a, oldval, newval) (_InterlockedCompareExchange((long*)&(a)->value, (newval), (oldval)) == (oldval)) -#define SDL_AtomicSetPtr(a, v) _InterlockedExchangePointer((a), (v)) -#if _M_IX86 -#define SDL_AtomicCASPtr(a, oldval, newval) (_InterlockedCompareExchange((long*)(a), (long)(newval), (long)(oldval)) == (long)(oldval)) -#else -#define SDL_AtomicCASPtr(a, oldval, newval) (_InterlockedCompareExchangePointer((a), (newval), (oldval)) == (oldval)) -#endif - -#elif defined(__MACOSX__) -#include - -#define SDL_AtomicCAS(a, oldval, newval) OSAtomicCompareAndSwap32Barrier((oldval), (newval), &(a)->value) -#if SIZEOF_VOIDP == 4 -#define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap32Barrier((int32_t)(oldval), (int32_t)(newval), (int32_t*)(a)) -#elif SIZEOF_VOIDP == 8 -#define SDL_AtomicCASPtr(a, oldval, newval) OSAtomicCompareAndSwap64Barrier((int64_t)(oldval), (int64_t)(newval), (int64_t*)(a)) -#endif - -#elif defined(HAVE_GCC_ATOMICS) - -#define SDL_AtomicSet(a, v) __sync_lock_test_and_set(&(a)->value, v) -#define SDL_AtomicAdd(a, v) __sync_fetch_and_add(&(a)->value, v) -#define SDL_AtomicSetPtr(a, v) __sync_lock_test_and_set(a, v) -#define SDL_AtomicCAS(a, oldval, newval) __sync_bool_compare_and_swap(&(a)->value, oldval, newval) -#define SDL_AtomicCASPtr(a, oldval, newval) __sync_bool_compare_and_swap(a, oldval, newval) - -#endif - -#endif /* !SDL_DISABLE_ATOMIC_INLINE */ - - -/** - * \brief A type representing an atomic integer value. It is a struct - * so people don't accidentally use numeric operations on it. - */ -#ifndef SDL_atomic_t_defined -typedef struct { int value; } SDL_atomic_t; -#endif - -/** - * \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! -*/ -#ifndef SDL_AtomicCAS -#define SDL_AtomicCAS SDL_AtomicCAS_ -#endif -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. - */ -#ifndef SDL_AtomicSet -static __inline__ int SDL_AtomicSet(SDL_atomic_t *a, int v) -{ - int value; - do { - value = a->value; - } while (!SDL_AtomicCAS(a, value, v)); - return value; -} -#endif - -/** - * \brief Get the value of an atomic variable - */ -#ifndef SDL_AtomicGet -static __inline__ int SDL_AtomicGet(SDL_atomic_t *a) -{ - int value = a->value; - SDL_CompilerBarrier(); - return value; -} -#endif - -/** - * \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 - */ -#ifndef SDL_AtomicAdd -static __inline__ int SDL_AtomicAdd(SDL_atomic_t *a, int v) -{ - int value; - do { - value = a->value; - } while (!SDL_AtomicCAS(a, value, (value + v))); - return value; -} -#endif - -/** - * \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! -*/ -#ifndef SDL_AtomicCASPtr -#define SDL_AtomicCASPtr SDL_AtomicCASPtr_ -#endif -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. - */ -#ifndef SDL_AtomicSetPtr -static __inline__ void* SDL_AtomicSetPtr(void* *a, void* v) -{ - void* value; - do { - value = *a; - } while (!SDL_AtomicCASPtr(a, value, v)); - return value; -} -#endif - -/** - * \brief Get the value of a pointer atomically. - */ -#ifndef SDL_AtomicGetPtr -static __inline__ void* SDL_AtomicGetPtr(void* *a) -{ - void* value = *a; - SDL_CompilerBarrier(); - return value; -} -#endif - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif - -#include "close_code.h" - -#endif /* _SDL_atomic_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_audio.h b/src/helper/android/SDL1.3/include/SDL_audio.h deleted file mode 100644 index e969356c4..000000000 --- a/src/helper/android/SDL1.3/include/SDL_audio.h +++ /dev/null @@ -1,510 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 1.3 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 - * - * New to SDL 1.3. - */ -/*@{*/ -#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 - * - * New to SDL 1.3. - */ -/*@{*/ -#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. - */ -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; - - -/* 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); - -/** - * \return 1 if audio device is still functioning, zero if not, -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_AudioDeviceConnected(SDL_AudioDeviceID dev); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_audio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_blendmode.h b/src/helper/android/SDL1.3/include/SDL_blendmode.h deleted file mode 100644 index fdc439377..000000000 --- a/src/helper/android/SDL1.3/include/SDL_blendmode.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \brief The blend mode used in SDL_RenderCopy() and drawing operations. - */ -typedef enum -{ - SDL_BLENDMODE_NONE = 0x00000000, /**< No blending */ - SDL_BLENDMODE_BLEND = 0x00000001, /**< dst = (src * A) + (dst * (1-A)) */ - SDL_BLENDMODE_ADD = 0x00000002, /**< dst = (src * A) + dst */ - SDL_BLENDMODE_MOD = 0x00000004 /**< dst = src * dst */ -} SDL_BlendMode; - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_clipboard.h b/src/helper/android/SDL1.3/include/SDL_clipboard.h deleted file mode 100644 index 817d42e71..000000000 --- a/src/helper/android/SDL1.3/include/SDL_clipboard.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 whether the clipboard has text - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_clipboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_compat.h b/src/helper/android/SDL1.3/include/SDL_compat.h deleted file mode 100644 index 19ade189f..000000000 --- a/src/helper/android/SDL1.3/include/SDL_compat.h +++ /dev/null @@ -1,366 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - - /** - * \defgroup Compatibility SDL 1.2 Compatibility API - */ -/*@{*/ - -/** - * \file SDL_compat.h - * - * This file contains functions for backwards compatibility with SDL 1.2. - */ - -/** - * \def SDL_NO_COMPAT - * - * #define SDL_NO_COMPAT to prevent SDL_compat.h from being included. - * SDL_NO_COMPAT is intended to make it easier to covert SDL 1.2 code to - * SDL 1.3/2.0. - */ - - /*@}*/ - -#ifdef SDL_NO_COMPAT -#define _SDL_compat_h -#endif - -#ifndef _SDL_compat_h -#define _SDL_compat_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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \addtogroup Compatibility - */ -/*@{*/ - -/* Platform */ -#ifdef __WIN32__ -#undef __WIN32__ -#define __WIN32__ 1 -#endif - -/** - * \name Surface flags - */ -/*@{*/ -#define SDL_SWSURFACE 0x00000000 /**< \note Not used */ -#define SDL_SRCALPHA 0x00010000 -#define SDL_SRCCOLORKEY 0x00020000 -#define SDL_ANYFORMAT 0x00100000 -#define SDL_HWPALETTE 0x00200000 -#define SDL_DOUBLEBUF 0x00400000 -#define SDL_FULLSCREEN 0x00800000 -#define SDL_RESIZABLE 0x01000000 -#define SDL_NOFRAME 0x02000000 -#define SDL_OPENGL 0x04000000 -#define SDL_HWSURFACE 0x08000001 /**< \note Not used */ -#define SDL_ASYNCBLIT 0x08000000 /**< \note Not used */ -#define SDL_RLEACCELOK 0x08000000 /**< \note Not used */ -#define SDL_HWACCEL 0x08000000 /**< \note Not used */ -/*@}*//*Surface flags*/ - -#define SDL_APPMOUSEFOCUS 0x01 -#define SDL_APPINPUTFOCUS 0x02 -#define SDL_APPACTIVE 0x04 - -#define SDL_LOGPAL 0x01 -#define SDL_PHYSPAL 0x02 - -#define SDL_ACTIVEEVENT SDL_EVENT_COMPAT1 -#define SDL_VIDEORESIZE SDL_EVENT_COMPAT2 -#define SDL_VIDEOEXPOSE SDL_EVENT_COMPAT3 -#define SDL_ACTIVEEVENTMASK SDL_ACTIVEEVENT, SDL_ACTIVEEVENT -#define SDL_VIDEORESIZEMASK SDL_VIDEORESIZE, SDL_VIDEORESIZE -#define SDL_VIDEOEXPOSEMASK SDL_VIDEOEXPOSE, SDL_VIDEOEXPOSE -#define SDL_WINDOWEVENTMASK SDL_WINDOWEVENT, SDL_WINDOWEVENT -#define SDL_KEYDOWNMASK SDL_KEYDOWN, SDL_KEYDOWN -#define SDL_KEYUPMASK SDL_KEYUP, SDL_KEYUP -#define SDL_KEYEVENTMASK SDL_KEYDOWN, SDL_KEYUP -#define SDL_TEXTEDITINGMASK SDL_TEXTEDITING, SDL_TEXTEDITING -#define SDL_TEXTINPUTMASK SDL_TEXTINPUT, SDL_TEXTINPUT -#define SDL_MOUSEMOTIONMASK SDL_MOUSEMOTION, SDL_MOUSEMOTION -#define SDL_MOUSEBUTTONDOWNMASK SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONDOWN -#define SDL_MOUSEBUTTONUPMASK SDL_MOUSEBUTTONUP, SDL_MOUSEBUTTONUP -#define SDL_MOUSEWHEELMASK SDL_MOUSEWHEEL, SDL_MOUSEWHEEL -#define SDL_MOUSEEVENTMASK SDL_MOUSEMOTION, SDL_MOUSEBUTTONUP -#define SDL_JOYAXISMOTIONMASK SDL_JOYAXISMOTION, SDL_JOYAXISMOTION -#define SDL_JOYBALLMOTIONMASK SDL_JOYBALLMOTION, SDL_JOYBALLMOTION -#define SDL_JOYHATMOTIONMASK SDL_JOYHATMOTION, SDL_JOYHATMOTION -#define SDL_JOYBUTTONDOWNMASK SDL_JOYBUTTONDOWN, SDL_JOYBUTTONDOWN -#define SDL_JOYBUTTONUPMASK SDL_JOYBUTTONUP, SDL_JOYBUTTONUP -#define SDL_JOYEVENTMASK SDL_JOYAXISMOTION, SDL_JOYBUTTONUP -#define SDL_QUITMASK SDL_QUIT, SDL_QUIT -#define SDL_SYSWMEVENTMASK SDL_SYSWMEVENT, SDL_SYSWMEVENT -#define SDL_PROXIMITYINMASK SDL_PROXIMITYIN, SDL_PROXIMITYIN -#define SDL_PROXIMITYOUTMASK SDL_PROXIMITYOUT, SDL_PROXIMITYOUT -#define SDL_ALLEVENTS SDL_FIRSTEVENT, SDL_LASTEVENT - -#define SDL_BUTTON_WHEELUP 4 -#define SDL_BUTTON_WHEELDOWN 5 - -#define SDL_DEFAULT_REPEAT_DELAY 500 -#define SDL_DEFAULT_REPEAT_INTERVAL 30 - -typedef struct SDL_VideoInfo -{ - Uint32 hw_available:1; - Uint32 wm_available:1; - Uint32 UnusedBits1:6; - Uint32 UnusedBits2:1; - Uint32 blit_hw:1; - Uint32 blit_hw_CC:1; - Uint32 blit_hw_A:1; - Uint32 blit_sw:1; - Uint32 blit_sw_CC:1; - Uint32 blit_sw_A:1; - Uint32 blit_fill:1; - Uint32 UnusedBits3:16; - Uint32 video_mem; - - SDL_PixelFormat *vfmt; - - int current_w; - int current_h; -} SDL_VideoInfo; - -/** - * \name Overlay formats - * - * The most common video overlay formats. - * - * For an explanation of these pixel formats, see: - * http://www.webartz.com/fourcc/indexyuv.htm - * - * For information on the relationship between color spaces, see: - * http://www.neuro.sfc.keio.ac.jp/~aly/polygon/info/color-space-faq.html - */ -/*@{*/ -#define SDL_YV12_OVERLAY 0x32315659 /**< Planar mode: Y + V + U (3 planes) */ -#define SDL_IYUV_OVERLAY 0x56555949 /**< Planar mode: Y + U + V (3 planes) */ -#define SDL_YUY2_OVERLAY 0x32595559 /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */ -#define SDL_UYVY_OVERLAY 0x59565955 /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */ -#define SDL_YVYU_OVERLAY 0x55595659 /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */ -/*@}*//*Overlay formats*/ - -/** - * The YUV hardware video overlay. - */ -typedef struct SDL_Overlay -{ - Uint32 format; /**< Read-only */ - int w, h; /**< Read-only */ - int planes; /**< Read-only */ - Uint16 *pitches; /**< Read-only */ - Uint8 **pixels; /**< Read-write */ - - /** - * \name Hardware-specific surface info - */ - /*@{*/ - struct private_yuvhwfuncs *hwfuncs; - struct private_yuvhwdata *hwdata; - /*@}*//*Hardware-specific surface info*/ - - /** - * \name Special flags - */ - /*@{*/ - Uint32 hw_overlay:1; /**< Flag: This overlay hardware accelerated? */ - Uint32 UnusedBits:31; - /*@}*//*Special flags*/ -} SDL_Overlay; - -typedef enum -{ - SDL_GRAB_QUERY = -1, - SDL_GRAB_OFF = 0, - SDL_GRAB_ON = 1 -} SDL_GrabMode; - -struct SDL_SysWMinfo; - -/** - * \name Obsolete or renamed key codes - */ -/*@{*/ - -#define SDL_keysym SDL_Keysym -#define SDL_KeySym SDL_Keysym -#define SDL_scancode SDL_Scancode -#define SDL_ScanCode SDL_Scancode -#define SDLKey SDL_Keycode -#define SDLMod SDL_Keymod - -/** - * \name Renamed keys - * - * These key constants were renamed for clarity or consistency. - */ -/*@{*/ -#define SDLK_KP0 SDLK_KP_0 -#define SDLK_KP1 SDLK_KP_1 -#define SDLK_KP2 SDLK_KP_2 -#define SDLK_KP3 SDLK_KP_3 -#define SDLK_KP4 SDLK_KP_4 -#define SDLK_KP5 SDLK_KP_5 -#define SDLK_KP6 SDLK_KP_6 -#define SDLK_KP7 SDLK_KP_7 -#define SDLK_KP8 SDLK_KP_8 -#define SDLK_KP9 SDLK_KP_9 -#define SDLK_NUMLOCK SDLK_NUMLOCKCLEAR -#define SDLK_SCROLLOCK SDLK_SCROLLLOCK -#define SDLK_PRINT SDLK_PRINTSCREEN -#define SDLK_LMETA SDLK_LGUI -#define SDLK_RMETA SDLK_RGUI -/*@}*//*Renamed keys*/ - -/** - * \name META modifier - * - * The META modifier is equivalent to the GUI modifier from the USB standard. - */ -/*@{*/ -#define KMOD_LMETA KMOD_LGUI -#define KMOD_RMETA KMOD_RGUI -#define KMOD_META KMOD_GUI -/*@}*//*META modifier*/ - -/** - * \name Not in USB - * - * These keys don't appear in the USB specification (or at least not under - * those names). I'm unsure if the following assignments make sense or if these - * codes should be defined as actual additional SDLK_ constants. - */ -/*@{*/ -#define SDLK_LSUPER SDLK_LMETA -#define SDLK_RSUPER SDLK_RMETA -#define SDLK_COMPOSE SDLK_APPLICATION -#define SDLK_BREAK SDLK_STOP -#define SDLK_EURO SDLK_2 -/*@}*//*Not in USB*/ - -/*@}*//*Obsolete or renamed key codes*/ - -#define SDL_SetModuleHandle(x) -#define SDL_AllocSurface SDL_CreateRGBSurface - -extern DECLSPEC const SDL_version *SDLCALL SDL_Linked_Version(void); -extern DECLSPEC const char *SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen); -extern DECLSPEC const char *SDLCALL SDL_VideoDriverName(char *namebuf, int maxlen); -extern DECLSPEC const SDL_VideoInfo *SDLCALL SDL_GetVideoInfo(void); -extern DECLSPEC int SDLCALL SDL_VideoModeOK(int width, - int height, - int bpp, Uint32 flags); -extern DECLSPEC SDL_Rect **SDLCALL SDL_ListModes(const SDL_PixelFormat * - format, Uint32 flags); -extern DECLSPEC SDL_Surface *SDLCALL SDL_SetVideoMode(int width, int height, - int bpp, Uint32 flags); -extern DECLSPEC SDL_Surface *SDLCALL SDL_GetVideoSurface(void); -extern DECLSPEC void SDLCALL SDL_UpdateRects(SDL_Surface * screen, - int numrects, SDL_Rect * rects); -extern DECLSPEC void SDLCALL SDL_UpdateRect(SDL_Surface * screen, - Sint32 x, - Sint32 y, Uint32 w, Uint32 h); -extern DECLSPEC int SDLCALL SDL_Flip(SDL_Surface * screen); -extern DECLSPEC int SDLCALL SDL_SetAlpha(SDL_Surface * surface, - Uint32 flag, Uint8 alpha); -extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormat(SDL_Surface * surface); -extern DECLSPEC SDL_Surface *SDLCALL SDL_DisplayFormatAlpha(SDL_Surface * - surface); -extern DECLSPEC void SDLCALL SDL_WM_SetCaption(const char *title, - const char *icon); -extern DECLSPEC void SDLCALL SDL_WM_GetCaption(const char **title, - const char **icon); -extern DECLSPEC void SDLCALL SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask); -extern DECLSPEC int SDLCALL SDL_WM_IconifyWindow(void); -extern DECLSPEC int SDLCALL SDL_WM_ToggleFullScreen(SDL_Surface * surface); -extern DECLSPEC SDL_GrabMode SDLCALL SDL_WM_GrabInput(SDL_GrabMode mode); -extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface * surface, - int flags, - const SDL_Color * colors, - int firstcolor, int ncolors); -extern DECLSPEC int SDLCALL SDL_SetColors(SDL_Surface * surface, - const SDL_Color * colors, - int firstcolor, int ncolors); -extern DECLSPEC int SDLCALL SDL_GetWMInfo(struct SDL_SysWMinfo *info); -extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void); -extern DECLSPEC void SDLCALL SDL_WarpMouse(Uint16 x, Uint16 y); -extern DECLSPEC SDL_Overlay *SDLCALL SDL_CreateYUVOverlay(int width, - int height, - Uint32 format, - SDL_Surface * - display); -extern DECLSPEC int SDLCALL SDL_LockYUVOverlay(SDL_Overlay * overlay); -extern DECLSPEC void SDLCALL SDL_UnlockYUVOverlay(SDL_Overlay * overlay); -extern DECLSPEC int SDLCALL SDL_DisplayYUVOverlay(SDL_Overlay * overlay, - SDL_Rect * dstrect); -extern DECLSPEC void SDLCALL SDL_FreeYUVOverlay(SDL_Overlay * overlay); -extern DECLSPEC void SDLCALL SDL_GL_SwapBuffers(void); -extern DECLSPEC int SDLCALL SDL_SetGamma(float red, float green, float blue); -extern DECLSPEC int SDLCALL SDL_SetGammaRamp(const Uint16 * red, - const Uint16 * green, - const Uint16 * blue); -extern DECLSPEC int SDLCALL SDL_GetGammaRamp(Uint16 * red, Uint16 * green, - Uint16 * blue); -extern DECLSPEC int SDLCALL SDL_EnableKeyRepeat(int delay, int interval); -extern DECLSPEC void SDLCALL SDL_GetKeyRepeat(int *delay, int *interval); -extern DECLSPEC int SDLCALL SDL_EnableUNICODE(int enable); - -typedef SDL_Window* SDL_WindowID; - -#define SDL_KillThread(X) - -/* The timeslice and timer resolution are no longer relevant */ -#define SDL_TIMESLICE 10 -#define TIMER_RESOLUTION 10 - -typedef Uint32 (SDLCALL * SDL_OldTimerCallback) (Uint32 interval); -extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_OldTimerCallback callback); - -extern DECLSPEC int SDLCALL SDL_putenv(const char *variable); - -/*@}*//*Compatibility*/ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_compat_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_config.h b/src/helper/android/SDL1.3/include/SDL_config.h deleted file mode 100644 index 3b504520a..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -#include "SDL_platform.h" - -/** - * \file SDL_config.h - * - * SDL_config.h for any platform that doesn't build using the configure system. - */ - -/* Add any platform that doesn't build using the configure system. */ -#if defined(__WIN32__) -#include "SDL_config_windows.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(__NINTENDODS__) -#include "SDL_config_nintendods.h" -#else -#include "SDL_config_minimal.h" -#endif /* platform config */ - -#endif /* _SDL_config_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config.h.in b/src/helper/android/SDL1.3/include/SDL_config.h.in deleted file mode 100644 index 1c6f73b95..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config.h.in +++ /dev/null @@ -1,309 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -/** - * \file SDL_config.h.in - * - * This is a set of defines to configure the SDL features - */ - -/* General platform specific identifiers */ -#include "SDL_platform.h" - -/* Make sure that this isn't included by Visual C++ */ -#ifdef _MSC_VER -#error You should run hg revert SDL_config.h -#endif - -/* C language features */ -#undef const -#undef inline -#undef volatile - -/* C datatypes */ -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#undef size_t -#undef int8_t -#undef uint8_t -#undef int16_t -#undef uint16_t -#undef int32_t -#undef uint32_t -#undef int64_t -#undef uint64_t -#undef uintptr_t -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#undef SIZEOF_VOIDP -#undef SDL_HAS_64BIT_TYPE -#undef HAVE_GCC_ATOMICS -#undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET - -/* Comment this if you want to build without any C library requirements */ -#undef HAVE_LIBC -#if HAVE_LIBC - -/* Useful headers */ -#undef HAVE_ALLOCA_H -#undef HAVE_SYS_TYPES_H -#undef HAVE_STDIO_H -#undef STDC_HEADERS -#undef HAVE_STDLIB_H -#undef HAVE_STDARG_H -#undef HAVE_MALLOC_H -#undef HAVE_MEMORY_H -#undef HAVE_STRING_H -#undef HAVE_STRINGS_H -#undef HAVE_INTTYPES_H -#undef HAVE_STDINT_H -#undef HAVE_CTYPE_H -#undef HAVE_MATH_H -#undef HAVE_ICONV_H -#undef HAVE_SIGNAL_H -#undef HAVE_ALTIVEC_H - -/* C library functions */ -#undef HAVE_MALLOC -#undef HAVE_CALLOC -#undef HAVE_REALLOC -#undef HAVE_FREE -#undef HAVE_ALLOCA -#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */ -#undef HAVE_GETENV -#undef HAVE_SETENV -#undef HAVE_PUTENV -#undef HAVE_UNSETENV -#endif -#undef HAVE_QSORT -#undef HAVE_ABS -#undef HAVE_BCOPY -#undef HAVE_MEMSET -#undef HAVE_MEMCPY -#undef HAVE_MEMMOVE -#undef HAVE_MEMCMP -#undef HAVE_STRLEN -#undef HAVE_STRLCPY -#undef HAVE_STRLCAT -#undef HAVE_STRDUP -#undef HAVE__STRREV -#undef HAVE__STRUPR -#undef HAVE__STRLWR -#undef HAVE_INDEX -#undef HAVE_RINDEX -#undef HAVE_STRCHR -#undef HAVE_STRRCHR -#undef HAVE_STRSTR -#undef HAVE_ITOA -#undef HAVE__LTOA -#undef HAVE__UITOA -#undef HAVE__ULTOA -#undef HAVE_STRTOL -#undef HAVE_STRTOUL -#undef HAVE__I64TOA -#undef HAVE__UI64TOA -#undef HAVE_STRTOLL -#undef HAVE_STRTOULL -#undef HAVE_STRTOD -#undef HAVE_ATOI -#undef HAVE_ATOF -#undef HAVE_STRCMP -#undef HAVE_STRNCMP -#undef HAVE__STRICMP -#undef HAVE_STRCASECMP -#undef HAVE__STRNICMP -#undef HAVE_STRNCASECMP -#undef HAVE_SSCANF -#undef HAVE_SNPRINTF -#undef HAVE_VSNPRINTF -#undef HAVE_M_PI -#undef HAVE_ATAN -#undef HAVE_ATAN2 -#undef HAVE_CEIL -#undef HAVE_COPYSIGN -#undef HAVE_COS -#undef HAVE_COSF -#undef HAVE_FABS -#undef HAVE_FLOOR -#undef HAVE_LOG -#undef HAVE_POW -#undef HAVE_SCALBN -#undef HAVE_SIN -#undef HAVE_SINF -#undef HAVE_SQRT -#undef HAVE_SIGACTION -#undef HAVE_SETJMP -#undef HAVE_NANOSLEEP -#undef HAVE_SYSCONF -#undef HAVE_SYSCTLBYNAME -#undef HAVE_CLOCK_GETTIME -#undef HAVE_GETPAGESIZE -#undef HAVE_MPROTECT -#undef HAVE_ICONV - -#else -/* We may need some replacement for stdarg.h here */ -#include -#endif /* HAVE_LIBC */ - -/* SDL internal assertion support */ -#undef SDL_DEFAULT_ASSERT_LEVEL - -/* Allow disabling of core subsystems */ -#undef SDL_ATOMIC_DISABLED -#undef SDL_AUDIO_DISABLED -#undef SDL_CPUINFO_DISABLED -#undef SDL_EVENTS_DISABLED -#undef SDL_FILE_DISABLED -#undef SDL_JOYSTICK_DISABLED -#undef SDL_HAPTIC_DISABLED -#undef SDL_LOADSO_DISABLED -#undef SDL_RENDER_DISABLED -#undef SDL_THREADS_DISABLED -#undef SDL_TIMERS_DISABLED -#undef SDL_VIDEO_DISABLED -#undef SDL_POWER_DISABLED - -/* Enable various audio drivers */ -#undef SDL_AUDIO_DRIVER_ALSA -#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -#undef SDL_AUDIO_DRIVER_ARTS -#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC -#undef SDL_AUDIO_DRIVER_PULSEAUDIO -#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC -#undef SDL_AUDIO_DRIVER_BEOSAUDIO -#undef SDL_AUDIO_DRIVER_BSD -#undef SDL_AUDIO_DRIVER_COREAUDIO -#undef SDL_AUDIO_DRIVER_DISK -#undef SDL_AUDIO_DRIVER_DUMMY -#undef SDL_AUDIO_DRIVER_DSOUND -#undef SDL_AUDIO_DRIVER_ESD -#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC -#undef SDL_AUDIO_DRIVER_NAS -#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC -#undef SDL_AUDIO_DRIVER_NDS -#undef SDL_AUDIO_DRIVER_OSS -#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H -#undef SDL_AUDIO_DRIVER_PAUDIO -#undef SDL_AUDIO_DRIVER_QSA -#undef SDL_AUDIO_DRIVER_SUNAUDIO -#undef SDL_AUDIO_DRIVER_WINWAVEOUT -#undef SDL_AUDIO_DRIVER_FUSIONSOUND -#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC - -/* Enable various input drivers */ -#undef SDL_INPUT_LINUXEV -#undef SDL_INPUT_TSLIB -#undef SDL_JOYSTICK_BEOS -#undef SDL_JOYSTICK_DINPUT -#undef SDL_JOYSTICK_DUMMY -#undef SDL_JOYSTICK_IOKIT -#undef SDL_JOYSTICK_LINUX -#undef SDL_JOYSTICK_NDS -#undef SDL_JOYSTICK_WINMM -#undef SDL_JOYSTICK_USBHID -#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H -#undef SDL_HAPTIC_DUMMY -#undef SDL_HAPTIC_LINUX -#undef SDL_HAPTIC_IOKIT -#undef SDL_HAPTIC_DINPUT - -/* Enable various shared object loading systems */ -#undef SDL_LOADSO_BEOS -#undef SDL_LOADSO_DLCOMPAT -#undef SDL_LOADSO_DLOPEN -#undef SDL_LOADSO_DUMMY -#undef SDL_LOADSO_LDG -#undef SDL_LOADSO_WINDOWS - -/* Enable various threading systems */ -#undef SDL_THREAD_BEOS -#undef SDL_THREAD_NDS -#undef SDL_THREAD_PTHREAD -#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX -#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP -#undef SDL_THREAD_SPROC -#undef SDL_THREAD_WINDOWS - -/* Enable various timer systems */ -#undef SDL_TIMER_BEOS -#undef SDL_TIMER_DUMMY -#undef SDL_TIMER_NDS -#undef SDL_TIMER_UNIX -#undef SDL_TIMER_WINDOWS -#undef SDL_TIMER_WINCE - -/* Enable various video drivers */ -#undef SDL_VIDEO_DRIVER_BWINDOW -#undef SDL_VIDEO_DRIVER_COCOA -#undef SDL_VIDEO_DRIVER_DIRECTFB -#undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC -#undef SDL_VIDEO_DRIVER_DUMMY -#undef SDL_VIDEO_DRIVER_NDS -#undef SDL_VIDEO_DRIVER_WINDOWS -#undef SDL_VIDEO_DRIVER_X11 -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS -#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE -#undef SDL_VIDEO_DRIVER_X11_XCURSOR -#undef SDL_VIDEO_DRIVER_X11_XINERAMA -#undef SDL_VIDEO_DRIVER_X11_XINPUT -#undef SDL_VIDEO_DRIVER_X11_XRANDR -#undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER -#undef SDL_VIDEO_DRIVER_X11_XSHAPE -#undef SDL_VIDEO_DRIVER_X11_XVIDMODE - -#undef SDL_VIDEO_RENDER_D3D -#undef SDL_VIDEO_RENDER_OGL -#undef SDL_VIDEO_RENDER_OGL_ES -#undef SDL_VIDEO_RENDER_DIRECTFB - -/* Enable OpenGL support */ -#undef SDL_VIDEO_OPENGL -#undef SDL_VIDEO_OPENGL_ES -#undef SDL_VIDEO_OPENGL_BGL -#undef SDL_VIDEO_OPENGL_CGL -#undef SDL_VIDEO_OPENGL_GLX -#undef SDL_VIDEO_OPENGL_WGL -#undef SDL_VIDEO_OPENGL_OSMESA -#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC - -/* Enable system power support */ -#undef SDL_POWER_LINUX -#undef SDL_POWER_WINDOWS -#undef SDL_POWER_MACOSX -#undef SDL_POWER_BEOS -#undef SDL_POWER_NINTENDODS -#undef SDL_POWER_HARDWIRED - -/* Enable assembly routines */ -#undef SDL_ASSEMBLY_ROUTINES -#undef SDL_ALTIVEC_BLITTERS - -#endif /* _SDL_config_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_android.h b/src/helper/android/SDL1.3/include/SDL_config_android.h deleted file mode 100644 index 6f93be10f..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_android.h +++ /dev/null @@ -1,157 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_android_h -#define _SDL_config_android_h - -#include "SDL_platform.h" - -/** - * \file SDL_config_android.h - * - * This is a configuration that can be used to build SDL for Android - */ - -#include - -/* -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -*/ - - -#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_SETENV 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_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_M_PI 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 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 SIZEOF_VOIDP 4 - -typedef unsigned int size_t; -//typedef unsigned long uintptr_t; - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_ANDROID 0 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_ANDROID 1 -#define SDL_HAPTIC_DUMMY 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_ANDROID 1 - -/* Enable OpenGL ES */ -#define SDL_VIDEO_OPENGL_ES 1 - -#ifdef SDL_GLES1 - #define SDL_VIDEO_RENDER_OGL_ES 1 -#endif - -#ifdef SDL_GLES2 - #define SDL_VIDEO_RENDER_OGL_ES2 1 -#endif - -#if !defined( SDL_VIDEO_RENDER_OGL_ES ) && !defined( SDL_VIDEO_RENDER_OGL_ES2 ) - #define SDL_VIDEO_RENDER_OGL_ES 1 -#endif - -#endif /* _SDL_config_minimal_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_iphoneos.h b/src/helper/android/SDL1.3/include/SDL_config_iphoneos.h deleted file mode 100644 index e8a0260f7..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_iphoneos.h +++ /dev/null @@ -1,161 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_iphoneos_h -#define _SDL_config_iphoneos_h - -#include "SDL_platform.h" - -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef unsigned long uintptr_t; -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#ifdef __LP64__ -#define SIZEOF_VOIDP 8 -#else -#define SIZEOF_VOIDP 4 -#endif - -#define SDL_HAS_64BIT_TYPE 1 - -#define HAVE_GCC_ATOMICS 1 - -#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_SETENV 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_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_M_PI 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 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 - -/* enable iPhone version of Core Audio driver */ -#define SDL_AUDIO_DRIVER_COREAUDIOIPHONE 1 -/* Enable the dummy audio driver (src/audio/dummy/\*.c) */ -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ -#define SDL_HAPTIC_DISABLED 1 - -/* Enable Unix style SO loading */ -/* Technically this works, but it violates the iPhone developer agreement */ -/* #define SDL_LOADSO_DLOPEN 1 */ - -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ -#define SDL_LOADSO_DISABLED 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 - -/* Supported video drivers */ -#define SDL_VIDEO_DRIVER_UIKIT 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 - -/* enable OpenGL ES */ -#define SDL_VIDEO_OPENGL_ES 1 -#define SDL_VIDEO_RENDER_OGL_ES 1 -#define SDL_VIDEO_RENDER_OGL_ES2 1 - -/* Enable system power support */ -#define SDL_POWER_UIKIT 1 - -/* enable iPhone keyboard support */ -#define SDL_IPHONE_KEYBOARD 1 - -/* Set max recognized G-force from accelerometer - See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed - */ -#define SDL_IPHONE_MAX_GFORCE 5.0 - -#endif /* _SDL_config_iphoneos_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_macosx.h b/src/helper/android/SDL1.3/include/SDL_config_macosx.h deleted file mode 100644 index 14238cb5b..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_macosx.h +++ /dev/null @@ -1,175 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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 - -#define SDL_HAS_64BIT_TYPE 1 - -/* Useful headers */ -/* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */ -#if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) ) -#define HAVE_ALLOCA_H 1 -#endif -#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_SSCANF 1 -#define HAVE_SNPRINTF 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 - -/* 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 -#define SDL_VIDEO_DRIVER_X11 1 -#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_XINPUT "/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_XINPUT 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 - -#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 assembly routines */ -#define SDL_ASSEMBLY_ROUTINES 1 -#ifdef __ppc__ -#define SDL_ALTIVEC_BLITTERS 1 -#endif - -#endif /* _SDL_config_macosx_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_minimal.h b/src/helper/android/SDL1.3/include/SDL_config_minimal.h deleted file mode 100644 index 7eb76c6e6..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_minimal.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_minimal_h -#define _SDL_config_minimal_h - -#include "SDL_platform.h" - -/** - * \file SDL_config_minimal.h - * - * This is the minimal configuration that can be used to build SDL. - */ - -#include -#include - -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -typedef unsigned int size_t; -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; -typedef unsigned long uintptr_t; -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#define SDL_HAS_64BIT_TYPE -#ifdef __GNUC__ -#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1 -#endif - -/* Enable the dummy audio driver (src/audio/dummy/\*.c) */ -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ -#define SDL_JOYSTICK_DISABLED 1 - -/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */ -#define SDL_HAPTIC_DISABLED 1 - -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ -#define SDL_LOADSO_DISABLED 1 - -/* Enable the stub thread support (src/thread/generic/\*.c) */ -#define SDL_THREADS_DISABLED 1 - -/* Enable the stub timer support (src/timer/dummy/\*.c) */ -#define SDL_TIMERS_DISABLED 1 - -/* Enable the dummy video driver (src/video/dummy/\*.c) */ -#define SDL_VIDEO_DRIVER_DUMMY 1 - -#endif /* _SDL_config_minimal_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_nintendods.h b/src/helper/android/SDL1.3/include/SDL_config_nintendods.h deleted file mode 100644 index a58a81794..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_nintendods.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_nintendods_h -#define _SDL_config_nintendods_h - -#include "SDL_platform.h" - -/* This is a set of defines to configure the SDL features */ - -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; - -/* LiF: __PTRDIFF_TYPE__ was causing errors of conflicting typedefs with the - shipping with devkitARM. copied a similar ifdef from it. */ -#ifndef __PTRDIFF_TYPE__ -typedef unsigned long uintptr_t; -#else -typedef unsigned __PTRDIFF_TYPE__ uintptr_t; -#endif -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#define SIZEOF_VOIDP 4 - -#define SDL_HAS_64BIT_TYPE 1 - -/* Useful headers */ -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_CTYPE_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_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_STRDUP 1 -#define HAVE_INDEX 1 -#define HAVE_RINDEX 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRICMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 - -/* DS isn't that sophisticated */ -#define LACKS_SYS_MMAN_H 1 - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_NDS 1 -/*#define SDL_AUDIO_DRIVER_DUMMY 1 TODO: uncomment this later*/ - -/* Enable various input drivers */ -#define SDL_JOYSTICK_NDS 1 -/*#define SDL_JOYSTICK_DUMMY 1 TODO: uncomment this later*/ - -/* DS has no dynamic linking afaik */ -#define SDL_LOADSO_DISABLED 1 - -/* Enable various threading systems */ -/*#define SDL_THREAD_NDS 1*/ -#define SDL_THREADS_DISABLED 1 - -/* Enable various timer systems */ -#define SDL_TIMER_NDS 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_NDS 1 -#ifdef USE_HW_RENDERER -#define SDL_VIDEO_RENDER_NDS 1 -#else -#define SDL_VIDEO_RENDER_NDS 0 -#endif - -/* Enable system power support */ -#define SDL_POWER_NINTENDODS 1 - -/* Enable haptic support */ -#define SDL_HAPTIC_NDS 1 - -#define SDL_BYTEORDER SDL_LIL_ENDIAN - -#endif /* _SDL_config_nintendods_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_pandora.h b/src/helper/android/SDL1.3/include/SDL_config_pandora.h deleted file mode 100644 index f003db0ca..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_pandora.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -/* This is a set of defines to configure the SDL features */ - -/* General platform specific identifiers */ -#include "SDL_platform.h" - -#ifdef __LP64__ -#define SIZEOF_VOIDP 8 -#else -#define SIZEOF_VOIDP 4 -#endif - -#define SDL_HAS_64BIT_TYPE 1 -#define SDL_BYTEORDER 1234 - -#define HAVE_ALLOCA_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_MALLOC_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRING_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#define HAVE_ICONV_H 1 -#define HAVE_SIGNAL_H 1 -#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_STRLEN 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_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 -#define HAVE_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_M_PI 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_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 SDL_AUDIO_DRIVER_DUMMY 1 -#define SDL_AUDIO_DRIVER_OSS 1 - -#define SDL_INPUT_LINUXEV 1 -#define SDL_INPUT_TSLIB 1 -#define SDL_JOYSTICK_LINUX 1 -#define SDL_HAPTIC_LINUX 1 - -#define SDL_LOADSO_DLOPEN 1 - -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1 - -#define SDL_TIMER_UNIX 1 - -#define SDL_VIDEO_DRIVER_DUMMY 1 -#define SDL_VIDEO_DRIVER_X11 1 -#define SDL_VIDEO_DRIVER_X11_XINPUT 1 -#define SDL_VIDEO_DRIVER_PANDORA 1 -#define SDL_VIDEO_RENDER_OGL_ES 1 -#define SDL_VIDEO_OPENGL_ES 1 - -#endif /* _SDL_config_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_windows.h b/src/helper/android/SDL1.3/include/SDL_config_windows.h deleted file mode 100644 index 7192543c5..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_windows.h +++ /dev/null @@ -1,208 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_windows_h -#define _SDL_config_windows_h - -#include "SDL_platform.h" - -/* This is a set of defines to configure the SDL features */ - -#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H) -#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__) -#define HAVE_STDINT_H 1 -#elif defined(_MSC_VER) -typedef signed __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef signed __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef signed __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; -#else -typedef unsigned int uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif -/* Older Visual C++ headers don't have the Win64-compatible typedefs... */ -#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR))) -#define DWORD_PTR DWORD -#endif -#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR))) -#define LONG_PTR LONG -#endif -#else /* !__GNUC__ && !_MSC_VER */ -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; -#ifndef _SIZE_T_DEFINED_ -#define _SIZE_T_DEFINED_ -typedef unsigned int size_t; -#endif -typedef unsigned int uintptr_t; -#endif /* __GNUC__ || _MSC_VER */ -#endif /* !_STDINT_H_ && !HAVE_STDINT_H */ - -#ifdef _WIN64 -# define SIZEOF_VOIDP 8 -#else -# define SIZEOF_VOIDP 4 -#endif -#define SDL_HAS_64BIT_TYPE 1 - -/* Enabled for SDL 1.2 (binary compatibility) */ -//#define HAVE_LIBC 1 -#ifdef HAVE_LIBC -/* Useful headers */ -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#ifndef _WIN32_WCE -#define HAVE_SIGNAL_H 1 -#endif - -/* 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_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE__STRREV 1 -#define HAVE__STRUPR 1 -#define HAVE__STRLWR 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_ITOA 1 -#define HAVE__LTOA 1 -#define HAVE__ULTOA 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE__STRICMP 1 -#define HAVE__STRNICMP 1 -#define HAVE_SSCANF 1 -#define HAVE_M_PI 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 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 -#else -#define HAVE_STDARG_H 1 -#define HAVE_STDDEF_H 1 -#endif - -/* Enable various audio drivers */ -#ifndef _WIN32_WCE -#define SDL_AUDIO_DRIVER_DSOUND 1 -#endif -#define SDL_AUDIO_DRIVER_WINWAVEOUT 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#ifdef _WIN32_WCE -#define SDL_JOYSTICK_DISABLED 1 -#define SDL_HAPTIC_DUMMY 1 -#else -#define SDL_JOYSTICK_DINPUT 1 -#define SDL_HAPTIC_DINPUT 1 -#endif - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_WINDOWS 1 - -/* Enable various threading systems */ -#define SDL_THREAD_WINDOWS 1 - -/* Enable various timer systems */ -#ifdef _WIN32_WCE -#define SDL_TIMER_WINCE 1 -#else -#define SDL_TIMER_WINDOWS 1 -#endif - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_DUMMY 1 -#define SDL_VIDEO_DRIVER_WINDOWS 1 - -#ifndef _WIN32_WCE -#ifndef SDL_VIDEO_RENDER_D3D -#define SDL_VIDEO_RENDER_D3D 1 -#endif -#endif - -/* Enable OpenGL support */ -#ifndef _WIN32_WCE -#ifndef SDL_VIDEO_OPENGL -#define SDL_VIDEO_OPENGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_WGL -#define SDL_VIDEO_OPENGL_WGL 1 -#endif -#ifndef SDL_VIDEO_RENDER_OGL -#define SDL_VIDEO_RENDER_OGL 1 -#endif -#endif - -/* Enable system power support */ -#define SDL_POWER_WINDOWS 1 - -/* Enable assembly routines (Win64 doesn't have inline asm) */ -#ifndef _WIN64 -#define SDL_ASSEMBLY_ROUTINES 1 -#endif - -#endif /* _SDL_config_windows_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_config_wiz.h b/src/helper/android/SDL1.3/include/SDL_config_wiz.h deleted file mode 100644 index c740af7d2..000000000 --- a/src/helper/android/SDL1.3/include/SDL_config_wiz.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -/* This is a set of defines to configure the SDL features */ - -/* General platform specific identifiers */ -#include "SDL_platform.h" - -/* Make sure that this isn't included by Visual C++ */ -#ifdef _MSC_VER -#error You should copy include/SDL_config.h.default to include/SDL_config.h -#endif - -#define SDL_HAS_64BIT_TYPE 1 -#define SDL_BYTEORDER 1234 - -#define HAVE_ALLOCA_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_MALLOC_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRING_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#define HAVE_ICONV_H 1 -#define HAVE_SIGNAL_H 1 -#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_STRLEN 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_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 -#define HAVE_SSCANF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_M_PI 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_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_POW 1 - -#define SDL_CDROM_DISABLED 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 -#define SDL_AUDIO_DRIVER_OSS 1 - -#define SDL_INPUT_LINUXEV 1 -#define SDL_INPUT_TSLIB 1 -#define SDL_JOYSTICK_LINUX 1 -#define SDL_HAPTIC_LINUX 1 - -#define SDL_LOADSO_DLOPEN 1 - -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1 - -#define SDL_TIMER_UNIX 1 - -#define SDL_VIDEO_DRIVER_DUMMY 1 -#define SDL_VIDEO_DRIVER_PANDORA 1 -#define SDL_VIDEO_RENDER_OGL_ES 1 -#define SDL_VIDEO_OPENGL_ES 1 - -#endif /* _SDL_config_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_copying.h b/src/helper/android/SDL1.3/include/SDL_copying.h deleted file mode 100644 index aee290dbe..000000000 --- a/src/helper/android/SDL1.3/include/SDL_copying.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ diff --git a/src/helper/android/SDL1.3/include/SDL_cpuinfo.h b/src/helper/android/SDL1.3/include/SDL_cpuinfo.h deleted file mode 100644 index 54e97b900..000000000 --- a/src/helper/android/SDL1.3/include/SDL_cpuinfo.h +++ /dev/null @@ -1,151 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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(_WIN32_WCE) -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_cpuinfo_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_endian.h b/src/helper/android/SDL1.3/include/SDL_endian.h deleted file mode 100644 index 4a97aedbd..000000000 --- a/src/helper/android/SDL1.3/include/SDL_endian.h +++ /dev/null @@ -1,258 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \file SDL_endian.h - * - * Uses inline functions for compilers that support them, and static - * functions for those that do not. Because these functions become - * static for compilers that do not support inline functions, this - * header should only be included in files that actually use them. - */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) -static __inline__ Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -static __inline__ Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -static __inline__ Uint16 -SDL_Swap16(Uint16 x) -{ - Uint16 result; - - __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); - return result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -static __inline__ Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -static __inline__ Uint16 -SDL_Swap16(Uint16 x) -{ - return SDL_static_cast(Uint16, ((x << 8) | (x >> 8))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -static __inline__ Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswap %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -static __inline__ Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswapl %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -static __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__) -static __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 -static __inline__ Uint32 -SDL_Swap32(Uint32 x) -{ - return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) | - ((x >> 8) & 0x0000FF00) | (x >> 24))); -} -#endif - -#ifdef SDL_HAS_64BIT_TYPE -#if defined(__GNUC__) && defined(__i386__) -static __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__) -static __inline__ Uint64 -SDL_Swap64(Uint64 x) -{ - __asm__("bswapq %0": "=r"(x):"0"(x)); - return x; -} -#else -static __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 -#else -/** - * This is mainly to keep compilers from complaining in SDL code. - * If there is no real 64-bit datatype, then compilers will complain about - * the fake 64-bit datatype that SDL provides when it compiles user code. - */ -#define SDL_Swap64(X) (X) -#endif /* SDL_HAS_64BIT_TYPE */ - - -static __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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_endian_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_error.h b/src/helper/android/SDL1.3/include/SDL_error.h deleted file mode 100644 index d589b37a0..000000000 --- a/src/helper/android/SDL1.3/include/SDL_error.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/* Public functions */ -extern DECLSPEC void 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) -typedef enum -{ - SDL_ENOMEM, - SDL_EFREAD, - SDL_EFWRITE, - SDL_EFSEEK, - SDL_UNSUPPORTED, - SDL_LASTERROR -} SDL_errorcode; -extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code); -/*@}*//*Internal error functions*/ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_error_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_events.h b/src/helper/android/SDL1.3/include/SDL_events.h deleted file mode 100644 index 640cb6d0b..000000000 --- a/src/helper/android/SDL1.3/include/SDL_events.h +++ /dev/null @@ -1,640 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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_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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 */ - - /* 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 */ - - /* Tablet or multiple mice input device events */ - SDL_INPUTMOTION = 0x500, /**< Input moved */ - SDL_INPUTBUTTONDOWN, /**< Input button pressed */ - SDL_INPUTBUTTONUP, /**< Input button released */ - SDL_INPUTWHEEL, /**< Input wheel motion */ - SDL_INPUTPROXIMITYIN, /**< Input pen entered proximity */ - SDL_INPUTPROXIMITYOUT, /**< Input pen left proximity */ - - /* 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 */ - - /* Touch events */ - SDL_FINGERDOWN = 0x700, - SDL_FINGERUP, - SDL_FINGERMOTION, - SDL_TOUCHBUTTONDOWN, - SDL_TOUCHBUTTONUP, - - /* Gesture events */ - SDL_DOLLARGESTURE = 0x800, - SDL_DOLLARRECORD, - SDL_MULTIGESTURE, - - /* Clipboard events */ - - SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */ - - /* Obsolete events */ - SDL_EVENT_COMPAT1 = 0x7000, /**< SDL 1.2 events for compatibility */ - SDL_EVENT_COMPAT2, - SDL_EVENT_COMPAT3, - - - /** 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 Window state change event data (event.window.*) - */ -typedef struct SDL_WindowEvent -{ - Uint32 type; /**< ::SDL_WINDOWEVENT */ - Uint32 windowID; /**< The associated window */ - Uint8 event; /**< ::SDL_WindowEventID */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - int data1; /**< event dependent data */ - int 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 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 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; /**< The editing text */ - int start; /**< The start cursor of selected editing text */ - int 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 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 windowID; /**< The window with mouse focus, if any */ - Uint8 state; /**< The current button state */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - int x; /**< X coordinate, relative to window */ - int y; /**< Y coordinate, relative to window */ - int xrel; /**< The relative motion in the X direction */ - int 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 windowID; /**< The window with mouse focus, if any */ - Uint8 button; /**< The mouse button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; - int x; /**< X coordinate, relative to window */ - int y; /**< Y coordinate, relative to window */ -} SDL_MouseButtonEvent; - -/** - * \brief Mouse wheel event structure (event.wheel.*) - */ -typedef struct SDL_MouseWheelEvent -{ - Uint32 type; /**< ::SDL_MOUSEWHEEL */ - Uint32 windowID; /**< The window with mouse focus, if any */ - int x; /**< The amount scrolled horizontally */ - int y; /**< The amount scrolled vertically */ -} SDL_MouseWheelEvent; - -/** - * \brief Joystick axis motion event structure (event.jaxis.*) - */ -typedef struct SDL_JoyAxisEvent -{ - Uint32 type; /**< ::SDL_JOYAXISMOTION */ - Uint8 which; /**< The joystick device index */ - Uint8 axis; /**< The joystick axis index */ - Uint8 padding1; - Uint8 padding2; - int value; /**< The axis value (range: -32768 to 32767) */ -} SDL_JoyAxisEvent; - -/** - * \brief Joystick trackball motion event structure (event.jball.*) - */ -typedef struct SDL_JoyBallEvent -{ - Uint32 type; /**< ::SDL_JOYBALLMOTION */ - Uint8 which; /**< The joystick device index */ - Uint8 ball; /**< The joystick trackball index */ - Uint8 padding1; - Uint8 padding2; - int xrel; /**< The relative motion in the X direction */ - int 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 */ - Uint8 which; /**< The joystick device index */ - 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; -} SDL_JoyHatEvent; - -/** - * \brief Joystick button event structure (event.jbutton.*) - */ -typedef struct SDL_JoyButtonEvent -{ - Uint32 type; /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */ - Uint8 which; /**< The joystick device index */ - Uint8 button; /**< The joystick button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; -} SDL_JoyButtonEvent; - - -/** - * \brief Touch finger motion/finger event structure (event.tmotion.*) - */ -typedef struct SDL_TouchFingerEvent -{ - Uint32 type; /**< ::SDL_FINGERMOTION OR - SDL_FINGERDOWN OR SDL_FINGERUP*/ - Uint32 windowID; /**< The window with mouse focus, if any */ - SDL_TouchID touchId; /**< The touch device id */ - SDL_FingerID fingerId; - Uint8 state; /**< The current button state */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Uint16 x; - Uint16 y; - Sint16 dx; - Sint16 dy; - Uint16 pressure; -} SDL_TouchFingerEvent; - - -/** - * \brief Touch finger motion/finger event structure (event.tmotion.*) - */ -typedef struct SDL_TouchButtonEvent -{ - Uint32 type; /**< ::SDL_TOUCHBUTTONUP OR SDL_TOUCHBUTTONDOWN */ - Uint32 windowID; /**< The window with mouse focus, if any */ - SDL_TouchID touchId; /**< The touch device index */ - Uint8 state; /**< The current button state */ - Uint8 button; /**< The button changing state */ - Uint8 padding1; - Uint8 padding2; -} SDL_TouchButtonEvent; - - -/** - * \brief Multiple Finger Gesture Event (event.mgesture.*) - */ -typedef struct SDL_MultiGestureEvent -{ - Uint32 type; /**< ::SDL_MULTIGESTURE */ - Uint32 windowID; /**< The window with mouse focus, if any */ - SDL_TouchID touchId; /**< The touch device index */ - float dTheta; - float dDist; - float x; //currently 0...1. Change to screen coords? - float y; - Uint16 numFingers; - Uint16 padding; -} SDL_MultiGestureEvent; - -/* (event.dgesture.*) */ -typedef struct SDL_DollarGestureEvent -{ - Uint32 type; /**< ::SDL_DOLLARGESTURE */ - Uint32 windowID; /**< The window with mouse focus, if any */ - SDL_TouchID touchId; /**< The touch device index */ - SDL_GestureID gestureId; - Uint32 numFingers; - float error; - /* - //TODO: Enable to give location? - float x; //currently 0...1. Change to screen coords? - float y; - */ -} SDL_DollarGestureEvent; - - -/** - * \brief The "quit requested" event - */ -typedef struct SDL_QuitEvent -{ - Uint32 type; /**< ::SDL_QUIT */ -} SDL_QuitEvent; - - -/** - * \brief A user-defined event type (event.user.*) - */ -typedef struct SDL_UserEvent -{ - Uint32 type; /**< ::SDL_USEREVENT through ::SDL_NUMEVENTS-1 */ - Uint32 windowID; /**< The associated window if any */ - int 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.*) - * - * \note If you want to use this event, you should include SDL_syswm.h. - */ -typedef struct SDL_SysWMEvent -{ - Uint32 type; /**< ::SDL_SYSWMEVENT */ - SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ -} SDL_SysWMEvent; - -#ifndef SDL_NO_COMPAT -/** - * \addtogroup Compatibility - */ -/*@{*/ - -/** - * \name Typedefs for backwards compatibility - */ -/*@{*/ -typedef struct SDL_ActiveEvent -{ - Uint32 type; - Uint8 gain; - Uint8 state; -} SDL_ActiveEvent; - -typedef struct SDL_ResizeEvent -{ - Uint32 type; - int w; - int h; -} SDL_ResizeEvent; -/*@}*/ - -/*@}*//*Compatibility*/ -#endif - -/** - * \brief General event structure - */ -typedef union SDL_Event -{ - Uint32 type; /**< Event type, shared with all events */ - 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_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_TouchButtonEvent tbutton; /**< Touch button event data */ - SDL_MultiGestureEvent mgesture; /**< Multi Finger Gesture data */ - SDL_DollarGestureEvent dgesture; /**< Multi Finger Gesture data */ - - /** Temporarily here for backwards compatibility */ - /*@{*/ -#ifndef SDL_NO_COMPAT - SDL_ActiveEvent active; - SDL_ResizeEvent resize; -#endif - /*@}*/ -} 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. - */ -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 protypted 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_events_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_gesture.h b/src/helper/android/SDL1.3/include/SDL_gesture.h deleted file mode 100644 index 7fcfe7180..000000000 --- a/src/helper/android/SDL1.3/include/SDL_gesture.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 *src); - -/** - * \brief Save a currently loaded Dollar Gesture template - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *src); - - -/** - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_gesture_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_haptic.h b/src/helper/android/SDL1.3/include/SDL_haptic.h deleted file mode 100644 index 2694f0708..000000000 --- a/src/helper/android/SDL1.3/include/SDL_haptic.h +++ /dev/null @@ -1,1201 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 2008 Edgar Simo - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { - /* *INDENT-ON* */ -#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 Square wave effect supported. - * - * Periodic haptic effect that simulates square waves. - * - * \sa SDL_HapticPeriodic - */ -#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_SQUARE - * - ::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 cyle meaning that giving the phase a value - * of 9000 will displace it 25% of it's period. Here are sample values: - * - 0: No phase displacement. - * - 9000: Displaced 25% of it's period. - * - 18000: Displaced 50% of it's period. - * - 27000: Displaced 75% of it's period. - * - 36000: Displaced 100% of it's period, same as 0, but 0 is preffered. - * - * 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_SQUARE - * \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_SQUARE, - ::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 - * they 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 the ::SDL_HAPTIC_CUSTOM effect. - * - * A custom force feedback effect is much like a periodic effect, where the - * application can define it's 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 - * they 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_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_HapticCustom custom; /**< Custom effect. */ -} SDL_HapticEffect; - - -/* Function prototypes */ -/** - * \brief Count the number of joysticks 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 it's 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, it's 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 - * aproximation. 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 completness. - * - * \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_HapticQueryEffects(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 The id of the effect 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 it's assosciated 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 it's assosciated 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 it's status. - * \return 0 if it isn't playing, ::SDL_HAPTIC_PLAYING 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 maxmimum 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 miliseconds. - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_haptic_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_hints.h b/src/helper/android/SDL1.3/include/SDL_hints.h deleted file mode 100644 index 8f2288637..000000000 --- a/src/helper/android/SDL1.3/include/SDL_hints.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - SDL - Simple DihintsMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL 1.2 screen surface. - * - * SDL can try to accelerate the SDL 1.2 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 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" - Anisotropic filtering (supported by Direct3D) - * - * 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 1.2 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 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 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_hints_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_input.h b/src/helper/android/SDL1.3/include/SDL_input.h deleted file mode 100644 index 9fa339720..000000000 --- a/src/helper/android/SDL1.3/include/SDL_input.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_input.h - * - * Include file for lowlevel SDL input device handling. - * - * This talks about individual devices, and not the system cursor. If you - * just want to know when the user moves the pointer somewhere in your - * window, this is NOT the API you want. This one handles things like - * multi-touch, drawing tablets, and multiple, separate mice. - * - * The other API is in SDL_mouse.h - */ - -#ifndef _SDL_input_h -#define _SDL_input_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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - - -/* Function prototypes */ - -/* !!! FIXME: real documentation - * - Redetect devices - * - This invalidates all existing device information from previous queries! - * - There is an implicit (re)detect upon SDL_Init(). - */ -extern DECLSPEC int SDLCALL SDL_RedetectInputDevices(void); - -/** - * \brief Get the number of mouse input devices available. - */ -extern DECLSPEC int SDLCALL SDL_GetNumInputDevices(void); - -/** - * \brief Gets the name of a device with the given index. - * - * \param index is the index of the device, whose name is to be returned. - * - * \return the name of the device with the specified index - */ -extern DECLSPEC const char *SDLCALL SDL_GetInputDeviceName(int index); - - -extern DECLSPEC int SDLCALL SDL_IsDeviceDisconnected(int index); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_joystick.h b/src/helper/android/SDL1.3/include/SDL_joystick.h deleted file mode 100644 index b0af03dc5..000000000 --- a/src/helper/android/SDL1.3/include/SDL_joystick.h +++ /dev/null @@ -1,209 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_joystick.h - * - * Include file for SDL joystick event handling - */ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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. - */ - -/* The joystick structure used to identify an SDL joystick */ -struct _SDL_Joystick; -typedef struct _SDL_Joystick SDL_Joystick; - - -/* Function prototypes */ -/** - * Count the number of joysticks attached to the system - */ -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_JoystickName(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); - -/** - * Returns 1 if the joystick has been opened, or 0 if it has not. - */ -extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index); - -/** - * Get the device index of an opened joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickIndex(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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_joystick_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_keyboard.h b/src/helper/android/SDL1.3/include/SDL_keyboard.h deleted file mode 100644 index abcd5ed63..000000000 --- a/src/helper/android/SDL1.3/include/SDL_keyboard.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \brief The SDL keysym structure, used in key events. - */ -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 unicode; /**< \deprecated use SDL_TextInputEvent instead */ -} 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 - * Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode - */ -extern DECLSPEC 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 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 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 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 Start accepting Unicode text input events. - * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - */ -extern DECLSPEC void SDLCALL SDL_StartTextInput(void); - -/** - * \brief Stop receiving any text input events. - * - * \sa SDL_StartTextInput() - */ -extern DECLSPEC void SDLCALL SDL_StopTextInput(void); - -/** - * \brief Set the rectangle used to type Unicode text inputs. - * - * \sa SDL_StartTextInput() - */ -extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_keyboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_keycode.h b/src/helper/android/SDL1.3/include/SDL_keycode.h deleted file mode 100644 index c2927a677..000000000 --- a/src/helper/android/SDL1.3/include/SDL_keycode.h +++ /dev/null @@ -1,342 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 --git a/src/helper/android/SDL1.3/include/SDL_loadso.h b/src/helper/android/SDL1.3/include/SDL_loadso.h deleted file mode 100644 index 5749363e5..000000000 --- a/src/helper/android/SDL1.3/include/SDL_loadso.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_loadso_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_log.h b/src/helper/android/SDL1.3/include/SDL_log.h deleted file mode 100644 index 615258de7..000000000 --- a/src/helper/android/SDL1.3/include/SDL_log.h +++ /dev/null @@ -1,212 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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, - * and all other categories are enabled at the CRITICAL level. - */ -enum -{ - SDL_LOG_CATEGORY_APPLICATION, - SDL_LOG_CATEGORY_ERROR, - SDL_LOG_CATEGORY_SYSTEM, - SDL_LOG_CATEGORY_AUDIO, - SDL_LOG_CATEGORY_VIDEO, - SDL_LOG_CATEGORY_RENDER, - SDL_LOG_CATEGORY_INPUT, - - /* 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 Set 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_log_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_main.h b/src/helper/android/SDL1.3/include/SDL_main.h deleted file mode 100644 index 326ea6d32..000000000 --- a/src/helper/android/SDL1.3/include/SDL_main.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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. - */ - -#if defined(__WIN32__) || defined(__IPHONEOS__) || defined(__ANDROID__) -#ifndef SDL_MAIN_HANDLED -#define SDL_MAIN_NEEDED -#endif -#endif - -#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 - */ - -#ifdef SDL_MAIN_NEEDED -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -#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 __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_main_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_mouse.h b/src/helper/android/SDL1.3/include/SDL_mouse.h deleted file mode 100644 index 9edfbd53d..000000000 --- a/src/helper/android/SDL1.3/include/SDL_mouse.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_mouse.h - * - * Include file for SDL mouse event handling. - * - * Please note that this ONLY discusses "mice" with the notion of the - * desktop GUI. You (usually) have one system cursor, and the OS hides - * the hardware details from you. If you plug in 10 mice, all ten move that - * one cursor. For many applications and games, this is perfect, and this - * API has served hundreds of SDL programs well since its birth. - * - * It's not the whole picture, though. If you want more lowlevel control, - * SDL offers a different API, that gives you visibility into each input - * device, multi-touch interfaces, etc. - * - * Those two APIs are incompatible, and you usually should not use both - * at the same time. But for legacy purposes, this API refers to a "mouse" - * when it actually means the system pointer and not a physical mouse. - * - * The other API is in SDL_input.h - */ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -typedef struct SDL_Cursor SDL_Cursor; /* Implementation dependent */ - - -/* 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 Uint8 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 Uint8 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 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 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_mutex.h b/src/helper/android/SDL1.3/include/SDL_mutex.h deleted file mode 100644 index 2c7540e46..000000000 --- a/src/helper/android/SDL1.3/include/SDL_mutex.h +++ /dev/null @@ -1,249 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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_mutex.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_LockMutex(m) SDL_mutexP(m) -extern DECLSPEC int SDLCALL SDL_mutexP(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_UnlockMutex(m) SDL_mutexV(m) -extern DECLSPEC int SDLCALL SDL_mutexV(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_sem.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_cond.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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_mutex_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_opengl.h b/src/helper/android/SDL1.3/include/SDL_opengl.h deleted file mode 100644 index 67ef5e2b5..000000000 --- a/src/helper/android/SDL1.3/include/SDL_opengl.h +++ /dev/null @@ -1,11110 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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" - -#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) -/* *INDENT-OFF* */ -#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 */ -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for program/shader text and shader object handles */ -typedef char GLcharARB; -typedef unsigned int GLhandleARB; -#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 -/* *INDENT-ON* */ -#endif /* NO_SDL_GLEXT */ - -#endif /* _SDL_opengl_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_opengles.h b/src/helper/android/SDL1.3/include/SDL_opengles.h deleted file mode 100644 index c0c2a3de6..000000000 --- a/src/helper/android/SDL1.3/include/SDL_opengles.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 --git a/src/helper/android/SDL1.3/include/SDL_opengles2.h b/src/helper/android/SDL1.3/include/SDL_opengles2.h deleted file mode 100644 index 1d0785967..000000000 --- a/src/helper/android/SDL1.3/include/SDL_opengles2.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 2.0 API headers. - */ - -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif diff --git a/src/helper/android/SDL1.3/include/SDL_pixels.h b/src/helper/android/SDL1.3/include/SDL_pixels.h deleted file mode 100644 index 1efa7d27c..000000000 --- a/src/helper/android/SDL1.3/include/SDL_pixels.h +++ /dev/null @@ -1,424 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_pixels.h - * - * Header for the enumerated pixel format definitions. - */ - -#ifndef _SDL_pixels_h -#define _SDL_pixels_h - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 << 31) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \ - ((bits) << 8) | ((bytes) << 0)) - -#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))) - -#define SDL_ISPIXELFORMAT_FOURCC(format) \ - ((format) && !((format) & 0x80000000)) - -/* 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_BGR888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, - 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 unused; -} 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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_pixels_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_platform.h b/src/helper/android/SDL1.3/include/SDL_platform.h deleted file mode 100644 index f1d6dda2e..000000000 --- a/src/helper/android/SDL1.3/include/SDL_platform.h +++ /dev/null @@ -1,161 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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(__BEOS__) -#undef __BEOS__ -#define __BEOS__ 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) -#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" -#ifndef MAC_OS_X_VERSION_10_4 -#define MAC_OS_X_VERSION_10_4 1040 -#endif -#ifndef MAC_OS_X_VERSION_10_5 -#define MAC_OS_X_VERSION_10_5 1050 -#endif -#ifndef MAC_OS_X_VERSION_10_6 -#define MAC_OS_X_VERSION_10_6 1060 -#endif -#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 -#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) -#undef __WIN32__ -#define __WIN32__ 1 -#endif - -#if defined(__NDS__) -#undef __NINTENDODS__ -#define __NINTENDODS__ 1 -#endif - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_platform_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_power.h b/src/helper/android/SDL1.3/include/SDL_power.h deleted file mode 100644 index d19518e96..000000000 --- a/src/helper/android/SDL1.3/include/SDL_power.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_power_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_quit.h b/src/helper/android/SDL1.3/include/SDL_quit.h deleted file mode 100644 index 6f6d662e0..000000000 --- a/src/helper/android/SDL1.3/include/SDL_quit.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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_QUITMASK)) - -#endif /* _SDL_quit_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_rect.h b/src/helper/android/SDL1.3/include/SDL_rect.h deleted file mode 100644 index 17e1f8f41..000000000 --- a/src/helper/android/SDL1.3/include/SDL_rect.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \brief The structure that defines a point - * - * \sa SDL_EnclosePoints - */ -typedef struct -{ - 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. - */ -#define SDL_RectEmpty(X) (((X)->w <= 0) || ((X)->h <= 0)) - -/** - * \brief Returns true if the two rectangles are equal. - */ -#define SDL_RectEquals(A, B) (((A)->x == (B)->x) && ((A)->y == (B)->y) && \ - ((A)->w == (B)->w) && ((A)->h == (B)->h)) - -/** - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_rect_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_render.h b/src/helper/android/SDL1.3/include/SDL_render.h deleted file mode 100644 index 4ae23a17f..000000000 --- a/src/helper/android/SDL1.3/include/SDL_render.h +++ /dev/null @@ -1,611 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 rotation and particle effects and - * in that case you should use SDL's OpenGL/Direct3D support or one - * of the many good 3D engines. - */ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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_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; - -/** - * \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 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 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 information about a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, - SDL_RendererInfo * info); - -/** - * \brief Create a texture for a rendering context. - * - * \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 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 Lock a portion of the texture for 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 Set the drawing area for rendering on the current target. - * - * \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. - * - * \note When the window is resized, the current viewport is automatically - * centered within the new window size. - */ -extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the drawing area for the current target. - */ -extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the color used for drawing operations (Fill and Line). - * - * \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 SDL_SetRenderDrawColor(SDL_Renderer * renderer, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the color used for drawing operations (Fill and Line). - * - * \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 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 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 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. - */ -extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); - -/** - * \brief Draw a point on the current rendering target. - * - * \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 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 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 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 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 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 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 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 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 Read pixels from the current rendering target. - * - * \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); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_render_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_rwops.h b/src/helper/android/SDL1.3/include/SDL_rwops.h deleted file mode 100644 index 823c7cbff..000000000 --- a/src/helper/android/SDL1.3/include/SDL_rwops.h +++ /dev/null @@ -1,206 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * This is the read/write operation structure -- very basic. - */ -typedef struct SDL_RWops -{ - /** - * 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. - */ - long (SDLCALL * seek) (struct SDL_RWops * context, long 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 - { -#ifdef __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; - } 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_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 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_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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_rwops_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_scancode.h b/src/helper/android/SDL1.3/include/SDL_scancode.h deleted file mode 100644 index ce6ad7e71..000000000 --- a/src/helper/android/SDL1.3/include/SDL_scancode.h +++ /dev/null @@ -1,399 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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_12.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, - - /*@}*//*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 --git a/src/helper/android/SDL1.3/include/SDL_shape.h b/src/helper/android/SDL1.3/include/SDL_shape.h deleted file mode 100644 index 2af49defa..000000000 --- a/src/helper/android/SDL1.3/include/SDL_shape.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 2010 Eli Gottlieb - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Eli Gottlieb - eligottlieb@gmail.com -*/ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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_SHOWN, ::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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_shape_h */ diff --git a/src/helper/android/SDL1.3/include/SDL_stdinc.h b/src/helper/android/SDL1.3/include/SDL_stdinc.h deleted file mode 100644 index 4d896bac5..000000000 --- a/src/helper/android/SDL1.3/include/SDL_stdinc.h +++ /dev/null @@ -1,779 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -# 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) -#else -#define SDL_reinterpret_cast(type, expression) ((type)(expression)) -#define SDL_static_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; - -#ifdef SDL_HAS_64BIT_TYPE -/** - * \brief A signed 64-bit integer type. - * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Sint32! - */ -typedef int64_t Sint64; -/** - * \brief An unsigned 64-bit integer type. - * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Uint32! - */ -typedef uint64_t Uint64; -#else -/* This is really just a hack to prevent the compiler from complaining */ -typedef Sint32 Sint64; -typedef Uint32 Uint64; -#endif - -/*@}*//*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); -#ifdef SDL_HAS_64BIT_TYPE -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); -#endif -#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). -*/ -/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */ -#ifdef __MWERKS__ -#pragma enumsalwaysint on -#endif - -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__NINTENDODS__) && !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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -#ifdef HAVE_MALLOC -#define SDL_malloc malloc -#else -extern DECLSPEC void *SDLCALL SDL_malloc(size_t size); -#endif - -#ifdef HAVE_CALLOC -#define SDL_calloc calloc -#else -extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size); -#endif - -#ifdef HAVE_REALLOC -#define SDL_realloc realloc -#else -extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size); -#endif - -#ifdef HAVE_FREE -#define SDL_free free -#else -extern DECLSPEC void SDLCALL SDL_free(void *mem); -#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 - -#ifdef HAVE_GETENV -#define SDL_getenv getenv -#else -extern DECLSPEC char *SDLCALL SDL_getenv(const char *name); -#endif - -/* SDL_putenv() has moved to SDL_compat. */ -#ifdef HAVE_SETENV -#define SDL_setenv setenv -#else -extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, - int overwrite); -#endif - -#ifdef HAVE_QSORT -#define SDL_qsort qsort -#else -extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, - int (*compare) (const void *, - const void *)); -#endif - -#ifdef HAVE_ABS -#define SDL_abs abs -#else -#define SDL_abs(X) ((X) < 0 ? -(X) : (X)) -#endif - -#define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) -#define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) - -#ifdef HAVE_CTYPE_H -#define SDL_isdigit(X) isdigit(X) -#define SDL_isspace(X) isspace(X) -#define SDL_toupper(X) toupper(X) -#define SDL_tolower(X) tolower(X) -#else -#define SDL_isdigit(X) (((X) >= '0') && ((X) <= '9')) -#define SDL_isspace(X) (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n')) -#define SDL_toupper(X) (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X)) -#define SDL_tolower(X) (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X)) -#endif - -#ifdef HAVE_MEMSET -#define SDL_memset memset -#else -extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len); -#endif -#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) -#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) - -#if defined(__GNUC__) && defined(i386) -#define SDL_memset4(dst, val, len) \ -do { \ - 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, len)) \ - : "memory" ); \ -} while(0) -#endif -#ifndef SDL_memset4 -#define SDL_memset4(dst, val, len) \ -do { \ - unsigned _count = (len); \ - unsigned _n = (_count + 3) / 4; \ - Uint32 *_p = SDL_static_cast(Uint32 *, dst); \ - Uint32 _val = (val); \ - if (len == 0) break; \ - switch (_count % 4) { \ - case 0: do { *_p++ = _val; \ - case 3: *_p++ = _val; \ - case 2: *_p++ = _val; \ - case 1: *_p++ = _val; \ - } while ( --_n ); \ - } \ -} while(0) -#endif - -/* We can count on memcpy existing on Mac OS X and being well-tuned. */ -#if defined(__MACOSX__) -#define SDL_memcpy memcpy -#elif defined(__GNUC__) && defined(i386) -#define SDL_memcpy(dst, src, len) \ -do { \ - int u0, u1, u2; \ - __asm__ __volatile__ ( \ - "cld\n\t" \ - "rep ; movsl\n\t" \ - "testb $2,%b4\n\t" \ - "je 1f\n\t" \ - "movsw\n" \ - "1:\ttestb $1,%b4\n\t" \ - "je 2f\n\t" \ - "movsb\n" \ - "2:" \ - : "=&c" (u0), "=&D" (u1), "=&S" (u2) \ - : "0" (SDL_static_cast(unsigned, len)/4), "q" (len), "1" (dst),"2" (src) \ - : "memory" ); \ -} while(0) -#endif -#ifndef SDL_memcpy -#ifdef HAVE_MEMCPY -#define SDL_memcpy memcpy -#elif defined(HAVE_BCOPY) -#define SDL_memcpy(d, s, n) bcopy((s), (d), (n)) -#else -extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, - size_t len); -#endif -#endif - -/* We can count on memcpy existing on Mac OS X and being well-tuned. */ -#if defined(__MACOSX__) -#define SDL_memcpy4(dst, src, len) SDL_memcpy((dst), (src), (len) << 2) -#elif defined(__GNUC__) && defined(i386) -#define SDL_memcpy4(dst, src, len) \ -do { \ - int ecx, edi, esi; \ - __asm__ __volatile__ ( \ - "cld\n\t" \ - "rep ; movsl" \ - : "=&c" (ecx), "=&D" (edi), "=&S" (esi) \ - : "0" (SDL_static_cast(unsigned, len)), "1" (dst), "2" (src) \ - : "memory" ); \ -} while(0) -#endif -#ifndef SDL_memcpy4 -#define SDL_memcpy4(dst, src, len) SDL_memcpy((dst), (src), (len) << 2) -#endif - -#ifdef HAVE_MEMMOVE -#define SDL_memmove memmove -#else -extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, - size_t len); -#endif - -#ifdef HAVE_MEMCMP -#define SDL_memcmp memcmp -#else -extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, - size_t len); -#endif - -#ifdef HAVE_STRLEN -#define SDL_strlen strlen -#else -extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string); -#endif - -#ifdef HAVE_WCSLEN -#define SDL_wcslen wcslen -#else -#if !defined(wchar_t) && defined(__NINTENDODS__) -#define wchar_t short /* TODO: figure out why libnds doesn't have this */ -#endif -extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t * string); -#endif - -#ifdef HAVE_WCSLCPY -#define SDL_wcslcpy wcslcpy -#else -extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen); -#endif - -#ifdef HAVE_WCSLCAT -#define SDL_wcslcat wcslcat -#else -extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen); -#endif - - -#ifdef HAVE_STRLCPY -#define SDL_strlcpy strlcpy -#else -extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, - size_t maxlen); -#endif - -extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, - size_t dst_bytes); - -#ifdef HAVE_STRLCAT -#define SDL_strlcat strlcat -#else -extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, - size_t maxlen); -#endif - -#ifdef HAVE_STRDUP -#define SDL_strdup strdup -#else -extern DECLSPEC char *SDLCALL SDL_strdup(const char *string); -#endif - -#ifdef HAVE__STRREV -#define SDL_strrev _strrev -#else -extern DECLSPEC char *SDLCALL SDL_strrev(char *string); -#endif - -#ifdef HAVE__STRUPR -#define SDL_strupr _strupr -#else -extern DECLSPEC char *SDLCALL SDL_strupr(char *string); -#endif - -#ifdef HAVE__STRLWR -#define SDL_strlwr _strlwr -#else -extern DECLSPEC char *SDLCALL SDL_strlwr(char *string); -#endif - -#ifdef HAVE_STRCHR -#define SDL_strchr strchr -#elif defined(HAVE_INDEX) -#define SDL_strchr index -#else -extern DECLSPEC char *SDLCALL SDL_strchr(const char *string, int c); -#endif - -#ifdef HAVE_STRRCHR -#define SDL_strrchr strrchr -#elif defined(HAVE_RINDEX) -#define SDL_strrchr rindex -#else -extern DECLSPEC char *SDLCALL SDL_strrchr(const char *string, int c); -#endif - -#ifdef HAVE_STRSTR -#define SDL_strstr strstr -#else -extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, - const char *needle); -#endif - -#ifdef HAVE_ITOA -#define SDL_itoa itoa -#else -#define SDL_itoa(value, string, radix) SDL_ltoa((long)value, string, radix) -#endif - -#ifdef HAVE__LTOA -#define SDL_ltoa _ltoa -#else -extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *string, int radix); -#endif - -#ifdef HAVE__UITOA -#define SDL_uitoa _uitoa -#else -#define SDL_uitoa(value, string, radix) SDL_ultoa((long)value, string, radix) -#endif - -#ifdef HAVE__ULTOA -#define SDL_ultoa _ultoa -#else -extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *string, - int radix); -#endif - -#ifdef HAVE_STRTOL -#define SDL_strtol strtol -#else -extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp, - int base); -#endif - -#ifdef HAVE_STRTOUL -#define SDL_strtoul strtoul -#else -extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string, - char **endp, int base); -#endif - -#ifdef SDL_HAS_64BIT_TYPE - -#ifdef HAVE__I64TOA -#define SDL_lltoa _i64toa -#else -extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *string, - int radix); -#endif - -#ifdef HAVE__UI64TOA -#define SDL_ulltoa _ui64toa -#else -extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *string, - int radix); -#endif - -#ifdef HAVE_STRTOLL -#define SDL_strtoll strtoll -#else -extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp, - int base); -#endif - -#ifdef HAVE_STRTOULL -#define SDL_strtoull strtoull -#else -extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp, - int base); -#endif - -#endif /* SDL_HAS_64BIT_TYPE */ - -#ifdef HAVE_STRTOD -#define SDL_strtod strtod -#else -extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp); -#endif - -#ifdef HAVE_ATOI -#define SDL_atoi atoi -#else -#define SDL_atoi(X) SDL_strtol(X, NULL, 0) -#endif - -#ifdef HAVE_ATOF -#define SDL_atof atof -#else -#define SDL_atof(X) SDL_strtod(X, NULL) -#endif - -#ifdef HAVE_STRCMP -#define SDL_strcmp strcmp -#else -extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2); -#endif - -#ifdef HAVE_STRNCMP -#define SDL_strncmp strncmp -#else -extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, - size_t maxlen); -#endif - -#ifdef HAVE_STRCASECMP -#define SDL_strcasecmp strcasecmp -#elif defined(HAVE__STRICMP) -#define SDL_strcasecmp _stricmp -#else -extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, - const char *str2); -#endif - -#ifdef HAVE_STRNCASECMP -#define SDL_strncasecmp strncasecmp -#elif defined(HAVE__STRNICMP) -#define SDL_strncasecmp _strnicmp -#else -extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, - const char *str2, size_t maxlen); -#endif - -#ifdef HAVE_SSCANF -#define SDL_sscanf sscanf -#else -extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, - ...); -#endif - -#ifdef HAVE_SNPRINTF -#define SDL_snprintf snprintf -#else -extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, - const char *fmt, ...); -#endif - -#ifdef HAVE_VSNPRINTF -#define SDL_vsnprintf vsnprintf -#else -extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, - const char *fmt, va_list ap); -#endif - -#ifndef HAVE_M_PI -#define M_PI 3.14159265358979323846264338327950288 /* pi */ -#endif - -#ifdef HAVE_ATAN -#define SDL_atan atan -#else -extern DECLSPEC double SDLCALL SDL_atan(double x); -#endif - -#ifdef HAVE_ATAN2 -#define SDL_atan2 atan2 -#else -extern DECLSPEC double SDLCALL SDL_atan2(double y, double x); -#endif - -#ifdef HAVE_CEIL -#define SDL_ceil ceil -#else -#define SDL_ceil(x) ((double)(int)((x)+0.5)) -#endif - -#ifdef HAVE_COPYSIGN -#define SDL_copysign copysign -#else -extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); -#endif - -#ifdef HAVE_COS -#define SDL_cos cos -#else -extern DECLSPEC double SDLCALL SDL_cos(double x); -#endif - -#ifdef HAVE_COSF -#define SDL_cosf cosf -#else -#define SDL_cosf(x) (float)SDL_cos((double)x) -#endif - -#ifdef HAVE_FABS -#define SDL_fabs fabs -#else -extern DECLSPEC double SDLCALL SDL_fabs(double x); -#endif - -#ifdef HAVE_FLOOR -#define SDL_floor floor -#else -extern DECLSPEC double SDLCALL SDL_floor(double x); -#endif - -#ifdef HAVE_LOG -#define SDL_log log -#else -extern DECLSPEC double SDLCALL SDL_log(double x); -#endif - -#ifdef HAVE_POW -#define SDL_pow pow -#else -extern DECLSPEC double SDLCALL SDL_pow(double x, double y); -#endif - -#ifdef HAVE_SCALBN -#define SDL_scalbn scalbn -#else -extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); -#endif - -#ifdef HAVE_SIN -#define SDL_sin sin -#else -extern DECLSPEC double SDLCALL SDL_sin(double x); -#endif - -#ifdef HAVE_SINF -#define SDL_sinf sinf -#else -#define SDL_sinf(x) (float)SDL_sin((double)x) -#endif - -#ifdef HAVE_SQRT -#define SDL_sqrt sqrt -#else -extern DECLSPEC double SDLCALL SDL_sqrt(double x); -#endif - -/* 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 - -#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -#define SDL_iconv_t iconv_t -#define SDL_iconv_open iconv_open -#define SDL_iconv_close iconv_close -#else -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); -#endif -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", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1) - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_stdinc_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_surface.h b/src/helper/android/SDL1.3/include/SDL_surface.h deleted file mode 100644 index 25f64d270..000000000 --- a/src/helper/android/SDL1.3/include/SDL_surface.h +++ /dev/null @@ -1,490 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - -/** - * \name Surface flags - * - * These are the currently supported flags for the ::SDL_surface. - * - * \internal - * Used internally (read-only). - */ -/*@{*/ -#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. - */ -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 - */ -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, 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 - */ -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 alpha and colorkey - * are defined as follows: - * \verbatim - RGBA->RGB: - SDL_SRCALPHA set: - alpha-blend (using alpha-channel). - SDL_SRCCOLORKEY ignored. - SDL_SRCALPHA not set: - copy RGB. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source colour key, ignoring alpha in the - comparison. - - RGB->RGBA: - SDL_SRCALPHA set: - alpha-blend (using the source per-surface alpha value); - set destination alpha to opaque. - SDL_SRCALPHA not set: - copy RGB, set destination alpha to source per-surface alpha value. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source colour key. - - RGBA->RGBA: - SDL_SRCALPHA set: - alpha-blend (using the source alpha channel) the RGB values; - leave destination alpha untouched. [Note: is this correct?] - SDL_SRCCOLORKEY ignored. - SDL_SRCALPHA not set: - copy all of RGBA to the destination. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source colour key, ignoring alpha in the - comparison. - - RGB->RGB: - SDL_SRCALPHA set: - alpha-blend (using the source per-surface alpha value). - SDL_SRCALPHA not set: - copy RGB. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source colour 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); - -/** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * different pixel formats. - * - * \note This function calls SDL_SoftStretch or SDL_LowerBlit. - */ -extern DECLSPEC int SDLCALL SDL_BlitScaled - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, const SDL_Rect * dstrect); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_surface_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_syswm.h b/src/helper/android/SDL1.3/include/SDL_syswm.h deleted file mode 100644 index b5e09aac7..000000000 --- a/src/helper/android/SDL1.3/include/SDL_syswm.h +++ /dev/null @@ -1,242 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 - -/* 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; -#endif -#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_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_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 - /* 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(&info) ) { ... } - * \endcode - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, - SDL_SysWMinfo * info); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_syswm_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_thread.h b/src/helper/android/SDL1.3/include/SDL_thread.h deleted file mode 100644 index 86e259e87..000000000 --- a/src/helper/android/SDL1.3/include/SDL_thread.h +++ /dev/null @@ -1,168 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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_mutex.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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; - -/* 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 -#ifndef _WIN32_WCE -#include /* This has _beginthread() and _endthread() defined! */ -#endif - -#ifdef __GNUC__ -typedef unsigned long (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, - unsigned - (__stdcall * - func) (void *), - void *arg, - unsigned, - unsigned - *threadID); -typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); -#else -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, - unsigned (__stdcall * - func) (void - *), - void *arg, unsigned, - unsigned *threadID); -typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); -#endif - -/** - * Create a thread. - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); - -#if defined(_WIN32_WCE) - -/** - * Create a thread. - */ -#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, NULL, NULL) - -#else - -/** - * Create a thread. - */ -#define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthreadex, _endthreadex) - -#endif -#else - -/** - * Create a thread. - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, void *data); - -#endif - -/** - * 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); - -/** - * Wait for a thread to finish. - * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. - */ -extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_thread_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_timer.h b/src/helper/android/SDL1.3/include/SDL_timer.h deleted file mode 100644 index 9b7ad837b..000000000 --- a/src/helper/android/SDL1.3/include/SDL_timer.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 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 t); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_timer_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_touch.h b/src/helper/android/SDL1.3/include/SDL_touch.h deleted file mode 100644 index 1465e60a4..000000000 --- a/src/helper/android/SDL1.3/include/SDL_touch.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - - -typedef Sint64 SDL_TouchID; -typedef Sint64 SDL_FingerID; - - -struct SDL_Finger { - SDL_FingerID id; - Uint16 x; - Uint16 y; - Uint16 pressure; - Uint16 xdelta; - Uint16 ydelta; - Uint16 last_x, last_y,last_pressure; /* the last reported coordinates */ - SDL_bool down; -}; - -typedef struct SDL_Touch SDL_Touch; -typedef struct SDL_Finger SDL_Finger; - - -struct SDL_Touch { - - /* Free the touch when it's time */ - void (*FreeTouch) (SDL_Touch * touch); - - /* data common for tablets */ - float pressure_max, pressure_min; - float x_max,x_min; - float y_max,y_min; - Uint16 xres,yres,pressureres; - float native_xres,native_yres,native_pressureres; - float tilt; /* for future use */ - float rotation; /* for future use */ - - /* Data common to all touch */ - SDL_TouchID id; - SDL_Window *focus; - - char *name; - Uint8 buttonstate; - SDL_bool relative_mode; - SDL_bool flush_motion; - - int num_fingers; - int max_fingers; - SDL_Finger** fingers; - - void *driverdata; -}; - - - -/* Function prototypes */ - -/** - * \brief Get the touch object at the given id. - * - * - */ - extern DECLSPEC SDL_Touch* SDLCALL SDL_GetTouch(SDL_TouchID id); - - - -/** - * \brief Get the finger object of the given touch, at the given id. - * - * - */ - extern - DECLSPEC SDL_Finger* SDLCALL SDL_GetFinger(SDL_Touch *touch, SDL_FingerID id); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_types.h b/src/helper/android/SDL1.3/include/SDL_types.h deleted file mode 100644 index 1b687907a..000000000 --- a/src/helper/android/SDL1.3/include/SDL_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \file SDL_types.h - * - * \deprecated - */ - -/* DEPRECATED */ -#include "SDL_stdinc.h" diff --git a/src/helper/android/SDL1.3/include/SDL_version.h b/src/helper/android/SDL1.3/include/SDL_version.h deleted file mode 100644 index 92b55e99f..000000000 --- a/src/helper/android/SDL1.3/include/SDL_version.h +++ /dev/null @@ -1,167 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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 1 -#define SDL_MINOR_VERSION 3 -#define SDL_PATCHLEVEL 0 - -/** - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_version_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/SDL_video.h b/src/helper/android/SDL1.3/include/SDL_video.h deleted file mode 100644 index ad318e0c8..000000000 --- a/src/helper/android/SDL1.3/include/SDL_video.h +++ /dev/null @@ -1,818 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#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_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_FOREIGN = 0x00000800 /**< window not created by SDL */ -} 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_GLattr; - - -/* 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 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 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_GetWindowDisplay(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 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_SHOWN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED. - * - * \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 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. - * - * \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. - * - * \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. - * - * \sa SDL_SetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, - int *h); - -/** - * \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, - SDL_bool fullscreen); - -/** - * \brief Get an SDL surface associated with the window. - * - * \return A surface in the optimal format for the window, or NULL on error. - * - * \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, - SDL_Rect * rects, - int numrects); - -/** - * \brief Set a window's input grab mode. - * - * \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 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_SetWindowGammaRamp() - */ -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 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 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 Set the swap interval for the current OpenGL context. - * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical 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 getting - * the swap interval is not supported. - * - * \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 -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/include/begin_code.h b/src/helper/android/SDL1.3/include/begin_code.h deleted file mode 100644 index 3d708771b..000000000 --- a/src/helper/android/SDL1.3/include/begin_code.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 - -/* Some compilers use a special export keyword */ -#ifndef DECLSPEC -# if defined(__BEOS__) || defined(__HAIKU__) -# if defined(__GNUC__) -# define DECLSPEC __declspec(dllexport) -# else -# define DECLSPEC __declspec(export) -# endif -# elif defined(__WIN32__) -# 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"))) -# else -# define DECLSPEC -# endif -# endif -#endif - -/* By default SDL uses the C calling convention */ -#ifndef SDLCALL -#if defined(__WIN32__) && !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 -#pragma pack(push,4) -#endif /* Compiler needs structure packing set */ - -/* Set up compiler-specific options for inlining functions */ -#ifndef SDL_INLINE_OKAY -#ifdef __GNUC__ -#define SDL_INLINE_OKAY -#else -/* Add any special compiler-specific cases here */ -#if defined(_MSC_VER) || defined(__BORLANDC__) || \ - defined(__DMC__) || defined(__SC__) || \ - defined(__WATCOMC__) || defined(__LCC__) || \ - defined(__DECC) -#ifndef __inline__ -#define __inline__ __inline -#endif -#define SDL_INLINE_OKAY -#else -#if !defined(__MRC__) && !defined(_SGI_SOURCE) -#ifndef __inline__ -#define __inline__ inline -#endif -#define SDL_INLINE_OKAY -#endif /* Not a funky compiler */ -#endif /* Visual C++ */ -#endif /* GNU C */ -#endif /* SDL_INLINE_OKAY */ - -/* If inlining isn't supported, remove "__inline__", turning static - inlined functions into static functions (resulting in code bloat - in all files which include the offending header files) -*/ -#ifndef SDL_INLINE_OKAY -#define __inline__ -#endif - -/* 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 --git a/src/helper/android/SDL1.3/include/close_code.h b/src/helper/android/SDL1.3/include/close_code.h deleted file mode 100644 index 9684fefce..000000000 --- a/src/helper/android/SDL1.3/include/close_code.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -/** - * \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 --git a/src/helper/android/SDL1.3/java/src/org/libsdl/app/SDLActivity.java b/src/helper/android/SDL1.3/java/src/org/libsdl/app/SDLActivity.java deleted file mode 100644 index a7f7cba5f..000000000 --- a/src/helper/android/SDL1.3/java/src/org/libsdl/app/SDLActivity.java +++ /dev/null @@ -1,504 +0,0 @@ -package org.libsdl.app; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; -import javax.microedition.khronos.egl.*; - -import android.app.*; -import android.content.*; -import android.view.*; -import android.os.*; -import android.util.Log; -import android.graphics.*; -import android.text.method.*; -import android.text.*; -import android.media.*; -import android.hardware.*; -import android.content.*; - -import java.lang.*; -import java.lang.Integer; - - -/** - SDL Activity -*/ -public class SDLActivity extends Activity { - - // Main components - private static SDLActivity mSingleton; - private static SDLSurface mSurface; - - // Audio - private static Thread mAudioThread; - private static AudioTrack mAudioTrack; - - public static int SCREEN_WIDTH = 569; - public static int SCREEN_HEIGHT = 320; - - // Load the .so - static { - System.loadLibrary("main"); - } - - // Setup - protected void onCreate(Bundle savedInstanceState) { - //Log.v("SDL", "onCreate()"); - super.onCreate(savedInstanceState); - - // So we can call stuff from static callbacks - mSingleton = this; - - // Set up the surface - mSurface = new SDLSurface(getApplication()); - setContentView(mSurface); - SurfaceHolder holder = mSurface.getHolder(); - holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); - - WindowManager w = getWindowManager(); - Display d = w.getDefaultDisplay(); - - SCREEN_WIDTH = d.getWidth(); - SCREEN_HEIGHT = d.getHeight(); - - Log.v("SDL", "Native screen resolution " + Integer.toString( SCREEN_WIDTH ) + "x" + Integer.toString( SCREEN_HEIGHT ) ); - } - - // Events - protected void onPause() { - //Log.v("SDL", "onPause()"); - super.onPause(); - } - - protected void onResume() { - //Log.v("SDL", "onResume()"); - super.onResume(); - } - - // Messages from the SDLMain thread - static int COMMAND_CHANGE_TITLE = 1; - - // Handler for the messages - Handler commandHandler = new Handler() { - public void handleMessage(Message msg) { - if (msg.arg1 == COMMAND_CHANGE_TITLE) { - setTitle((String)msg.obj); - } - } - }; - - // Send a message from the SDLMain thread - void sendCommand(int command, Object data) { - Message msg = commandHandler.obtainMessage(); - msg.arg1 = command; - msg.obj = data; - commandHandler.sendMessage(msg); - } - - // C functions we call - public static native void nativeInit(); - public static native void nativeQuit(); - public static native void onNativeResize(int x, int y, int format); - public static native void onNativeKeyDown(int keycode); - public static native void onNativeKeyUp(int keycode); - public static native void onNativeTouch(int action, float x, - float y, float p); - public static native void onNativeAccel(float x, float y, float z); - public static native void nativeRunAudioThread(); - - - // Java functions called from C - - public static boolean createGLContext(int majorVersion, int minorVersion) { - return mSurface.initEGL(majorVersion, minorVersion); - } - - public static void flipBuffers() { - mSurface.flipEGL(); - } - - public static void setActivityTitle(String title) { - // Called from SDLMain() thread and can't directly affect the view - mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title); - } - - // Audio - private static Object buf; - - public static Object audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) { - int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO; - int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT; - int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1); - - Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer"); - - // Let the user pick a larger buffer if they really want -- but ye - // gods they probably shouldn't, the minimums are horrifyingly high - // latency already - desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize); - - mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, - channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM); - - audioStartThread(); - - Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer"); - - if (is16Bit) { - buf = new short[desiredFrames * (isStereo ? 2 : 1)]; - } else { - buf = new byte[desiredFrames * (isStereo ? 2 : 1)]; - } - return buf; - } - - public static void audioStartThread() { - mAudioThread = new Thread(new Runnable() { - public void run() { - mAudioTrack.play(); - nativeRunAudioThread(); - } - }); - - // I'd take REALTIME if I could get it! - mAudioThread.setPriority(Thread.MAX_PRIORITY); - mAudioThread.start(); - } - - public static void audioWriteShortBuffer(short[] buffer) { - for (int i = 0; i < buffer.length; ) { - int result = mAudioTrack.write(buffer, i, buffer.length - i); - if (result > 0) { - i += result; - } else if (result == 0) { - try { - Thread.sleep(1); - } catch(InterruptedException e) { - // Nom nom - } - } else { - Log.w("SDL", "SDL audio: error return from write(short)"); - return; - } - } - } - - public static void audioWriteByteBuffer(byte[] buffer) { - for (int i = 0; i < buffer.length; ) { - int result = mAudioTrack.write(buffer, i, buffer.length - i); - if (result > 0) { - i += result; - } else if (result == 0) { - try { - Thread.sleep(1); - } catch(InterruptedException e) { - // Nom nom - } - } else { - Log.w("SDL", "SDL audio: error return from write(short)"); - return; - } - } - } - - public static void audioQuit() { - if (mAudioThread != null) { - try { - mAudioThread.join(); - } catch(Exception e) { - Log.v("SDL", "Problem stopping audio thread: " + e); - } - mAudioThread = null; - - //Log.v("SDL", "Finished waiting for audio thread"); - } - - if (mAudioTrack != null) { - mAudioTrack.stop(); - mAudioTrack = null; - } - } -} - -/** - Simple nativeInit() runnable -*/ -class SDLMain implements Runnable { - public void run() { - // Runs SDL_main() - SDLActivity.nativeInit(); - - //Log.v("SDL", "SDL thread terminated"); - } -} - - -/** - SDLSurface. This is what we draw on, so we need to know when it's created - in order to do anything useful. - - Because of this, that's where we set up the SDL thread -*/ -class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, - View.OnKeyListener, View.OnTouchListener, SensorEventListener { - - // This is what SDL runs in. It invokes SDL_main(), eventually - private Thread mSDLThread; - - // EGL private objects - private EGLContext mEGLContext; - private EGLSurface mEGLSurface; - private EGLDisplay mEGLDisplay; - - // Sensors - private static SensorManager mSensorManager; - - // Startup - public SDLSurface(Context context) { - super(context); - getHolder().addCallback(this); - - setFocusable(true); - setFocusableInTouchMode(true); - requestFocus(); - setOnKeyListener(this); - setOnTouchListener(this); - - mSensorManager = (SensorManager)context.getSystemService("sensor"); - } - - // Called when we have a valid drawing surface - public void surfaceCreated(SurfaceHolder holder) { - //Log.v("SDL", "surfaceCreated()"); - - enableSensor(Sensor.TYPE_ACCELEROMETER, true); - } - - // Called when we lose the surface - public void surfaceDestroyed(SurfaceHolder holder) { - //Log.v("SDL", "surfaceDestroyed()"); - - // Send a quit message to the application - SDLActivity.nativeQuit(); - - // Now wait for the SDL thread to quit - if (mSDLThread != null) { - try { - mSDLThread.join(); - } catch(Exception e) { - Log.v("SDL", "Problem stopping thread: " + e); - } - mSDLThread = null; - - //Log.v("SDL", "Finished waiting for SDL thread"); - } - - enableSensor(Sensor.TYPE_ACCELEROMETER, false); - } - - // Called when the surface is resized - public void surfaceChanged(SurfaceHolder holder, - int format, int width, int height) { - //Log.v("SDL", "surfaceChanged()"); - - int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default - switch (format) { - case PixelFormat.A_8: - Log.v("SDL", "pixel format A_8"); - break; - case PixelFormat.LA_88: - Log.v("SDL", "pixel format LA_88"); - break; - case PixelFormat.L_8: - Log.v("SDL", "pixel format L_8"); - break; - case PixelFormat.RGBA_4444: - Log.v("SDL", "pixel format RGBA_4444"); - sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444 - break; - case PixelFormat.RGBA_5551: - Log.v("SDL", "pixel format RGBA_5551"); - sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551 - break; - case PixelFormat.RGBA_8888: - Log.v("SDL", "pixel format RGBA_8888"); - sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888 - break; - case PixelFormat.RGBX_8888: - Log.v("SDL", "pixel format RGBX_8888"); - sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888 - break; - case PixelFormat.RGB_332: - Log.v("SDL", "pixel format RGB_332"); - sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332 - break; - case PixelFormat.RGB_565: - Log.v("SDL", "pixel format RGB_565"); - sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 - break; - case PixelFormat.RGB_888: - Log.v("SDL", "pixel format RGB_888"); - // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead? - sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888 - break; - default: - Log.v("SDL", "pixel format unknown " + format); - break; - } - - SDLActivity.onNativeResize(width, height, sdlFormat); - - // Now start up the C app thread - if (mSDLThread == null) { - mSDLThread = new Thread(new SDLMain(), "SDLThread"); - mSDLThread.start(); - } - } - - // unused - public void onDraw(Canvas canvas) {} - - - // EGL functions - public boolean initEGL(int majorVersion, int minorVersion) { - Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion); - - try { - EGL10 egl = (EGL10)EGLContext.getEGL(); - - EGLDisplay dpy = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY); - - int[] version = new int[2]; - egl.eglInitialize(dpy, version); - - int EGL_OPENGL_ES_BIT = 1; - int EGL_OPENGL_ES2_BIT = 4; - int renderableType = 0; - if (majorVersion == 2) { - renderableType = EGL_OPENGL_ES2_BIT; - } else if (majorVersion == 1) { - renderableType = EGL_OPENGL_ES_BIT; - } - int[] configSpec = { - //EGL10.EGL_DEPTH_SIZE, 16, - EGL10.EGL_RENDERABLE_TYPE, renderableType, - EGL10.EGL_NONE - }; - EGLConfig[] configs = new EGLConfig[1]; - int[] num_config = new int[1]; - if (!egl.eglChooseConfig(dpy, configSpec, configs, 1, num_config) || num_config[0] == 0) { - Log.e("SDL", "No EGL config available"); - return false; - } - EGLConfig config = configs[0]; - - EGLContext ctx = egl.eglCreateContext(dpy, config, EGL10.EGL_NO_CONTEXT, null); - if (ctx == EGL10.EGL_NO_CONTEXT) { - Log.e("SDL", "Couldn't create context"); - return false; - } - - EGLSurface surface = egl.eglCreateWindowSurface(dpy, config, this, null); - if (surface == EGL10.EGL_NO_SURFACE) { - Log.e("SDL", "Couldn't create surface"); - return false; - } - - if (!egl.eglMakeCurrent(dpy, surface, surface, ctx)) { - Log.e("SDL", "Couldn't make context current"); - return false; - } - - mEGLContext = ctx; - mEGLDisplay = dpy; - mEGLSurface = surface; - - } catch(Exception e) { - Log.v("SDL", e + ""); - for (StackTraceElement s : e.getStackTrace()) { - Log.v("SDL", s.toString()); - } - } - - return true; - } - - // EGL buffer flip - public void flipEGL() { - try { - EGL10 egl = (EGL10)EGLContext.getEGL(); - - egl.eglWaitNative(EGL10.EGL_NATIVE_RENDERABLE, null); - - // drawing here - - egl.eglWaitGL(); - - egl.eglSwapBuffers(mEGLDisplay, mEGLSurface); - - - } catch(Exception e) { - Log.v("SDL", "flipEGL(): " + e); - for (StackTraceElement s : e.getStackTrace()) { - Log.v("SDL", s.toString()); - } - } - } - - // Key events - public boolean onKey(View v, int keyCode, KeyEvent event) { - - if (event.getAction() == KeyEvent.ACTION_DOWN) { - //Log.v("SDL", "key down: " + keyCode); - SDLActivity.onNativeKeyDown(keyCode); - return true; - } - else if (event.getAction() == KeyEvent.ACTION_UP) { - //Log.v("SDL", "key up: " + keyCode); - SDLActivity.onNativeKeyUp(keyCode); - return true; - } - - return false; - } - - // Touch events - public boolean onTouch(View v, MotionEvent event) { - - int action = event.getAction(); - float x = event.getX(); - float y = event.getY(); - float p = event.getPressure(); - - // TODO: Anything else we need to pass? - SDLActivity.onNativeTouch(action, x, y, p); - return true; - } - - // Sensor events - public void enableSensor(int sensortype, boolean enabled) { - // TODO: This uses getDefaultSensor - what if we have >1 accels? - if (enabled) { - mSensorManager.registerListener(this, - mSensorManager.getDefaultSensor(sensortype), - SensorManager.SENSOR_DELAY_GAME, null); - } else { - mSensorManager.unregisterListener(this, - mSensorManager.getDefaultSensor(sensortype)); - } - } - - public void onAccuracyChanged(Sensor sensor, int accuracy) { - // TODO - } - - public void onSensorChanged(SensorEvent event) { - if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) { - SDLActivity.onNativeAccel(event.values[0], - event.values[1], - event.values[2]); - } - } - -} - diff --git a/src/helper/android/SDL1.3/src/SDL.c b/src/helper/android/SDL1.3/src/SDL.c deleted file mode 100644 index 6399a94cb..000000000 --- a/src/helper/android/SDL1.3/src/SDL.c +++ /dev/null @@ -1,327 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Initialization code for SDL */ - -#include "SDL.h" -#include "SDL_revision.h" -#include "SDL_fatal.h" -#include "SDL_assert_c.h" -#include "haptic/SDL_haptic_c.h" -#include "joystick/SDL_joystick_c.h" - -/* Initialization/Cleanup routines */ -#if !SDL_TIMERS_DISABLED -extern void SDL_StartTicks(void); -extern int SDL_TimerInit(void); -extern void SDL_TimerQuit(void); -#endif -#if defined(__WIN32__) -extern int SDL_HelperWindowCreate(void); -extern int SDL_HelperWindowDestroy(void); -#endif - - -/* The initialized subsystems */ -static Uint32 SDL_initialized = 0; -static Uint32 ticks_started = 0; - - -int -SDL_InitSubSystem(Uint32 flags) -{ -#if !SDL_VIDEO_DISABLED - /* Initialize the video/event subsystem */ - if ((flags & SDL_INIT_VIDEO) && !(SDL_initialized & SDL_INIT_VIDEO)) { - if (SDL_VideoInit(NULL) < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_VIDEO; - } -#else - if (flags & SDL_INIT_VIDEO) { - SDL_SetError("SDL not built with video support"); - return (-1); - } -#endif - -#if !SDL_AUDIO_DISABLED - /* Initialize the audio subsystem */ - if ((flags & SDL_INIT_AUDIO) && !(SDL_initialized & SDL_INIT_AUDIO)) { - if (SDL_AudioInit(NULL) < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_AUDIO; - } -#else - if (flags & SDL_INIT_AUDIO) { - SDL_SetError("SDL not built with audio support"); - return (-1); - } -#endif - -#if !SDL_TIMERS_DISABLED - /* Initialize the timer subsystem */ - if (!ticks_started) { - SDL_StartTicks(); - ticks_started = 1; - } - if ((flags & SDL_INIT_TIMER) && !(SDL_initialized & SDL_INIT_TIMER)) { - if (SDL_TimerInit() < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_TIMER; - } -#else - if (flags & SDL_INIT_TIMER) { - SDL_SetError("SDL not built with timer support"); - return (-1); - } -#endif - -#if !SDL_JOYSTICK_DISABLED - /* Initialize the joystick subsystem */ - if ((flags & SDL_INIT_JOYSTICK) && !(SDL_initialized & SDL_INIT_JOYSTICK)) { - if (SDL_JoystickInit() < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_JOYSTICK; - } -#else - if (flags & SDL_INIT_JOYSTICK) { - SDL_SetError("SDL not built with joystick support"); - return (-1); - } -#endif - -#if !SDL_HAPTIC_DISABLED - /* Initialize the haptic subsystem */ - if ((flags & SDL_INIT_HAPTIC) && !(SDL_initialized & SDL_INIT_HAPTIC)) { - if (SDL_HapticInit() < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_HAPTIC; - } -#else - if (flags & SDL_INIT_HAPTIC) { - SDL_SetError("SDL not built with haptic (force feedback) support"); - return (-1); - } -#endif - return (0); -} - -int -SDL_Init(Uint32 flags) -{ - if (SDL_AssertionsInit() < 0) { - return -1; - } - - /* Clear the error message */ - SDL_ClearError(); - -#if defined(__WIN32__) - if (SDL_HelperWindowCreate() < 0) { - return -1; - } -#endif - - /* Initialize the desired subsystems */ - if (SDL_InitSubSystem(flags) < 0) { - return (-1); - } - - /* Everything is initialized */ - if (!(flags & SDL_INIT_NOPARACHUTE)) { - SDL_InstallParachute(); - } - - return (0); -} - -void -SDL_QuitSubSystem(Uint32 flags) -{ - /* Shut down requested initialized subsystems */ -#if !SDL_JOYSTICK_DISABLED - if ((flags & SDL_initialized & SDL_INIT_JOYSTICK)) { - SDL_JoystickQuit(); - SDL_initialized &= ~SDL_INIT_JOYSTICK; - } -#endif -#if !SDL_HAPTIC_DISABLED - if ((flags & SDL_initialized & SDL_INIT_HAPTIC)) { - SDL_HapticQuit(); - SDL_initialized &= ~SDL_INIT_HAPTIC; - } -#endif -#if !SDL_TIMERS_DISABLED - if ((flags & SDL_initialized & SDL_INIT_TIMER)) { - SDL_TimerQuit(); - SDL_initialized &= ~SDL_INIT_TIMER; - } -#endif -#if !SDL_AUDIO_DISABLED - if ((flags & SDL_initialized & SDL_INIT_AUDIO)) { - SDL_AudioQuit(); - SDL_initialized &= ~SDL_INIT_AUDIO; - } -#endif -#if !SDL_VIDEO_DISABLED - if ((flags & SDL_initialized & SDL_INIT_VIDEO)) { - SDL_VideoQuit(); - SDL_initialized &= ~SDL_INIT_VIDEO; - } -#endif -} - -Uint32 -SDL_WasInit(Uint32 flags) -{ - if (!flags) { - flags = SDL_INIT_EVERYTHING; - } - return (SDL_initialized & flags); -} - -void -SDL_Quit(void) -{ - /* Quit all subsystems */ -#if defined(__WIN32__) - SDL_HelperWindowDestroy(); -#endif - SDL_QuitSubSystem(SDL_INIT_EVERYTHING); - - /* Uninstall any parachute signal handlers */ - SDL_UninstallParachute(); - - SDL_ClearHints(); - SDL_AssertionsQuit(); - SDL_LogResetPriorities(); -} - -/* Get the library version number */ -void -SDL_GetVersion(SDL_version * ver) -{ - SDL_VERSION(ver); -} - -/* Get the library source revision */ -const char * -SDL_GetRevision(void) -{ - return SDL_REVISION; -} - -/* Get the library source revision number */ -int -SDL_GetRevisionNumber(void) -{ - return SDL_REVISION_NUMBER; -} - -/* Get the name of the platform */ -const char * -SDL_GetPlatform() -{ -#if __AIX__ - return "AIX"; -#elif __HAIKU__ -/* Haiku must appear here before BeOS, since it also defines __BEOS__ */ - return "Haiku"; -#elif __BEOS__ - return "BeOS"; -#elif __BSDI__ - return "BSDI"; -#elif __DREAMCAST__ - return "Dreamcast"; -#elif __FREEBSD__ - return "FreeBSD"; -#elif __HPUX__ - return "HP-UX"; -#elif __IRIX__ - return "Irix"; -#elif __LINUX__ - return "Linux"; -#elif __MINT__ - return "Atari MiNT"; -#elif __MACOS__ - return "MacOS Classic"; -#elif __MACOSX__ - return "Mac OS X"; -#elif __NETBSD__ - return "NetBSD"; -#elif __NDS__ - return "Nintendo DS"; -#elif __OPENBSD__ - return "OpenBSD"; -#elif __OS2__ - return "OS/2"; -#elif __OSF__ - return "OSF/1"; -#elif __QNXNTO__ - return "QNX Neutrino"; -#elif __RISCOS__ - return "RISC OS"; -#elif __SOLARIS__ - return "Solaris"; -#elif __WIN32__ -#ifdef _WIN32_WCE - return "Windows CE"; -#else - return "Windows"; -#endif -#elif __IPHONEOS__ - return "iPhone OS"; -#else - return "Unknown (see SDL_platform.h)"; -#endif -} - -#if defined(__WIN32__) - -#if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL)) -/* Need to include DllMain() on Watcom C for some reason.. */ -#include "core/windows/SDL_windows.h" - -BOOL APIENTRY -_DllMainCRTStartup(HANDLE hModule, - DWORD ul_reason_for_call, LPVOID lpReserved) -{ - switch (ul_reason_for_call) { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} -#endif /* building DLL with Watcom C */ - -#endif /* __WIN32__ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_assert.c b/src/helper/android/SDL1.3/src/SDL_assert.c deleted file mode 100644 index 563016d56..000000000 --- a/src/helper/android/SDL1.3/src/SDL_assert.c +++ /dev/null @@ -1,488 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#include "SDL.h" -#include "SDL_atomic.h" -#include "SDL_assert.h" -#include "SDL_assert_c.h" -#include "video/SDL_sysvideo.h" - -#ifdef __WIN32__ -#include "core/windows/SDL_windows.h" - -#ifndef WS_OVERLAPPEDWINDOW -#define WS_OVERLAPPEDWINDOW 0 -#endif -#else /* fprintf, _exit(), etc. */ -#include -#include -#include -#endif - -static SDL_assert_state -SDL_PromptAssertion(const SDL_assert_data *data, void *userdata); - -/* - * We keep all triggered assertions in a singly-linked list so we can - * generate a report later. - */ -static SDL_assert_data assertion_list_terminator = { 0, 0, 0, 0, 0, 0, 0 }; -static SDL_assert_data *triggered_assertions = &assertion_list_terminator; - -static SDL_mutex *assertion_mutex = NULL; -static SDL_AssertionHandler assertion_handler = SDL_PromptAssertion; -static void *assertion_userdata = NULL; - -#ifdef __GNUC__ -static void -debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2))); -#endif - -static void -debug_print(const char *fmt, ...) -{ -#ifdef __WIN32__ - /* Format into a buffer for OutputDebugStringA(). */ - char buf[1024]; - char *startptr; - char *ptr; - LPTSTR tstr; - int len; - va_list ap; - va_start(ap, fmt); - len = (int) SDL_vsnprintf(buf, sizeof (buf), fmt, ap); - va_end(ap); - - /* Visual C's vsnprintf() may not null-terminate the buffer. */ - if ((len >= sizeof (buf)) || (len < 0)) { - buf[sizeof (buf) - 1] = '\0'; - } - - /* Write it, sorting out the Unix newlines... */ - startptr = buf; - for (ptr = startptr; *ptr; ptr++) { - if (*ptr == '\n') { - *ptr = '\0'; - tstr = WIN_UTF8ToString(startptr); - OutputDebugString(tstr); - SDL_free(tstr); - OutputDebugString(TEXT("\r\n")); - startptr = ptr+1; - } - } - - /* catch that last piece if it didn't have a newline... */ - if (startptr != ptr) { - tstr = WIN_UTF8ToString(startptr); - OutputDebugString(tstr); - SDL_free(tstr); - } -#else - /* Unix has it easy. Just dump it to stderr. */ - va_list ap; - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fflush(stderr); -#endif -} - - -#ifdef __WIN32__ -static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT; -static const SDL_assert_data *SDL_Windows_AssertData = NULL; - -static LRESULT CALLBACK -SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_CREATE: - { - /* !!! FIXME: all this code stinks. */ - const SDL_assert_data *data = SDL_Windows_AssertData; - char buf[1024]; - LPTSTR tstr; - const int w = 100; - const int h = 25; - const int gap = 10; - int x = gap; - int y = 50; - int len; - int i; - static const struct { - LPCTSTR name; - SDL_assert_state state; - } buttons[] = { - {TEXT("Abort"), SDL_ASSERTION_ABORT }, - {TEXT("Break"), SDL_ASSERTION_BREAK }, - {TEXT("Retry"), SDL_ASSERTION_RETRY }, - {TEXT("Ignore"), SDL_ASSERTION_IGNORE }, - {TEXT("Always Ignore"), SDL_ASSERTION_ALWAYS_IGNORE }, - }; - - len = (int) SDL_snprintf(buf, sizeof (buf), - "Assertion failure at %s (%s:%d), triggered %u time%s:\r\n '%s'", - data->function, data->filename, data->linenum, - data->trigger_count, (data->trigger_count == 1) ? "" : "s", - data->condition); - if ((len < 0) || (len >= sizeof (buf))) { - buf[sizeof (buf) - 1] = '\0'; - } - - tstr = WIN_UTF8ToString(buf); - CreateWindow(TEXT("STATIC"), tstr, - WS_VISIBLE | WS_CHILD | SS_LEFT, - x, y, 550, 100, - hwnd, (HMENU) 1, NULL, NULL); - SDL_free(tstr); - y += 110; - - for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) { - CreateWindow(TEXT("BUTTON"), buttons[i].name, - WS_VISIBLE | WS_CHILD, - x, y, w, h, - hwnd, (HMENU) buttons[i].state, NULL, NULL); - x += w + gap; - } - break; - } - - case WM_COMMAND: - SDL_Windows_AssertChoice = ((SDL_assert_state) (LOWORD(wParam))); - SDL_Windows_AssertData = NULL; - break; - - case WM_DESTROY: - SDL_Windows_AssertData = NULL; - break; - } - - return DefWindowProc(hwnd, msg, wParam, lParam); -} - -static SDL_assert_state -SDL_PromptAssertion_windows(const SDL_assert_data *data) -{ - HINSTANCE hInstance = 0; /* !!! FIXME? */ - HWND hwnd; - MSG msg; - WNDCLASS wc = {0}; - - SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT; - SDL_Windows_AssertData = data; - - wc.lpszClassName = TEXT("SDL_assert"); - wc.hInstance = hInstance ; - wc.hbrBackground = GetSysColorBrush(COLOR_3DFACE); - wc.lpfnWndProc = SDL_Assertion_WndProc; - wc.hCursor = LoadCursor(0, IDC_ARROW); - - RegisterClass(&wc); - hwnd = CreateWindow(wc.lpszClassName, TEXT("SDL assertion failure"), - WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 150, 150, 570, 260, 0, 0, hInstance, 0); - - while (GetMessage(&msg, NULL, 0, 0) && (SDL_Windows_AssertData != NULL)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - DestroyWindow(hwnd); - UnregisterClass(wc.lpszClassName, hInstance); - return SDL_Windows_AssertChoice; -} -#endif - - -static void SDL_AddAssertionToReport(SDL_assert_data *data) -{ - /* (data) is always a static struct defined with the assert macros, so - we don't have to worry about copying or allocating them. */ - if (data->next == NULL) { /* not yet added? */ - data->next = triggered_assertions; - triggered_assertions = data; - } -} - - -static void SDL_GenerateAssertionReport(void) -{ - const SDL_assert_data *item; - - /* only do this if the app hasn't assigned an assertion handler. */ - if (assertion_handler != SDL_PromptAssertion) - return; - - item = SDL_GetAssertionReport(); - if (item->condition) - { - debug_print("\n\nSDL assertion report.\n"); - debug_print("All SDL assertions between last init/quit:\n\n"); - - while (item->condition) { - debug_print( - "'%s'\n" - " * %s (%s:%d)\n" - " * triggered %u time%s.\n" - " * always ignore: %s.\n", - item->condition, item->function, item->filename, - item->linenum, item->trigger_count, - (item->trigger_count == 1) ? "" : "s", - item->always_ignore ? "yes" : "no"); - item = item->next; - } - debug_print("\n"); - - SDL_ResetAssertionReport(); - } -} - -static void SDL_ExitProcess(int exitcode) -{ -#ifdef __WIN32__ - ExitProcess(42); -#else - _exit(42); -#endif -} - -static void SDL_AbortAssertion(void) -{ - SDL_Quit(); - SDL_ExitProcess(42); -} - - -static SDL_assert_state -SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) -{ - const char *envr; - SDL_assert_state state = SDL_ASSERTION_ABORT; - SDL_Window *window; - - (void) userdata; /* unused in default handler. */ - - debug_print("\n\n" - "Assertion failure at %s (%s:%d), triggered %u time%s:\n" - " '%s'\n" - "\n", - data->function, data->filename, data->linenum, - data->trigger_count, (data->trigger_count == 1) ? "" : "s", - data->condition); - - /* let env. variable override, so unit tests won't block in a GUI. */ - envr = SDL_getenv("SDL_ASSERT"); - if (envr != NULL) { - if (SDL_strcmp(envr, "abort") == 0) { - return SDL_ASSERTION_ABORT; - } else if (SDL_strcmp(envr, "break") == 0) { - return SDL_ASSERTION_BREAK; - } else if (SDL_strcmp(envr, "retry") == 0) { - return SDL_ASSERTION_RETRY; - } else if (SDL_strcmp(envr, "ignore") == 0) { - return SDL_ASSERTION_IGNORE; - } else if (SDL_strcmp(envr, "always_ignore") == 0) { - return SDL_ASSERTION_ALWAYS_IGNORE; - } else { - return SDL_ASSERTION_ABORT; /* oh well. */ - } - } - - /* Leave fullscreen mode, if possible (scary!) */ - window = SDL_GetFocusWindow(); - if (window) { - if (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) { - SDL_MinimizeWindow(window); - } else { - /* !!! FIXME: ungrab the input if we're not fullscreen? */ - /* No need to mess with the window */ - window = 0; - } - } - - /* platform-specific UI... */ - -#ifdef __WIN32__ - state = SDL_PromptAssertion_windows(data); - -#elif __MACOSX__ - /* This has to be done in an Objective-C (*.m) file, so we call out. */ - extern SDL_assert_state SDL_PromptAssertion_cocoa(const SDL_assert_data *); - state = SDL_PromptAssertion_cocoa(data); - -#else - /* this is a little hacky. */ - for ( ; ; ) { - char buf[32]; - fprintf(stderr, "Abort/Break/Retry/Ignore/AlwaysIgnore? [abriA] : "); - fflush(stderr); - if (fgets(buf, sizeof (buf), stdin) == NULL) { - break; - } - - if (SDL_strcmp(buf, "a") == 0) { - state = SDL_ASSERTION_ABORT; - break; - } else if (SDL_strcmp(envr, "b") == 0) { - state = SDL_ASSERTION_BREAK; - break; - } else if (SDL_strcmp(envr, "r") == 0) { - state = SDL_ASSERTION_RETRY; - break; - } else if (SDL_strcmp(envr, "i") == 0) { - state = SDL_ASSERTION_IGNORE; - break; - } else if (SDL_strcmp(envr, "A") == 0) { - state = SDL_ASSERTION_ALWAYS_IGNORE; - break; - } - } -#endif - - /* Re-enter fullscreen mode */ - if (window) { - SDL_RestoreWindow(window); - } - - return state; -} - - -SDL_assert_state -SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file, - int line) -{ - static int assertion_running = 0; - static SDL_SpinLock spinlock = 0; - SDL_assert_state state = SDL_ASSERTION_IGNORE; - - SDL_AtomicLock(&spinlock); - if (assertion_mutex == NULL) { /* never called SDL_Init()? */ - assertion_mutex = SDL_CreateMutex(); - if (assertion_mutex == NULL) { - SDL_AtomicUnlock(&spinlock); - return SDL_ASSERTION_IGNORE; /* oh well, I guess. */ - } - } - SDL_AtomicUnlock(&spinlock); - - if (SDL_LockMutex(assertion_mutex) < 0) { - return SDL_ASSERTION_IGNORE; /* oh well, I guess. */ - } - - /* doing this because Visual C is upset over assigning in the macro. */ - if (data->trigger_count == 0) { - data->function = func; - data->filename = file; - data->linenum = line; - } - - SDL_AddAssertionToReport(data); - - data->trigger_count++; - - assertion_running++; - if (assertion_running > 1) { /* assert during assert! Abort. */ - if (assertion_running == 2) { - SDL_AbortAssertion(); - } else if (assertion_running == 3) { /* Abort asserted! */ - SDL_ExitProcess(42); - } else { - while (1) { /* do nothing but spin; what else can you do?! */ } - } - } - - if (!data->always_ignore) { - state = assertion_handler(data, assertion_userdata); - } - - switch (state) - { - case SDL_ASSERTION_ABORT: - SDL_AbortAssertion(); - return SDL_ASSERTION_IGNORE; /* shouldn't return, but oh well. */ - - case SDL_ASSERTION_ALWAYS_IGNORE: - state = SDL_ASSERTION_IGNORE; - data->always_ignore = 1; - break; - - case SDL_ASSERTION_IGNORE: - case SDL_ASSERTION_RETRY: - case SDL_ASSERTION_BREAK: - break; /* macro handles these. */ - } - - assertion_running--; - SDL_UnlockMutex(assertion_mutex); - - return state; -} - - -int SDL_AssertionsInit(void) -{ - /* this is a no-op at the moment. */ - return 0; -} - -void SDL_AssertionsQuit(void) -{ - SDL_GenerateAssertionReport(); - if (assertion_mutex != NULL) { - SDL_DestroyMutex(assertion_mutex); - assertion_mutex = NULL; - } -} - -void SDL_SetAssertionHandler(SDL_AssertionHandler handler, void *userdata) -{ - if (handler != NULL) { - assertion_handler = handler; - assertion_userdata = userdata; - } else { - assertion_handler = SDL_PromptAssertion; - assertion_userdata = NULL; - } -} - -const SDL_assert_data *SDL_GetAssertionReport(void) -{ - return triggered_assertions; -} - -void SDL_ResetAssertionReport(void) -{ - SDL_assert_data *item = triggered_assertions; - SDL_assert_data *next = NULL; - for (item = triggered_assertions; item->condition; item = next) { - next = (SDL_assert_data *) item->next; - item->always_ignore = SDL_FALSE; - item->trigger_count = 0; - item->next = NULL; - } - - triggered_assertions = &assertion_list_terminator; -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_assert_c.h b/src/helper/android/SDL1.3/src/SDL_assert_c.h deleted file mode 100644 index 81293fbab..000000000 --- a/src/helper/android/SDL1.3/src/SDL_assert_c.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -extern int SDL_AssertionsInit(void); -extern void SDL_AssertionsQuit(void); - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_compat.c b/src/helper/android/SDL1.3/src/SDL_compat.c deleted file mode 100644 index 814362f4f..000000000 --- a/src/helper/android/SDL1.3/src/SDL_compat.c +++ /dev/null @@ -1,1816 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* This file contains functions for backwards compatibility with SDL 1.2 */ - -#include "SDL.h" -#include "SDL_syswm.h" - -#include "video/SDL_sysvideo.h" -#include "video/SDL_pixels_c.h" -#include "render/SDL_yuv_sw_c.h" - - -static SDL_Window *SDL_VideoWindow = NULL; -static SDL_Surface *SDL_WindowSurface = NULL; -static SDL_Surface *SDL_VideoSurface = NULL; -static SDL_Surface *SDL_ShadowSurface = NULL; -static SDL_Surface *SDL_PublicSurface = NULL; -static SDL_GLContext *SDL_VideoContext = NULL; -static Uint32 SDL_VideoFlags = 0; -static SDL_Rect SDL_VideoViewport; -static char *wm_title = NULL; -static SDL_Surface *SDL_VideoIcon; -static int SDL_enabled_UNICODE = 0; - -const char * -SDL_AudioDriverName(char *namebuf, int maxlen) -{ - const char *name = SDL_GetCurrentAudioDriver(); - if (name) { - if (namebuf) { - SDL_strlcpy(namebuf, name, maxlen); - return namebuf; - } else { - return name; - } - } - return NULL; -} - -const char * -SDL_VideoDriverName(char *namebuf, int maxlen) -{ - const char *name = SDL_GetCurrentVideoDriver(); - if (name) { - if (namebuf) { - SDL_strlcpy(namebuf, name, maxlen); - return namebuf; - } else { - return name; - } - } - return NULL; -} - -static int -GetVideoDisplay() -{ - const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY"); - if ( !variable ) { - variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD"); - } - if ( variable ) { - return SDL_atoi(variable); - } else { - return 0; - } -} - -const SDL_VideoInfo * -SDL_GetVideoInfo(void) -{ - static SDL_VideoInfo info; - SDL_DisplayMode mode; - - /* Memory leak, compatibility code, who cares? */ - if (!info.vfmt && SDL_GetDesktopDisplayMode(GetVideoDisplay(), &mode) == 0) { - info.vfmt = SDL_AllocFormat(mode.format); - info.current_w = mode.w; - info.current_h = mode.h; - } - return &info; -} - -int -SDL_VideoModeOK(int width, int height, int bpp, Uint32 flags) -{ - int i, actual_bpp = 0; - - if (!SDL_GetVideoDevice()) { - return 0; - } - - if (!(flags & SDL_FULLSCREEN)) { - SDL_DisplayMode mode; - SDL_GetDesktopDisplayMode(GetVideoDisplay(), &mode); - return SDL_BITSPERPIXEL(mode.format); - } - - for (i = 0; i < SDL_GetNumDisplayModes(GetVideoDisplay()); ++i) { - SDL_DisplayMode mode; - SDL_GetDisplayMode(GetVideoDisplay(), i, &mode); - if (!mode.w || !mode.h || (width == mode.w && height == mode.h)) { - if (!mode.format) { - return bpp; - } - if (SDL_BITSPERPIXEL(mode.format) >= (Uint32) bpp) { - actual_bpp = SDL_BITSPERPIXEL(mode.format); - } - } - } - return actual_bpp; -} - -SDL_Rect ** -SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags) -{ - int i, nmodes; - SDL_Rect **modes; - - if (!SDL_GetVideoDevice()) { - return NULL; - } - - if (!(flags & SDL_FULLSCREEN)) { - return (SDL_Rect **) (-1); - } - - if (!format) { - format = SDL_GetVideoInfo()->vfmt; - } - - /* Memory leak, but this is a compatibility function, who cares? */ - nmodes = 0; - modes = NULL; - for (i = 0; i < SDL_GetNumDisplayModes(GetVideoDisplay()); ++i) { - SDL_DisplayMode mode; - int bpp; - - SDL_GetDisplayMode(GetVideoDisplay(), i, &mode); - if (!mode.w || !mode.h) { - return (SDL_Rect **) (-1); - } - - /* Copied from src/video/SDL_pixels.c:SDL_PixelFormatEnumToMasks */ - if (SDL_BYTESPERPIXEL(mode.format) <= 2) { - bpp = SDL_BITSPERPIXEL(mode.format); - } else { - bpp = SDL_BYTESPERPIXEL(mode.format) * 8; - } - - if (bpp != format->BitsPerPixel) { - continue; - } - if (nmodes > 0 && modes[nmodes - 1]->w == mode.w - && modes[nmodes - 1]->h == mode.h) { - continue; - } - - modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes)); - if (!modes) { - return NULL; - } - modes[nmodes] = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect)); - if (!modes[nmodes]) { - return NULL; - } - modes[nmodes]->x = 0; - modes[nmodes]->y = 0; - modes[nmodes]->w = mode.w; - modes[nmodes]->h = mode.h; - ++nmodes; - } - if (modes) { - modes[nmodes] = NULL; - } - return modes; -} - -static int -SDL_CompatEventFilter(void *userdata, SDL_Event * event) -{ - SDL_Event fake; - - switch (event->type) { - case SDL_WINDOWEVENT: - switch (event->window.event) { - case SDL_WINDOWEVENT_EXPOSED: - if (!SDL_HasEvent(SDL_VIDEOEXPOSE)) { - fake.type = SDL_VIDEOEXPOSE; - SDL_PushEvent(&fake); - } - break; - case SDL_WINDOWEVENT_RESIZED: - SDL_FlushEvent(SDL_VIDEORESIZE); - /* We don't want to expose that the window width and height will - be different if we don't get the desired fullscreen mode. - */ - if (SDL_VideoWindow && !(SDL_GetWindowFlags(SDL_VideoWindow) & SDL_WINDOW_FULLSCREEN)) { - fake.type = SDL_VIDEORESIZE; - fake.resize.w = event->window.data1; - fake.resize.h = event->window.data2; - SDL_PushEvent(&fake); - } - break; - case SDL_WINDOWEVENT_MINIMIZED: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 0; - fake.active.state = SDL_APPACTIVE; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_RESTORED: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 1; - fake.active.state = SDL_APPACTIVE; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_ENTER: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 1; - fake.active.state = SDL_APPMOUSEFOCUS; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_LEAVE: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 0; - fake.active.state = SDL_APPMOUSEFOCUS; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_FOCUS_GAINED: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 1; - fake.active.state = SDL_APPINPUTFOCUS; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_FOCUS_LOST: - fake.type = SDL_ACTIVEEVENT; - fake.active.gain = 0; - fake.active.state = SDL_APPINPUTFOCUS; - SDL_PushEvent(&fake); - break; - case SDL_WINDOWEVENT_CLOSE: - fake.type = SDL_QUIT; - SDL_PushEvent(&fake); - break; - } - case SDL_KEYDOWN: - case SDL_KEYUP: - { - Uint32 unicode = 0; - if (event->key.type == SDL_KEYDOWN && event->key.keysym.sym < 256) { - unicode = event->key.keysym.sym; - if (unicode >= 'a' && unicode <= 'z') { - int shifted = !!(event->key.keysym.mod & KMOD_SHIFT); - int capslock = !!(event->key.keysym.mod & KMOD_CAPS); - if ((shifted ^ capslock) != 0) { - unicode = SDL_toupper(unicode); - } - } - } - if (unicode) { - event->key.keysym.unicode = unicode; - } - break; - } - case SDL_TEXTINPUT: - { - /* FIXME: Generate an old style key repeat event if needed */ - //printf("TEXTINPUT: '%s'\n", event->text.text); - break; - } - case SDL_MOUSEMOTION: - { - event->motion.x -= SDL_VideoViewport.x; - event->motion.y -= SDL_VideoViewport.y; - break; - } - case SDL_MOUSEBUTTONDOWN: - case SDL_MOUSEBUTTONUP: - { - event->button.x -= SDL_VideoViewport.x; - event->button.y -= SDL_VideoViewport.y; - break; - } - case SDL_MOUSEWHEEL: - { - Uint8 button; - int x, y; - - if (event->wheel.y == 0) { - break; - } - - SDL_GetMouseState(&x, &y); - - if (event->wheel.y > 0) { - button = SDL_BUTTON_WHEELUP; - } else { - button = SDL_BUTTON_WHEELDOWN; - } - - fake.button.button = button; - fake.button.x = x; - fake.button.y = y; - fake.button.windowID = event->wheel.windowID; - - fake.type = SDL_MOUSEBUTTONDOWN; - fake.button.state = SDL_PRESSED; - SDL_PushEvent(&fake); - - fake.type = SDL_MOUSEBUTTONUP; - fake.button.state = SDL_RELEASED; - SDL_PushEvent(&fake); - break; - } - - } - return 1; -} - -static void -GetEnvironmentWindowPosition(int w, int h, int *x, int *y) -{ - int display = GetVideoDisplay(); - const char *window = SDL_getenv("SDL_VIDEO_WINDOW_POS"); - const char *center = SDL_getenv("SDL_VIDEO_CENTERED"); - if (window) { - if (SDL_sscanf(window, "%d,%d", x, y) == 2) { - return; - } - if (SDL_strcmp(window, "center") == 0) { - center = window; - } - } - if (center) { - *x = SDL_WINDOWPOS_CENTERED_DISPLAY(display); - *y = SDL_WINDOWPOS_CENTERED_DISPLAY(display); - } -} - -static void -ClearVideoSurface() -{ - if (SDL_ShadowSurface) { - SDL_FillRect(SDL_ShadowSurface, NULL, - SDL_MapRGB(SDL_ShadowSurface->format, 0, 0, 0)); - } - SDL_FillRect(SDL_WindowSurface, NULL, 0); - SDL_UpdateWindowSurface(SDL_VideoWindow); -} - -static void -SetupScreenSaver(int flags) -{ - const char *env; - SDL_bool allow_screensaver; - - /* Allow environment override of screensaver disable */ - env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER"); - if (env) { - allow_screensaver = SDL_atoi(env) ? SDL_TRUE : SDL_FALSE; - } else if (flags & SDL_FULLSCREEN) { - allow_screensaver = SDL_FALSE; - } else { - allow_screensaver = SDL_TRUE; - } - if (allow_screensaver) { - SDL_EnableScreenSaver(); - } else { - SDL_DisableScreenSaver(); - } -} - -static int -SDL_ResizeVideoMode(int width, int height, int bpp, Uint32 flags) -{ - int w, h; - - /* We can't resize something we don't have... */ - if (!SDL_VideoSurface) { - return -1; - } - - /* We probably have to recreate the window in fullscreen mode */ - if (flags & SDL_FULLSCREEN) { - return -1; - } - - /* I don't think there's any change we can gracefully make in flags */ - if (flags != SDL_VideoFlags) { - return -1; - } - if (bpp != SDL_VideoSurface->format->BitsPerPixel) { - return -1; - } - - /* Resize the window */ - SDL_GetWindowSize(SDL_VideoWindow, &w, &h); - if (w != width || h != height) { - SDL_SetWindowSize(SDL_VideoWindow, width, height); - } - - /* If we're in OpenGL mode, just resize the stub surface and we're done! */ - if (flags & SDL_OPENGL) { - SDL_VideoSurface->w = width; - SDL_VideoSurface->h = height; - return 0; - } - - SDL_WindowSurface = SDL_GetWindowSurface(SDL_VideoWindow); - if (!SDL_WindowSurface) { - return -1; - } - if (SDL_VideoSurface->format != SDL_WindowSurface->format) { - return -1; - } - SDL_VideoSurface->w = width; - SDL_VideoSurface->h = height; - SDL_VideoSurface->pixels = SDL_WindowSurface->pixels; - SDL_VideoSurface->pitch = SDL_WindowSurface->pitch; - SDL_SetClipRect(SDL_VideoSurface, NULL); - - if (SDL_ShadowSurface) { - SDL_ShadowSurface->w = width; - SDL_ShadowSurface->h = height; - SDL_ShadowSurface->pitch = SDL_CalculatePitch(SDL_ShadowSurface); - SDL_ShadowSurface->pixels = - SDL_realloc(SDL_ShadowSurface->pixels, - SDL_ShadowSurface->h * SDL_ShadowSurface->pitch); - SDL_SetClipRect(SDL_ShadowSurface, NULL); - SDL_InvalidateMap(SDL_ShadowSurface->map); - } else { - SDL_PublicSurface = SDL_VideoSurface; - } - - ClearVideoSurface(); - - return 0; -} - -SDL_Surface * -SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags) -{ - SDL_DisplayMode desktop_mode; - int display = GetVideoDisplay(); - int window_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(display); - int window_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(display); - int window_w; - int window_h; - Uint32 window_flags; - Uint32 surface_flags; - - if (!SDL_GetVideoDevice()) { - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) { - return NULL; - } - } - - SDL_GetDesktopDisplayMode(display, &desktop_mode); - - if (width == 0) { - width = desktop_mode.w; - } - if (height == 0) { - height = desktop_mode.h; - } - if (bpp == 0) { - bpp = SDL_BITSPERPIXEL(desktop_mode.format); - } - - /* See if we can simply resize the existing window and surface */ - if (SDL_ResizeVideoMode(width, height, bpp, flags) == 0) { - return SDL_PublicSurface; - } - - /* Destroy existing window */ - SDL_PublicSurface = NULL; - if (SDL_ShadowSurface) { - SDL_ShadowSurface->flags &= ~SDL_DONTFREE; - SDL_FreeSurface(SDL_ShadowSurface); - SDL_ShadowSurface = NULL; - } - if (SDL_VideoSurface) { - SDL_VideoSurface->flags &= ~SDL_DONTFREE; - SDL_FreeSurface(SDL_VideoSurface); - SDL_VideoSurface = NULL; - } - if (SDL_VideoContext) { - /* SDL_GL_MakeCurrent(0, NULL); *//* Doesn't do anything */ - SDL_GL_DeleteContext(SDL_VideoContext); - SDL_VideoContext = NULL; - } - if (SDL_VideoWindow) { - SDL_GetWindowPosition(SDL_VideoWindow, &window_x, &window_y); - SDL_DestroyWindow(SDL_VideoWindow); - } - - /* Set up the event filter */ - if (!SDL_GetEventFilter(NULL, NULL)) { - SDL_SetEventFilter(SDL_CompatEventFilter, NULL); - } - - /* Create a new window */ - window_flags = SDL_WINDOW_SHOWN; - if (flags & SDL_FULLSCREEN) { - window_flags |= SDL_WINDOW_FULLSCREEN; - } - if (flags & SDL_OPENGL) { - window_flags |= SDL_WINDOW_OPENGL; - } - if (flags & SDL_RESIZABLE) { - window_flags |= SDL_WINDOW_RESIZABLE; - } - if (flags & SDL_NOFRAME) { - window_flags |= SDL_WINDOW_BORDERLESS; - } - GetEnvironmentWindowPosition(width, height, &window_x, &window_y); - SDL_VideoWindow = - SDL_CreateWindow(wm_title, window_x, window_y, width, height, - window_flags); - if (!SDL_VideoWindow) { - return NULL; - } - SDL_SetWindowIcon(SDL_VideoWindow, SDL_VideoIcon); - - SetupScreenSaver(flags); - - window_flags = SDL_GetWindowFlags(SDL_VideoWindow); - surface_flags = 0; - if (window_flags & SDL_WINDOW_FULLSCREEN) { - surface_flags |= SDL_FULLSCREEN; - } - if ((window_flags & SDL_WINDOW_OPENGL) && (flags & SDL_OPENGL)) { - surface_flags |= SDL_OPENGL; - } - if (window_flags & SDL_WINDOW_RESIZABLE) { - surface_flags |= SDL_RESIZABLE; - } - if (window_flags & SDL_WINDOW_BORDERLESS) { - surface_flags |= SDL_NOFRAME; - } - - SDL_VideoFlags = flags; - - /* If we're in OpenGL mode, just create a stub surface and we're done! */ - if (flags & SDL_OPENGL) { - SDL_VideoContext = SDL_GL_CreateContext(SDL_VideoWindow); - if (!SDL_VideoContext) { - return NULL; - } - if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) { - return NULL; - } - SDL_VideoSurface = - SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0); - if (!SDL_VideoSurface) { - return NULL; - } - SDL_VideoSurface->flags |= surface_flags; - SDL_PublicSurface = SDL_VideoSurface; - return SDL_PublicSurface; - } - - /* Create the screen surface */ - SDL_WindowSurface = SDL_GetWindowSurface(SDL_VideoWindow); - if (!SDL_WindowSurface) { - return NULL; - } - - /* Center the public surface in the window surface */ - SDL_GetWindowSize(SDL_VideoWindow, &window_w, &window_h); - SDL_VideoViewport.x = (window_w - width)/2; - SDL_VideoViewport.y = (window_h - height)/2; - SDL_VideoViewport.w = width; - SDL_VideoViewport.h = height; - - SDL_VideoSurface = SDL_CreateRGBSurfaceFrom(NULL, 0, 0, 32, 0, 0, 0, 0, 0); - SDL_VideoSurface->flags |= surface_flags; - SDL_VideoSurface->flags |= SDL_DONTFREE; - SDL_FreeFormat(SDL_VideoSurface->format); - SDL_VideoSurface->format = SDL_WindowSurface->format; - SDL_VideoSurface->format->refcount++; - SDL_VideoSurface->w = width; - SDL_VideoSurface->h = height; - SDL_VideoSurface->pitch = SDL_WindowSurface->pitch; - SDL_VideoSurface->pixels = (void *)((Uint8 *)SDL_WindowSurface->pixels + - SDL_VideoViewport.y * SDL_VideoSurface->pitch + - SDL_VideoViewport.x * SDL_VideoSurface->format->BytesPerPixel); - SDL_SetClipRect(SDL_VideoSurface, NULL); - - /* Create a shadow surface if necessary */ - if ((bpp != SDL_VideoSurface->format->BitsPerPixel) - && !(flags & SDL_ANYFORMAT)) { - SDL_ShadowSurface = - SDL_CreateRGBSurface(0, width, height, bpp, 0, 0, 0, 0); - if (!SDL_ShadowSurface) { - return NULL; - } - SDL_ShadowSurface->flags |= surface_flags; - SDL_ShadowSurface->flags |= SDL_DONTFREE; - - /* 8-bit SDL_ShadowSurface surfaces report that they have exclusive palette */ - if (SDL_ShadowSurface->format->palette) { - SDL_ShadowSurface->flags |= SDL_HWPALETTE; - SDL_DitherColors(SDL_ShadowSurface->format->palette->colors, - SDL_ShadowSurface->format->BitsPerPixel); - } - SDL_FillRect(SDL_ShadowSurface, NULL, - SDL_MapRGB(SDL_ShadowSurface->format, 0, 0, 0)); - } - SDL_PublicSurface = - (SDL_ShadowSurface ? SDL_ShadowSurface : SDL_VideoSurface); - - ClearVideoSurface(); - - /* We're finally done! */ - return SDL_PublicSurface; -} - -SDL_Surface * -SDL_GetVideoSurface(void) -{ - return SDL_PublicSurface; -} - -int -SDL_SetAlpha(SDL_Surface * surface, Uint32 flag, Uint8 value) -{ - if (flag & SDL_SRCALPHA) { - /* According to the docs, value is ignored for alpha surfaces */ - if (surface->format->Amask) { - value = 0xFF; - } - SDL_SetSurfaceAlphaMod(surface, value); - SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND); - } else { - SDL_SetSurfaceAlphaMod(surface, 0xFF); - SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE); - } - SDL_SetSurfaceRLE(surface, (flag & SDL_RLEACCEL)); - - return 0; -} - -SDL_Surface * -SDL_DisplayFormat(SDL_Surface * surface) -{ - SDL_PixelFormat *format; - - if (!SDL_PublicSurface) { - SDL_SetError("No video mode has been set"); - return NULL; - } - format = SDL_PublicSurface->format; - - /* Set the flags appropriate for copying to display surface */ - return SDL_ConvertSurface(surface, format, SDL_RLEACCEL); -} - -SDL_Surface * -SDL_DisplayFormatAlpha(SDL_Surface * surface) -{ - SDL_PixelFormat *vf; - SDL_PixelFormat *format; - SDL_Surface *converted; - /* default to ARGB8888 */ - Uint32 amask = 0xff000000; - Uint32 rmask = 0x00ff0000; - Uint32 gmask = 0x0000ff00; - Uint32 bmask = 0x000000ff; - - if (!SDL_PublicSurface) { - SDL_SetError("No video mode has been set"); - return NULL; - } - vf = SDL_PublicSurface->format; - - switch (vf->BytesPerPixel) { - case 2: - /* For XGY5[56]5, use, AXGY8888, where {X, Y} = {R, B}. - For anything else (like ARGB4444) it doesn't matter - since we have no special code for it anyway */ - if ((vf->Rmask == 0x1f) && - (vf->Bmask == 0xf800 || vf->Bmask == 0x7c00)) { - rmask = 0xff; - bmask = 0xff0000; - } - break; - - case 3: - case 4: - /* Keep the video format, as long as the high 8 bits are - unused or alpha */ - if ((vf->Rmask == 0xff) && (vf->Bmask == 0xff0000)) { - rmask = 0xff; - bmask = 0xff0000; - } - break; - - default: - /* We have no other optimised formats right now. When/if a new - optimised alpha format is written, add the converter here */ - break; - } - format = SDL_AllocFormat(SDL_MasksToPixelFormatEnum(32, rmask, - gmask, - bmask, - amask)); - if (!format) { - return NULL; - } - converted = SDL_ConvertSurface(surface, format, SDL_RLEACCEL); - SDL_FreeFormat(format); - return converted; -} - -int -SDL_Flip(SDL_Surface * screen) -{ - SDL_UpdateRect(screen, 0, 0, 0, 0); - return 0; -} - -void -SDL_UpdateRect(SDL_Surface * screen, Sint32 x, Sint32 y, Uint32 w, Uint32 h) -{ - if (screen) { - SDL_Rect rect; - - /* Fill the rectangle */ - rect.x = (int) x; - rect.y = (int) y; - rect.w = (int) (w ? w : screen->w); - rect.h = (int) (h ? h : screen->h); - SDL_UpdateRects(screen, 1, &rect); - } -} - -void -SDL_UpdateRects(SDL_Surface * screen, int numrects, SDL_Rect * rects) -{ - int i; - - if (screen == SDL_ShadowSurface) { - for (i = 0; i < numrects; ++i) { - SDL_BlitSurface(SDL_ShadowSurface, &rects[i], SDL_VideoSurface, - &rects[i]); - } - - /* Fall through to video surface update */ - screen = SDL_VideoSurface; - } - if (screen == SDL_VideoSurface) { - if (SDL_VideoViewport.x || SDL_VideoViewport.y) { - SDL_Rect *stackrects = SDL_stack_alloc(SDL_Rect, numrects); - SDL_Rect *stackrect; - const SDL_Rect *rect; - - /* Offset all the rectangles before updating */ - for (i = 0; i < numrects; ++i) { - rect = &rects[i]; - stackrect = &stackrects[i]; - stackrect->x = SDL_VideoViewport.x + rect->x; - stackrect->y = SDL_VideoViewport.y + rect->y; - stackrect->w = rect->w; - stackrect->h = rect->h; - } - SDL_UpdateWindowSurfaceRects(SDL_VideoWindow, stackrects, numrects); - SDL_stack_free(stackrects); - } else { - SDL_UpdateWindowSurfaceRects(SDL_VideoWindow, rects, numrects); - } - } -} - -void -SDL_WM_SetCaption(const char *title, const char *icon) -{ - if (wm_title) { - SDL_free(wm_title); - } - if (title) { - wm_title = SDL_strdup(title); - } else { - wm_title = NULL; - } - SDL_SetWindowTitle(SDL_VideoWindow, wm_title); -} - -void -SDL_WM_GetCaption(const char **title, const char **icon) -{ - if (title) { - *title = wm_title; - } - if (icon) { - *icon = ""; - } -} - -void -SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask) -{ - SDL_VideoIcon = icon; -} - -int -SDL_WM_IconifyWindow(void) -{ - SDL_MinimizeWindow(SDL_VideoWindow); - return 0; -} - -int -SDL_WM_ToggleFullScreen(SDL_Surface * surface) -{ - int length; - void *pixels; - Uint8 *src, *dst; - int row; - int window_w; - int window_h; - - if (!SDL_PublicSurface) { - SDL_SetError("SDL_SetVideoMode() hasn't been called"); - return 0; - } - - /* Copy the old bits out */ - length = SDL_PublicSurface->w * SDL_PublicSurface->format->BytesPerPixel; - pixels = SDL_malloc(SDL_PublicSurface->h * length); - if (pixels) { - src = (Uint8*)SDL_PublicSurface->pixels; - dst = (Uint8*)pixels; - for (row = 0; row < SDL_PublicSurface->h; ++row) { - SDL_memcpy(dst, src, length); - src += SDL_PublicSurface->pitch; - dst += length; - } - } - - /* Do the physical mode switch */ - if (SDL_GetWindowFlags(SDL_VideoWindow) & SDL_WINDOW_FULLSCREEN) { - if (SDL_SetWindowFullscreen(SDL_VideoWindow, 0) < 0) { - return 0; - } - SDL_PublicSurface->flags &= ~SDL_FULLSCREEN; - } else { - if (SDL_SetWindowFullscreen(SDL_VideoWindow, 1) < 0) { - return 0; - } - SDL_PublicSurface->flags |= SDL_FULLSCREEN; - } - - /* Recreate the screen surface */ - SDL_WindowSurface = SDL_GetWindowSurface(SDL_VideoWindow); - if (!SDL_WindowSurface) { - /* We're totally hosed... */ - return 0; - } - - /* Center the public surface in the window surface */ - SDL_GetWindowSize(SDL_VideoWindow, &window_w, &window_h); - SDL_VideoViewport.x = (window_w - SDL_VideoSurface->w)/2; - SDL_VideoViewport.y = (window_h - SDL_VideoSurface->h)/2; - SDL_VideoViewport.w = SDL_VideoSurface->w; - SDL_VideoViewport.h = SDL_VideoSurface->h; - - /* Do some shuffling behind the application's back if format changes */ - if (SDL_VideoSurface->format->format != SDL_WindowSurface->format->format) { - if (SDL_ShadowSurface) { - if (SDL_ShadowSurface->format->format == SDL_WindowSurface->format->format) { - /* Whee! We don't need a shadow surface anymore! */ - SDL_VideoSurface->flags &= ~SDL_DONTFREE; - SDL_FreeSurface(SDL_VideoSurface); - SDL_free(SDL_ShadowSurface->pixels); - SDL_VideoSurface = SDL_ShadowSurface; - SDL_VideoSurface->flags |= SDL_PREALLOC; - SDL_ShadowSurface = NULL; - } else { - /* No problem, just change the video surface format */ - SDL_FreeFormat(SDL_VideoSurface->format); - SDL_VideoSurface->format = SDL_WindowSurface->format; - SDL_VideoSurface->format->refcount++; - SDL_InvalidateMap(SDL_ShadowSurface->map); - } - } else { - /* We can make the video surface the shadow surface */ - SDL_ShadowSurface = SDL_VideoSurface; - SDL_ShadowSurface->pitch = SDL_CalculatePitch(SDL_ShadowSurface); - SDL_ShadowSurface->pixels = SDL_malloc(SDL_ShadowSurface->h * SDL_ShadowSurface->pitch); - if (!SDL_ShadowSurface->pixels) { - /* Uh oh, we're hosed */ - SDL_ShadowSurface = NULL; - return 0; - } - SDL_ShadowSurface->flags &= ~SDL_PREALLOC; - - SDL_VideoSurface = SDL_CreateRGBSurfaceFrom(NULL, 0, 0, 32, 0, 0, 0, 0, 0); - SDL_VideoSurface->flags = SDL_ShadowSurface->flags; - SDL_VideoSurface->flags |= SDL_PREALLOC; - SDL_FreeFormat(SDL_VideoSurface->format); - SDL_VideoSurface->format = SDL_WindowSurface->format; - SDL_VideoSurface->format->refcount++; - SDL_VideoSurface->w = SDL_ShadowSurface->w; - SDL_VideoSurface->h = SDL_ShadowSurface->h; - } - } - - /* Update the video surface */ - SDL_VideoSurface->pitch = SDL_WindowSurface->pitch; - SDL_VideoSurface->pixels = (void *)((Uint8 *)SDL_WindowSurface->pixels + - SDL_VideoViewport.y * SDL_VideoSurface->pitch + - SDL_VideoViewport.x * SDL_VideoSurface->format->BytesPerPixel); - SDL_SetClipRect(SDL_VideoSurface, NULL); - - /* Copy the old bits back */ - if (pixels) { - src = (Uint8*)pixels; - dst = (Uint8*)SDL_PublicSurface->pixels; - for (row = 0; row < SDL_PublicSurface->h; ++row) { - SDL_memcpy(dst, src, length); - src += length; - dst += SDL_PublicSurface->pitch; - } - SDL_Flip(SDL_PublicSurface); - SDL_free(pixels); - } - - /* We're done! */ - return 1; -} - -SDL_GrabMode -SDL_WM_GrabInput(SDL_GrabMode mode) -{ - if (mode != SDL_GRAB_QUERY) { - SDL_SetWindowGrab(SDL_VideoWindow, mode); - } - return (SDL_GrabMode) SDL_GetWindowGrab(SDL_VideoWindow); -} - -void -SDL_WarpMouse(Uint16 x, Uint16 y) -{ - SDL_WarpMouseInWindow(SDL_VideoWindow, x, y); -} - -Uint8 -SDL_GetAppState(void) -{ - Uint8 state = 0; - Uint32 flags = 0; - - flags = SDL_GetWindowFlags(SDL_VideoWindow); - if ((flags & SDL_WINDOW_SHOWN) && !(flags & SDL_WINDOW_MINIMIZED)) { - state |= SDL_APPACTIVE; - } - if (flags & SDL_WINDOW_INPUT_FOCUS) { - state |= SDL_APPINPUTFOCUS; - } - if (flags & SDL_WINDOW_MOUSE_FOCUS) { - state |= SDL_APPMOUSEFOCUS; - } - return state; -} - -const SDL_version * -SDL_Linked_Version(void) -{ - static SDL_version version; - SDL_VERSION(&version); - return &version; -} - -int -SDL_SetPalette(SDL_Surface * surface, int flags, const SDL_Color * colors, - int firstcolor, int ncolors) -{ - return SDL_SetColors(surface, colors, firstcolor, ncolors); -} - -int -SDL_SetColors(SDL_Surface * surface, const SDL_Color * colors, int firstcolor, - int ncolors) -{ - if (SDL_SetPaletteColors - (surface->format->palette, colors, firstcolor, ncolors) == 0) { - return 1; - } else { - return 0; - } -} - -int -SDL_GetWMInfo(SDL_SysWMinfo * info) -{ - return SDL_GetWindowWMInfo(SDL_VideoWindow, info); -} - -#if 0 -void -SDL_MoveCursor(int x, int y) -{ - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - - /* Erase and update the current mouse position */ - if (SHOULD_DRAWCURSOR(SDL_cursorstate)) { - /* Erase and redraw mouse cursor in new position */ - SDL_LockCursor(); - SDL_EraseCursor(SDL_VideoSurface); - SDL_cursor->area.x = (x - SDL_cursor->hot_x); - SDL_cursor->area.y = (y - SDL_cursor->hot_y); - SDL_DrawCursor(SDL_VideoSurface); - SDL_UnlockCursor(); - } else if (_this->MoveWMCursor) { - _this->MoveWMCursor(_this, x, y); - } -} - -/* Keep track of the current cursor colors */ -static int palette_changed = 1; -static Uint8 pixels8[2]; - -void -SDL_CursorPaletteChanged(void) -{ - palette_changed = 1; -} - -void -SDL_MouseRect(SDL_Rect * area) -{ - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - int clip_diff; - - *area = SDL_cursor->area; - if (area->x < 0) { - area->w += area->x; - area->x = 0; - } - if (area->y < 0) { - area->h += area->y; - area->y = 0; - } - clip_diff = (area->x + area->w) - SDL_VideoSurface->w; - if (clip_diff > 0) { - area->w = area->w < clip_diff ? 0 : area->w - clip_diff; - } - clip_diff = (area->y + area->h) - SDL_VideoSurface->h; - if (clip_diff > 0) { - area->h = area->h < clip_diff ? 0 : area->h - clip_diff; - } -} - -static void -SDL_DrawCursorFast(SDL_Surface * screen, SDL_Rect * area) -{ - const Uint32 pixels[2] = { 0xFFFFFFFF, 0x00000000 }; - int i, w, h; - Uint8 *data, datab; - Uint8 *mask, maskb; - - data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8; - mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8; - switch (screen->format->BytesPerPixel) { - - case 1: - { - Uint8 *dst; - int dstskip; - - if (palette_changed) { - pixels8[0] = - (Uint8) SDL_MapRGB(screen->format, 255, 255, 255); - pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0); - palette_changed = 0; - } - dst = (Uint8 *) screen->pixels + - (SDL_cursor->area.y + area->y) * screen->pitch + - SDL_cursor->area.x; - dstskip = screen->pitch - area->w; - - for (h = area->h; h; h--) { - for (w = area->w / 8; w; w--) { - maskb = *mask++; - datab = *data++; - for (i = 0; i < 8; ++i) { - if (maskb & 0x80) { - *dst = pixels8[datab >> 7]; - } - maskb <<= 1; - datab <<= 1; - dst++; - } - } - dst += dstskip; - } - } - break; - - case 2: - { - Uint16 *dst; - int dstskip; - - dst = (Uint16 *) screen->pixels + - (SDL_cursor->area.y + area->y) * screen->pitch / 2 + - SDL_cursor->area.x; - dstskip = (screen->pitch / 2) - area->w; - - for (h = area->h; h; h--) { - for (w = area->w / 8; w; w--) { - maskb = *mask++; - datab = *data++; - for (i = 0; i < 8; ++i) { - if (maskb & 0x80) { - *dst = (Uint16) pixels[datab >> 7]; - } - maskb <<= 1; - datab <<= 1; - dst++; - } - } - dst += dstskip; - } - } - break; - - case 3: - { - Uint8 *dst; - int dstskip; - - dst = (Uint8 *) screen->pixels + - (SDL_cursor->area.y + area->y) * screen->pitch + - SDL_cursor->area.x * 3; - dstskip = screen->pitch - area->w * 3; - - for (h = area->h; h; h--) { - for (w = area->w / 8; w; w--) { - maskb = *mask++; - datab = *data++; - for (i = 0; i < 8; ++i) { - if (maskb & 0x80) { - SDL_memset(dst, pixels[datab >> 7], 3); - } - maskb <<= 1; - datab <<= 1; - dst += 3; - } - } - dst += dstskip; - } - } - break; - - case 4: - { - Uint32 *dst; - int dstskip; - - dst = (Uint32 *) screen->pixels + - (SDL_cursor->area.y + area->y) * screen->pitch / 4 + - SDL_cursor->area.x; - dstskip = (screen->pitch / 4) - area->w; - - for (h = area->h; h; h--) { - for (w = area->w / 8; w; w--) { - maskb = *mask++; - datab = *data++; - for (i = 0; i < 8; ++i) { - if (maskb & 0x80) { - *dst = pixels[datab >> 7]; - } - maskb <<= 1; - datab <<= 1; - dst++; - } - } - dst += dstskip; - } - } - break; - } -} - -static void -SDL_DrawCursorSlow(SDL_Surface * screen, SDL_Rect * area) -{ - const Uint32 pixels[2] = { 0xFFFFFF, 0x000000 }; - int h; - int x, minx, maxx; - Uint8 *data, datab = 0; - Uint8 *mask, maskb = 0; - Uint8 *dst; - int dstbpp, dstskip; - - data = SDL_cursor->data + area->y * SDL_cursor->area.w / 8; - mask = SDL_cursor->mask + area->y * SDL_cursor->area.w / 8; - dstbpp = screen->format->BytesPerPixel; - dst = (Uint8 *) screen->pixels + - (SDL_cursor->area.y + area->y) * screen->pitch + - SDL_cursor->area.x * dstbpp; - dstskip = screen->pitch - SDL_cursor->area.w * dstbpp; - - minx = area->x; - maxx = area->x + area->w; - if (screen->format->BytesPerPixel == 1) { - if (palette_changed) { - pixels8[0] = (Uint8) SDL_MapRGB(screen->format, 255, 255, 255); - pixels8[1] = (Uint8) SDL_MapRGB(screen->format, 0, 0, 0); - palette_changed = 0; - } - for (h = area->h; h; h--) { - for (x = 0; x < SDL_cursor->area.w; ++x) { - if ((x % 8) == 0) { - maskb = *mask++; - datab = *data++; - } - if ((x >= minx) && (x < maxx)) { - if (maskb & 0x80) { - SDL_memset(dst, pixels8[datab >> 7], dstbpp); - } - } - maskb <<= 1; - datab <<= 1; - dst += dstbpp; - } - dst += dstskip; - } - } else { - for (h = area->h; h; h--) { - for (x = 0; x < SDL_cursor->area.w; ++x) { - if ((x % 8) == 0) { - maskb = *mask++; - datab = *data++; - } - if ((x >= minx) && (x < maxx)) { - if (maskb & 0x80) { - SDL_memset(dst, pixels[datab >> 7], dstbpp); - } - } - maskb <<= 1; - datab <<= 1; - dst += dstbpp; - } - dst += dstskip; - } - } -} - -/* This handles the ugly work of converting the saved cursor background from - the pixel format of the shadow surface to that of the video surface. - This is only necessary when blitting from a shadow surface of a different - pixel format than the video surface, and using a software rendered cursor. -*/ -static void -SDL_ConvertCursorSave(SDL_Surface * screen, int w, int h) -{ - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - SDL_BlitInfo info; - SDL_loblit RunBlit; - - /* Make sure we can steal the blit mapping */ - if (screen->map->dst != SDL_VideoSurface) { - return; - } - - /* Set up the blit information */ - info.s_pixels = SDL_cursor->save[1]; - info.s_width = w; - info.s_height = h; - info.s_skip = 0; - info.d_pixels = SDL_cursor->save[0]; - info.d_width = w; - info.d_height = h; - info.d_skip = 0; - info.aux_data = screen->map->sw_data->aux_data; - info.src = screen->format; - info.table = screen->map->table; - info.dst = SDL_VideoSurface->format; - RunBlit = screen->map->sw_data->blit; - - /* Run the actual software blit */ - RunBlit(&info); -} - -void -SDL_DrawCursorNoLock(SDL_Surface * screen) -{ - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - SDL_Rect area; - - /* Get the mouse rectangle, clipped to the screen */ - SDL_MouseRect(&area); - if ((area.w == 0) || (area.h == 0)) { - return; - } - - /* Copy mouse background */ - { - int w, h, screenbpp; - Uint8 *src, *dst; - - /* Set up the copy pointers */ - screenbpp = screen->format->BytesPerPixel; - if ((screen == SDL_VideoSurface) || - FORMAT_EQUAL(screen->format, SDL_VideoSurface->format)) { - dst = SDL_cursor->save[0]; - } else { - dst = SDL_cursor->save[1]; - } - src = (Uint8 *) screen->pixels + area.y * screen->pitch + - area.x * screenbpp; - - /* Perform the copy */ - w = area.w * screenbpp; - h = area.h; - while (h--) { - SDL_memcpy(dst, src, w); - dst += w; - src += screen->pitch; - } - } - - /* Draw the mouse cursor */ - area.x -= SDL_cursor->area.x; - area.y -= SDL_cursor->area.y; - if ((area.x == 0) && (area.w == SDL_cursor->area.w)) { - SDL_DrawCursorFast(screen, &area); - } else { - SDL_DrawCursorSlow(screen, &area); - } -} - -void -SDL_DrawCursor(SDL_Surface * screen) -{ - /* Lock the screen if necessary */ - if (screen == NULL) { - return; - } - if (SDL_MUSTLOCK(screen)) { - if (SDL_LockSurface(screen) < 0) { - return; - } - } - - SDL_DrawCursorNoLock(screen); - - /* Unlock the screen and update if necessary */ - if (SDL_MUSTLOCK(screen)) { - SDL_UnlockSurface(screen); - } - if (screen->flags & SDL_SCREEN_SURFACE) { - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - SDL_Window *window; - SDL_Rect area; - - window = SDL_GetWindowFromSurface(screen); - if (!window) { - return; - } - - SDL_MouseRect(&area); - - if (_this->UpdateWindowSurface) { - _this->UpdateWindowSurface(_this, window, 1, &area); - } - } -} - -void -SDL_EraseCursorNoLock(SDL_Surface * screen) -{ - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - SDL_Window *window; - SDL_Rect area; - - /* Get the window associated with the surface */ - window = SDL_GetWindowFromSurface(screen); - if (!window || !window->surface) { - return; - } - - /* Get the mouse rectangle, clipped to the screen */ - SDL_MouseRect(&area); - if ((area.w == 0) || (area.h == 0)) { - return; - } - - /* Copy mouse background */ - { - int w, h, screenbpp; - Uint8 *src, *dst; - - /* Set up the copy pointers */ - screenbpp = screen->format->BytesPerPixel; - if ((screen->flags & SDL_SCREEN_SURFACE) || - FORMAT_EQUAL(screen->format, window->surface->format)) { - src = SDL_cursor->save[0]; - } else { - src = SDL_cursor->save[1]; - } - dst = (Uint8 *) screen->pixels + area.y * screen->pitch + - area.x * screenbpp; - - /* Perform the copy */ - w = area.w * screenbpp; - h = area.h; - while (h--) { - SDL_memcpy(dst, src, w); - src += w; - dst += screen->pitch; - } - - /* Perform pixel conversion on cursor background */ - if (src > SDL_cursor->save[1]) { - SDL_ConvertCursorSave(screen, area.w, area.h); - } - } -} - -void -SDL_EraseCursor(SDL_Surface * screen) -{ - /* Lock the screen if necessary */ - if (screen == NULL) { - return; - } - if (SDL_MUSTLOCK(screen)) { - if (SDL_LockSurface(screen) < 0) { - return; - } - } - - SDL_EraseCursorNoLock(screen); - - /* Unlock the screen and update if necessary */ - if (SDL_MUSTLOCK(screen)) { - SDL_UnlockSurface(screen); - } - if (screen->flags & SDL_SCREEN_SURFACE) { - SDL_VideoDevice *_this = SDL_GetVideoDevice(); - SDL_Window *window; - SDL_Rect area; - - window = SDL_GetWindowFromSurface(screen); - if (!window) { - return; - } - - SDL_MouseRect(&area); - - if (_this->UpdateWindowSurface) { - _this->UpdateWindowSurface(_this, window, 1, &area); - } - } -} - -/* Reset the cursor on video mode change - FIXME: Keep track of all cursors, and reset them all. - */ -void -SDL_ResetCursor(void) -{ - int savelen; - - if (SDL_cursor) { - savelen = SDL_cursor->area.w * 4 * SDL_cursor->area.h; - SDL_cursor->area.x = 0; - SDL_cursor->area.y = 0; - SDL_memset(SDL_cursor->save[0], 0, savelen); - } -} -#endif - -struct private_yuvhwdata -{ - SDL_SW_YUVTexture *texture; - SDL_Surface *display; - Uint32 display_format; -}; - -SDL_Overlay * -SDL_CreateYUVOverlay(int w, int h, Uint32 format, SDL_Surface * display) -{ - SDL_Overlay *overlay; - Uint32 texture_format; - SDL_SW_YUVTexture *texture; - - if ((display->flags & SDL_OPENGL) == SDL_OPENGL) { - SDL_SetError("YUV overlays are not supported in OpenGL mode"); - return NULL; - } - - if (display != SDL_PublicSurface) { - SDL_SetError("YUV display is only supported on the screen surface"); - return NULL; - } - - switch (format) { - case SDL_YV12_OVERLAY: - texture_format = SDL_PIXELFORMAT_YV12; - break; - case SDL_IYUV_OVERLAY: - texture_format = SDL_PIXELFORMAT_IYUV; - break; - case SDL_YUY2_OVERLAY: - texture_format = SDL_PIXELFORMAT_YUY2; - break; - case SDL_UYVY_OVERLAY: - texture_format = SDL_PIXELFORMAT_UYVY; - break; - case SDL_YVYU_OVERLAY: - texture_format = SDL_PIXELFORMAT_YVYU; - break; - default: - SDL_SetError("Unknown YUV format"); - return NULL; - } - - overlay = (SDL_Overlay *) SDL_malloc(sizeof(*overlay)); - if (!overlay) { - SDL_OutOfMemory(); - return NULL; - } - SDL_zerop(overlay); - - overlay->hwdata = - (struct private_yuvhwdata *) SDL_malloc(sizeof(*overlay->hwdata)); - if (!overlay->hwdata) { - SDL_free(overlay); - SDL_OutOfMemory(); - return NULL; - } - - texture = SDL_SW_CreateYUVTexture(texture_format, w, h); - if (!texture) { - SDL_free(overlay->hwdata); - SDL_free(overlay); - return NULL; - } - overlay->hwdata->texture = texture; - overlay->hwdata->display = NULL; - overlay->hwdata->display_format = SDL_PIXELFORMAT_UNKNOWN; - - overlay->format = format; - overlay->w = w; - overlay->h = h; - if (format == SDL_YV12_OVERLAY || format == SDL_IYUV_OVERLAY) { - overlay->planes = 3; - } else { - overlay->planes = 1; - } - overlay->pitches = texture->pitches; - overlay->pixels = texture->planes; - - return overlay; -} - -int -SDL_LockYUVOverlay(SDL_Overlay * overlay) -{ - SDL_Rect rect; - void *pixels; - int pitch; - - if (!overlay) { - SDL_SetError("Passed a NULL overlay"); - return -1; - } - - rect.x = 0; - rect.y = 0; - rect.w = overlay->w; - rect.h = overlay->h; - - if (SDL_SW_LockYUVTexture(overlay->hwdata->texture, &rect, &pixels, &pitch) < 0) { - return -1; - } - - overlay->pixels[0] = (Uint8 *) pixels; - overlay->pitches[0] = pitch; - switch (overlay->format) { - case SDL_YV12_OVERLAY: - case SDL_IYUV_OVERLAY: - overlay->pitches[1] = pitch / 2; - overlay->pitches[2] = pitch / 2; - overlay->pixels[1] = - overlay->pixels[0] + overlay->pitches[0] * overlay->h; - overlay->pixels[2] = - overlay->pixels[1] + overlay->pitches[1] * overlay->h / 2; - break; - case SDL_YUY2_OVERLAY: - case SDL_UYVY_OVERLAY: - case SDL_YVYU_OVERLAY: - break; - } - return 0; -} - -void -SDL_UnlockYUVOverlay(SDL_Overlay * overlay) -{ - if (!overlay) { - return; - } - - SDL_SW_UnlockYUVTexture(overlay->hwdata->texture); -} - -int -SDL_DisplayYUVOverlay(SDL_Overlay * overlay, SDL_Rect * dstrect) -{ - SDL_Surface *display; - SDL_Rect src_rect; - SDL_Rect dst_rect; - void *pixels; - - if (!overlay || !dstrect) { - SDL_SetError("Passed a NULL overlay or dstrect"); - return -1; - } - - display = overlay->hwdata->display; - if (display != SDL_VideoSurface) { - overlay->hwdata->display = display = SDL_VideoSurface; - overlay->hwdata->display_format = SDL_MasksToPixelFormatEnum( - display->format->BitsPerPixel, - display->format->Rmask, - display->format->Gmask, - display->format->Bmask, - display->format->Amask); - } - - src_rect.x = 0; - src_rect.y = 0; - src_rect.w = overlay->w; - src_rect.h = overlay->h; - - if (!SDL_IntersectRect(&display->clip_rect, dstrect, &dst_rect)) { - return 0; - } - - pixels = (void *)((Uint8 *)display->pixels + - dst_rect.y * display->pitch + - dst_rect.x * display->format->BytesPerPixel); - - if (SDL_SW_CopyYUVToRGB(overlay->hwdata->texture, &src_rect, - overlay->hwdata->display_format, - dst_rect.w, dst_rect.h, - pixels, display->pitch) < 0) { - return -1; - } - SDL_UpdateWindowSurface(SDL_VideoWindow); - return 0; -} - -void -SDL_FreeYUVOverlay(SDL_Overlay * overlay) -{ - if (!overlay) { - return; - } - if (overlay->hwdata) { - if (overlay->hwdata->texture) { - SDL_SW_DestroyYUVTexture(overlay->hwdata->texture); - } - SDL_free(overlay->hwdata); - } - SDL_free(overlay); -} - -void -SDL_GL_SwapBuffers(void) -{ - SDL_GL_SwapWindow(SDL_VideoWindow); -} - -int -SDL_SetGamma(float red, float green, float blue) -{ - Uint16 red_ramp[256]; - Uint16 green_ramp[256]; - Uint16 blue_ramp[256]; - - SDL_CalculateGammaRamp(red, red_ramp); - if (green == red) { - SDL_memcpy(green_ramp, red_ramp, sizeof(red_ramp)); - } else { - SDL_CalculateGammaRamp(green, green_ramp); - } - if (blue == red) { - SDL_memcpy(blue_ramp, red_ramp, sizeof(red_ramp)); - } else { - SDL_CalculateGammaRamp(blue, blue_ramp); - } - return SDL_SetWindowGammaRamp(SDL_VideoWindow, red_ramp, green_ramp, blue_ramp); -} - -int -SDL_SetGammaRamp(const Uint16 * red, const Uint16 * green, const Uint16 * blue) -{ - return SDL_SetWindowGammaRamp(SDL_VideoWindow, red, green, blue); -} - -int -SDL_GetGammaRamp(Uint16 * red, Uint16 * green, Uint16 * blue) -{ - return SDL_GetWindowGammaRamp(SDL_VideoWindow, red, green, blue); -} - -int -SDL_EnableKeyRepeat(int delay, int interval) -{ - return 0; -} - -void -SDL_GetKeyRepeat(int *delay, int *interval) -{ - if (delay) { - *delay = SDL_DEFAULT_REPEAT_DELAY; - } - if (interval) { - *interval = SDL_DEFAULT_REPEAT_INTERVAL; - } -} - -int -SDL_EnableUNICODE(int enable) -{ - int previous = SDL_enabled_UNICODE; - - switch (enable) { - case 1: - SDL_enabled_UNICODE = 1; - SDL_StartTextInput(); - break; - case 0: - SDL_enabled_UNICODE = 0; - SDL_StopTextInput(); - break; - } - return previous; -} - -static Uint32 -SDL_SetTimerCallback(Uint32 interval, void* param) -{ - return ((SDL_OldTimerCallback)param)(interval); -} - -int -SDL_SetTimer(Uint32 interval, SDL_OldTimerCallback callback) -{ - static SDL_TimerID compat_timer; - - if (compat_timer) { - SDL_RemoveTimer(compat_timer); - compat_timer = 0; - } - - if (interval && callback) { - compat_timer = SDL_AddTimer(interval, SDL_SetTimerCallback, callback); - if (!compat_timer) { - return -1; - } - } - return 0; -} - -int -SDL_putenv(const char *_var) -{ - char *ptr = NULL; - char *var = SDL_strdup(_var); - if (var == NULL) { - return -1; /* we don't set errno. */ - } - - ptr = SDL_strchr(var, '='); - if (ptr == NULL) { - SDL_free(var); - return -1; - } - - *ptr = '\0'; /* split the string into name and value. */ - SDL_setenv(var, ptr + 1, 1); - SDL_free(var); - return 0; -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_error.c b/src/helper/android/SDL1.3/src/SDL_error.c deleted file mode 100644 index b86a96254..000000000 --- a/src/helper/android/SDL1.3/src/SDL_error.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Simple error handling in SDL */ - -#include "SDL_log.h" -#include "SDL_error.h" -#include "SDL_error_c.h" - - -/* Routine to get the thread-specific error variable */ -#if SDL_THREADS_DISABLED -/* The default (non-thread-safe) global error variable */ -static SDL_error SDL_global_error; -#define SDL_GetErrBuf() (&SDL_global_error) -#else -extern SDL_error *SDL_GetErrBuf(void); -#endif /* SDL_THREADS_DISABLED */ - -#define SDL_ERRBUFIZE 1024 - -/* Private functions */ - -static const char * -SDL_LookupString(const char *key) -{ - /* FIXME: Add code to lookup key in language string hash-table */ - return key; -} - -/* Public functions */ - -void -SDL_SetError(const char *fmt, ...) -{ - va_list ap; - SDL_error *error; - - /* Copy in the key, mark error as valid */ - error = SDL_GetErrBuf(); - error->error = 1; - SDL_strlcpy((char *) error->key, fmt, sizeof(error->key)); - - va_start(ap, fmt); - error->argc = 0; - while (*fmt) { - if (*fmt++ == '%') { - while (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) { - ++fmt; - } - switch (*fmt++) { - case 0: /* Malformed format string.. */ - --fmt; - break; - case 'c': - case 'i': - case 'd': - case 'u': - case 'o': - case 'x': - case 'X': - error->args[error->argc++].value_i = va_arg(ap, int); - break; - case 'f': - error->args[error->argc++].value_f = va_arg(ap, double); - break; - case 'p': - error->args[error->argc++].value_ptr = va_arg(ap, void *); - break; - case 's': - { - int i = error->argc; - const char *str = va_arg(ap, const char *); - if (str == NULL) - str = "(null)"; - SDL_strlcpy((char *) error->args[i].buf, str, - ERR_MAX_STRLEN); - error->argc++; - } - break; - default: - break; - } - if (error->argc >= ERR_MAX_ARGS) { - break; - } - } - } - va_end(ap); - - /* If we are in debug mode, print out an error message */ - SDL_LogError(SDL_LOG_CATEGORY_ERROR, "%s", SDL_GetError()); -} - -/* This function has a bit more overhead than most error functions - so that it supports internationalization and thread-safe errors. -*/ -static char * -SDL_GetErrorMsg(char *errstr, unsigned int maxlen) -{ - SDL_error *error; - - /* Clear the error string */ - *errstr = '\0'; - --maxlen; - - /* Get the thread-safe error, and print it out */ - error = SDL_GetErrBuf(); - if (error->error) { - const char *fmt; - char *msg = errstr; - int len; - int argi; - - fmt = SDL_LookupString(error->key); - argi = 0; - while (*fmt && (maxlen > 0)) { - if (*fmt == '%') { - char tmp[32], *spot = tmp; - *spot++ = *fmt++; - while ((*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) - && spot < (tmp + SDL_arraysize(tmp) - 2)) { - *spot++ = *fmt++; - } - *spot++ = *fmt++; - *spot++ = '\0'; - switch (spot[-2]) { - case '%': - *msg++ = '%'; - maxlen -= 1; - break; - case 'c': - case 'i': - case 'd': - case 'u': - case 'o': - case 'x': - case 'X': - len = - SDL_snprintf(msg, maxlen, tmp, - error->args[argi++].value_i); - msg += len; - maxlen -= len; - break; - case 'f': - len = - SDL_snprintf(msg, maxlen, tmp, - error->args[argi++].value_f); - msg += len; - maxlen -= len; - break; - case 'p': - len = - SDL_snprintf(msg, maxlen, tmp, - error->args[argi++].value_ptr); - msg += len; - maxlen -= len; - break; - case 's': - len = - SDL_snprintf(msg, maxlen, tmp, - SDL_LookupString(error->args[argi++]. - buf)); - msg += len; - maxlen -= len; - break; - } - } else { - *msg++ = *fmt++; - maxlen -= 1; - } - } - *msg = 0; /* NULL terminate the string */ - } - return (errstr); -} - -/* Available for backwards compatibility */ -const char * -SDL_GetError(void) -{ - static char errmsg[SDL_ERRBUFIZE]; - - return SDL_GetErrorMsg(errmsg, SDL_ERRBUFIZE); -} - -void -SDL_ClearError(void) -{ - SDL_error *error; - - error = SDL_GetErrBuf(); - error->error = 0; -} - -/* Very common errors go here */ -void -SDL_Error(SDL_errorcode code) -{ - switch (code) { - case SDL_ENOMEM: - SDL_SetError("Out of memory"); - break; - case SDL_EFREAD: - SDL_SetError("Error reading from datastream"); - break; - case SDL_EFWRITE: - SDL_SetError("Error writing to datastream"); - break; - case SDL_EFSEEK: - SDL_SetError("Error seeking in datastream"); - break; - case SDL_UNSUPPORTED: - SDL_SetError("That operation is not supported"); - break; - default: - SDL_SetError("Unknown SDL error"); - break; - } -} - -#ifdef TEST_ERROR -int -main(int argc, char *argv[]) -{ - char buffer[BUFSIZ + 1]; - - SDL_SetError("Hi there!"); - printf("Error 1: %s\n", SDL_GetError()); - SDL_ClearError(); - SDL_memset(buffer, '1', BUFSIZ); - buffer[BUFSIZ] = 0; - SDL_SetError("This is the error: %s (%f)", buffer, 1.0); - printf("Error 2: %s\n", SDL_GetError()); - exit(0); -} -#endif - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_error_c.h b/src/helper/android/SDL1.3/src/SDL_error_c.h deleted file mode 100644 index 9b0d84cc0..000000000 --- a/src/helper/android/SDL1.3/src/SDL_error_c.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* This file defines a structure that carries language-independent - error messages -*/ - -#ifndef _SDL_error_c_h -#define _SDL_error_c_h - -#define ERR_MAX_STRLEN 128 -#define ERR_MAX_ARGS 5 - -typedef struct SDL_error -{ - /* This is a numeric value corresponding to the current error */ - int error; - - /* This is a key used to index into a language hashtable containing - internationalized versions of the SDL error messages. If the key - is not in the hashtable, or no hashtable is available, the key is - used directly as an error message format string. - */ - char key[ERR_MAX_STRLEN]; - - /* These are the arguments for the error functions */ - int argc; - union - { - void *value_ptr; -#if 0 /* What is a character anyway? (UNICODE issues) */ - unsigned char value_c; -#endif - int value_i; - double value_f; - char buf[ERR_MAX_STRLEN]; - } args[ERR_MAX_ARGS]; -} SDL_error; - -#endif /* _SDL_error_c_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_fatal.c b/src/helper/android/SDL1.3/src/SDL_fatal.c deleted file mode 100644 index 5890e5e0e..000000000 --- a/src/helper/android/SDL1.3/src/SDL_fatal.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* General fatal signal handling code for SDL */ - -#ifdef HAVE_SIGNAL_H - -#include - -#include "SDL.h" -#include "SDL_fatal.h" - -/* This installs some signal handlers for the more common fatal signals, - so that if the programmer is lazy, the app doesn't die so horribly if - the program crashes. -*/ - -static void -SDL_Parachute(int sig) -{ - signal(sig, SIG_DFL); - SDL_Quit(); - raise(sig); -} - -static const int SDL_fatal_signals[] = { - SIGSEGV, -#ifdef SIGBUS - SIGBUS, -#endif -#ifdef SIGFPE - SIGFPE, -#endif -#ifdef SIGQUIT - SIGQUIT, -#endif - 0 -}; - -void -SDL_InstallParachute(void) -{ - /* Set a handler for any fatal signal not already handled */ - int i; -#ifdef HAVE_SIGACTION - struct sigaction action; - - for (i = 0; SDL_fatal_signals[i]; ++i) { - sigaction(SDL_fatal_signals[i], NULL, &action); - if (action.sa_handler == SIG_DFL) { - action.sa_handler = SDL_Parachute; - sigaction(SDL_fatal_signals[i], &action, NULL); - } - } -#ifdef SIGALRM - /* Set SIGALRM to be ignored -- necessary on Solaris */ - sigaction(SIGALRM, NULL, &action); - if (action.sa_handler == SIG_DFL) { - action.sa_handler = SIG_IGN; - sigaction(SIGALRM, &action, NULL); - } -#endif -#else - void (*ohandler) (int); - - for (i = 0; SDL_fatal_signals[i]; ++i) { - ohandler = signal(SDL_fatal_signals[i], SDL_Parachute); - if (ohandler != SIG_DFL) { - signal(SDL_fatal_signals[i], ohandler); - } - } -#endif /* HAVE_SIGACTION */ - return; -} - -void -SDL_UninstallParachute(void) -{ - /* Remove a handler for any fatal signal handled */ - int i; -#ifdef HAVE_SIGACTION - struct sigaction action; - - for (i = 0; SDL_fatal_signals[i]; ++i) { - sigaction(SDL_fatal_signals[i], NULL, &action); - if (action.sa_handler == SDL_Parachute) { - action.sa_handler = SIG_DFL; - sigaction(SDL_fatal_signals[i], &action, NULL); - } - } -#else - void (*ohandler) (int); - - for (i = 0; SDL_fatal_signals[i]; ++i) { - ohandler = signal(SDL_fatal_signals[i], SIG_DFL); - if (ohandler != SDL_Parachute) { - signal(SDL_fatal_signals[i], ohandler); - } - } -#endif /* HAVE_SIGACTION */ -} - -#else - -/* No signals on this platform, nothing to do.. */ - -void -SDL_InstallParachute(void) -{ - return; -} - -void -SDL_UninstallParachute(void) -{ - return; -} - -#endif /* HAVE_SIGNAL_H */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_fatal.h b/src/helper/android/SDL1.3/src/SDL_fatal.h deleted file mode 100644 index 2b7918a33..000000000 --- a/src/helper/android/SDL1.3/src/SDL_fatal.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* General fatal signal handling code for SDL */ - -extern void SDL_InstallParachute(void); -extern void SDL_UninstallParachute(void); -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_hints.c b/src/helper/android/SDL1.3/src/SDL_hints.c deleted file mode 100644 index 8aabb1926..000000000 --- a/src/helper/android/SDL1.3/src/SDL_hints.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_hints.h" - - -/* Assuming there aren't many hints set and they aren't being queried in - critical performance paths, we'll just use a linked list here. - */ -typedef struct SDL_Hint { - char *name; - char *value; - SDL_HintPriority priority; - struct SDL_Hint *next; -} SDL_Hint; - -static SDL_Hint *SDL_hints; - - -SDL_bool -SDL_SetHintWithPriority(const char *name, const char *value, - SDL_HintPriority priority) -{ - const char *env; - SDL_Hint *prev, *hint; - - if (!name || !value) { - return SDL_FALSE; - } - - env = SDL_getenv(name); - if (env && priority < SDL_HINT_OVERRIDE) { - return SDL_FALSE; - } - - prev = NULL; - for (hint = SDL_hints; hint; prev = hint, hint = hint->next) { - if (SDL_strcmp(name, hint->name) == 0) { - if (priority < hint->priority) { - return SDL_FALSE; - } - if (SDL_strcmp(hint->value, value) != 0) { - SDL_free(hint->value); - hint->value = SDL_strdup(value); - } - hint->priority = priority; - return SDL_TRUE; - } - } - - /* Couldn't find the hint, add a new one */ - hint = (SDL_Hint *)SDL_malloc(sizeof(*hint)); - if (!hint) { - return SDL_FALSE; - } - hint->name = SDL_strdup(name); - hint->value = SDL_strdup(value); - hint->priority = priority; - hint->next = SDL_hints; - SDL_hints = hint; - return SDL_TRUE; -} - -SDL_bool -SDL_SetHint(const char *name, const char *value) -{ - return SDL_SetHintWithPriority(name, value, SDL_HINT_NORMAL); -} - -const char * -SDL_GetHint(const char *name) -{ - const char *env; - SDL_Hint *hint; - - env = SDL_getenv(name); - for (hint = SDL_hints; hint; hint = hint->next) { - if (SDL_strcmp(name, hint->name) == 0) { - if (!env || hint->priority == SDL_HINT_OVERRIDE) { - return hint->value; - } - break; - } - } - return env; -} - -void SDL_ClearHints(void) -{ - SDL_Hint *hint; - - while (SDL_hints) { - hint = SDL_hints; - SDL_hints = hint->next; - - SDL_free(hint->name); - SDL_free(hint->value); - SDL_free(hint); - } -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/SDL_log.c b/src/helper/android/SDL1.3/src/SDL_log.c deleted file mode 100644 index f87a9e7df..000000000 --- a/src/helper/android/SDL1.3/src/SDL_log.c +++ /dev/null @@ -1,330 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Simple log messages in SDL */ - -#include "SDL_log.h" - -#if HAVE_STDIO_H -#include -#endif - -#if defined(__WIN32__) -#include "core/windows/SDL_windows.h" -#elif defined(__ANDROID__) -#include -#endif - -#define DEFAULT_PRIORITY SDL_LOG_PRIORITY_CRITICAL -#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO - -typedef struct SDL_LogLevel -{ - int category; - SDL_LogPriority priority; - struct SDL_LogLevel *next; -} SDL_LogLevel; - -/* The default log output function */ -static void SDL_LogOutput(void *userdata, - int category, SDL_LogPriority priority, - const char *message); - -static SDL_LogLevel *SDL_loglevels; -static SDL_LogPriority SDL_application_priority = DEFAULT_APPLICATION_PRIORITY; -static SDL_LogPriority SDL_default_priority = DEFAULT_PRIORITY; -static SDL_LogOutputFunction SDL_log_function = SDL_LogOutput; -static void *SDL_log_userdata = NULL; - -static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = { - NULL, - "VERBOSE", - "DEBUG", - "INFO", - "WARN", - "ERROR", - "CRITICAL" -}; - -#ifdef __ANDROID__ -static const char *SDL_category_prefixes[SDL_LOG_CATEGORY_RESERVED1] = { - "APP", - "ERROR", - "SYSTEM", - "AUDIO", - "VIDEO", - "RENDER", - "INPUT" -}; - -static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = { - ANDROID_LOG_VERBOSE, - ANDROID_LOG_DEBUG, - ANDROID_LOG_INFO, - ANDROID_LOG_WARN, - ANDROID_LOG_ERROR, - ANDROID_LOG_FATAL -}; -#endif /* __ANDROID__ */ - - -void -SDL_LogSetAllPriority(SDL_LogPriority priority) -{ - SDL_LogLevel *entry; - - for (entry = SDL_loglevels; entry; entry = entry->next) { - entry->priority = priority; - } - SDL_application_priority = SDL_default_priority = priority; -} - -void -SDL_LogSetPriority(int category, SDL_LogPriority priority) -{ - SDL_LogLevel *entry; - - for (entry = SDL_loglevels; entry; entry = entry->next) { - if (entry->category == category) { - entry->priority = priority; - return; - } - } - - /* Create a new entry */ - entry = (SDL_LogLevel *)SDL_malloc(sizeof(*entry)); - if (entry) { - entry->category = category; - entry->priority = priority; - entry->next = SDL_loglevels; - SDL_loglevels = entry; - } -} - -SDL_LogPriority -SDL_LogGetPriority(int category) -{ - SDL_LogLevel *entry; - - for (entry = SDL_loglevels; entry; entry = entry->next) { - if (entry->category == category) { - return entry->priority; - } - } - - if (category == SDL_LOG_CATEGORY_APPLICATION) { - return SDL_application_priority; - } else { - return SDL_default_priority; - } -} - -void -SDL_LogResetPriorities(void) -{ - SDL_LogLevel *entry; - - while (SDL_loglevels) { - entry = SDL_loglevels; - SDL_loglevels = entry->next; - SDL_free(entry); - } - - SDL_application_priority = DEFAULT_APPLICATION_PRIORITY; - SDL_default_priority = DEFAULT_PRIORITY; -} - -void -SDL_Log(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, fmt, ap); - va_end(ap); -} - -void -SDL_LogVerbose(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_VERBOSE, fmt, ap); - va_end(ap); -} - -void -SDL_LogDebug(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_DEBUG, fmt, ap); - va_end(ap); -} - -void -SDL_LogInfo(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_INFO, fmt, ap); - va_end(ap); -} - -void -SDL_LogWarn(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_WARN, fmt, ap); - va_end(ap); -} - -void -SDL_LogError(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_ERROR, fmt, ap); - va_end(ap); -} - -void -SDL_LogCritical(int category, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, SDL_LOG_PRIORITY_CRITICAL, fmt, ap); - va_end(ap); -} - -void -SDL_LogMessage(int category, SDL_LogPriority priority, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - SDL_LogMessageV(category, priority, fmt, ap); - va_end(ap); -} - -#ifdef __ANDROID__ -static const char * -GetCategoryPrefix(int category) -{ - if (category < SDL_LOG_CATEGORY_RESERVED1) { - return SDL_category_prefixes[category]; - } - if (category < SDL_LOG_CATEGORY_CUSTOM) { - return "RESERVED"; - } - return "CUSTOM"; -} -#endif /* __ANDROID__ */ - -void -SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap) -{ - char *message; - - /* Nothing to do if we don't have an output function */ - if (!SDL_log_function) { - return; - } - - /* Make sure we don't exceed array bounds */ - if (priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) { - return; - } - - /* See if we want to do anything with this message */ - if (priority < SDL_LogGetPriority(category)) { - return; - } - - message = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE); - if (!message) { - return; - } - SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap); - SDL_log_function(SDL_log_userdata, category, priority, message); - SDL_stack_free(message); -} - -static void -SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority, - const char *message) -{ -#if defined(__WIN32__) - /* Way too many allocations here, urgh */ - { - char *output; - size_t length; - LPTSTR tstr; - - length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1; - output = SDL_stack_alloc(char, length); - SDL_snprintf(output, length, "%s: %s", SDL_priority_prefixes[priority], message); - tstr = WIN_UTF8ToString(output); - OutputDebugString(tstr); - SDL_free(tstr); - SDL_stack_free(output); - } -#elif defined(__ANDROID__) - { - char tag[32]; - - SDL_snprintf(tag, SDL_arraysize(tag), "SDL/%s", GetCategoryPrefix(category)); - __android_log_write(SDL_android_priority[priority], tag, message); - } -#endif -#if HAVE_STDIO_H - fprintf(stderr, "%s: %s\n", SDL_priority_prefixes[priority], message); -#endif -} - -void -SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata) -{ - if (callback) { - *callback = SDL_log_function; - } - if (userdata) { - *userdata = SDL_log_userdata; - } -} - -void -SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata) -{ - SDL_log_function = callback; - SDL_log_userdata = userdata; -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/atomic/SDL_atomic.c b/src/helper/android/SDL1.3/src/atomic/SDL_atomic.c deleted file mode 100644 index 9dd5ab4e6..000000000 --- a/src/helper/android/SDL1.3/src/atomic/SDL_atomic.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_stdinc.h" - -#include "SDL_atomic.h" - -/* Note that we undefine the atomic operations here, in case they are - defined as compiler intrinsics while building SDL but the library user - doesn't have that compiler. That way we always have a working set of - atomic operations built into the library. -*/ - -/* - If any of the operations are not provided then we must emulate some - of them. That means we need a nice implementation of spin locks - that avoids the "one big lock" problem. We use a vector of spin - locks and pick which one to use based on the address of the operand - of the function. - - To generate the index of the lock we first shift by 3 bits to get - rid on the zero bits that result from 32 and 64 bit allignment of - data. We then mask off all but 5 bits and use those 5 bits as an - index into the table. - - Picking the lock this way insures that accesses to the same data at - the same time will go to the same lock. OTOH, accesses to different - data have only a 1/32 chance of hitting the same lock. That should - pretty much eliminate the chances of several atomic operations on - different data from waiting on the same "big lock". If it isn't - then the table of locks can be expanded to a new size so long as - the new size is a power of two. - - Contributed by Bob Pendleton, bob@pendleton.com -*/ - -static SDL_SpinLock locks[32]; - -static __inline__ void -enterLock(void *a) -{ - uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f); - - SDL_AtomicLock(&locks[index]); -} - -static __inline__ void -leaveLock(void *a) -{ - uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f); - - SDL_AtomicUnlock(&locks[index]); -} - -SDL_bool -SDL_AtomicCAS_(SDL_atomic_t *a, int oldval, int newval) -{ - SDL_bool retval = SDL_FALSE; - - enterLock(a); - if (a->value == oldval) { - a->value = newval; - retval = SDL_TRUE; - } - leaveLock(a); - - return retval; -} - -SDL_bool -SDL_AtomicCASPtr_(void **a, void *oldval, void *newval) -{ - SDL_bool retval = SDL_FALSE; - - enterLock(a); - if (*a == oldval) { - *a = newval; - retval = SDL_TRUE; - } - leaveLock(a); - - return retval; -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/atomic/SDL_spinlock.c b/src/helper/android/SDL1.3/src/atomic/SDL_spinlock.c deleted file mode 100644 index f841f77cf..000000000 --- a/src/helper/android/SDL1.3/src/atomic/SDL_spinlock.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_stdinc.h" - -#include "SDL_atomic.h" -#include "SDL_mutex.h" -#include "SDL_timer.h" - -/* Don't do the check for Visual Studio 2005, it's safe here */ -#ifdef __WIN32__ -#include "../core/windows/SDL_windows.h" -#endif - -/* This function is where all the magic happens... */ -SDL_bool -SDL_AtomicTryLock(SDL_SpinLock *lock) -{ -#if SDL_ATOMIC_DISABLED - /* Terrible terrible damage */ - static SDL_mutex *_spinlock_mutex; - - if (!_spinlock_mutex) { - /* Race condition on first lock... */ - _spinlock_mutex = SDL_CreateMutex(); - } - SDL_mutexP(_spinlock_mutex); - if (*lock == 0) { - *lock = 1; - SDL_mutexV(_spinlock_mutex); - return SDL_TRUE; - } else { - SDL_mutexV(_spinlock_mutex); - return SDL_FALSE; - } - -#elif defined(_MSC_VER) - SDL_COMPILE_TIME_ASSERT(locksize, sizeof(*lock) == sizeof(long)); - return (InterlockedExchange((long*)lock, 1) == 0); - -#elif defined(__MACOSX__) - return OSAtomicCompareAndSwap32Barrier(0, 1, lock); - -#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET - return (__sync_lock_test_and_set(lock, 1) == 0); - -#elif defined(__GNUC__) && defined(__arm__) && \ - (defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \ - defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__)) - int result; - __asm__ __volatile__ ( - "swp %0, %1, [%2]\n" - : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory"); - return (result == 0); - -#elif defined(__GNUC__) && defined(__arm__) - int result; - __asm__ __volatile__ ( - "ldrex %0, [%2]\nteq %0, #0\nstrexeq %0, %1, [%2]" - : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory"); - return (result == 0); - -#else - /* Need CPU instructions for spinlock here! */ - __need_spinlock_implementation__ -#endif -} - -void -SDL_AtomicLock(SDL_SpinLock *lock) -{ - /* FIXME: Should we have an eventual timeout? */ - while (!SDL_AtomicTryLock(lock)) { - SDL_Delay(0); - } -} - -void -SDL_AtomicUnlock(SDL_SpinLock *lock) -{ -#if defined(_MSC_VER) - _ReadWriteBarrier(); - *lock = 0; - -#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET - __sync_lock_release(lock); - -#else - *lock = 0; -#endif -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audio.c b/src/helper/android/SDL1.3/src/audio/SDL_audio.c deleted file mode 100644 index bb4dfa38c..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audio.c +++ /dev/null @@ -1,1209 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include "SDL.h" -#include "SDL_audio.h" -#include "SDL_audio_c.h" -#include "SDL_audiomem.h" -#include "SDL_sysaudio.h" - -#define _THIS SDL_AudioDevice *_this - -static SDL_AudioDriver current_audio; -static SDL_AudioDevice *open_devices[16]; - -/* !!! FIXME: These are wordy and unlocalized... */ -#define DEFAULT_OUTPUT_DEVNAME "System audio output device" -#define DEFAULT_INPUT_DEVNAME "System audio capture device" - - -/* - * Not all of these will be compiled and linked in, but it's convenient - * to have a complete list here and saves yet-another block of #ifdefs... - * Please see bootstrap[], below, for the actual #ifdef mess. - */ -extern AudioBootStrap BSD_AUDIO_bootstrap; -extern AudioBootStrap DSP_bootstrap; -extern AudioBootStrap DMA_bootstrap; -extern AudioBootStrap ALSA_bootstrap; -extern AudioBootStrap PULSEAUDIO_bootstrap; -extern AudioBootStrap QSAAUDIO_bootstrap; -extern AudioBootStrap SUNAUDIO_bootstrap; -extern AudioBootStrap ARTS_bootstrap; -extern AudioBootStrap ESD_bootstrap; -extern AudioBootStrap NAS_bootstrap; -extern AudioBootStrap DSOUND_bootstrap; -extern AudioBootStrap WINWAVEOUT_bootstrap; -extern AudioBootStrap PAUDIO_bootstrap; -extern AudioBootStrap BEOSAUDIO_bootstrap; -extern AudioBootStrap COREAUDIO_bootstrap; -extern AudioBootStrap COREAUDIOIPHONE_bootstrap; -extern AudioBootStrap SNDMGR_bootstrap; -extern AudioBootStrap DISKAUD_bootstrap; -extern AudioBootStrap DUMMYAUD_bootstrap; -extern AudioBootStrap DCAUD_bootstrap; -extern AudioBootStrap DART_bootstrap; -extern AudioBootStrap NDSAUD_bootstrap; -extern AudioBootStrap FUSIONSOUND_bootstrap; -extern AudioBootStrap ANDROIDAUD_bootstrap; - - -/* Available audio drivers */ -static const AudioBootStrap *const bootstrap[] = { -#if SDL_AUDIO_DRIVER_PULSEAUDIO - &PULSEAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_ALSA - &ALSA_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_BSD - &BSD_AUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_OSS - &DSP_bootstrap, - &DMA_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_QSA - &QSAAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_SUNAUDIO - &SUNAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_ARTS - &ARTS_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_ESD - &ESD_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_NAS - &NAS_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_DSOUND - &DSOUND_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_WINWAVEOUT - &WINWAVEOUT_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_PAUDIO - &PAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_BEOSAUDIO - &BEOSAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_COREAUDIO - &COREAUDIO_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_COREAUDIOIPHONE - &COREAUDIOIPHONE_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_DISK - &DISKAUD_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_DUMMY - &DUMMYAUD_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_NDS - &NDSAUD_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_FUSIONSOUND - &FUSIONSOUND_bootstrap, -#endif -#if SDL_AUDIO_DRIVER_ANDROID - &ANDROIDAUD_bootstrap, -#endif - NULL -}; - -static SDL_AudioDevice * -get_audio_device(SDL_AudioDeviceID id) -{ - id--; - if ((id >= SDL_arraysize(open_devices)) || (open_devices[id] == NULL)) { - SDL_SetError("Invalid audio device ID"); - return NULL; - } - - return open_devices[id]; -} - - -/* stubs for audio drivers that don't need a specific entry point... */ -static int -SDL_AudioDetectDevices_Default(int iscapture) -{ - return -1; -} - -static void -SDL_AudioThreadInit_Default(_THIS) -{ /* no-op. */ -} - -static void -SDL_AudioWaitDevice_Default(_THIS) -{ /* no-op. */ -} - -static void -SDL_AudioPlayDevice_Default(_THIS) -{ /* no-op. */ -} - -static Uint8 * -SDL_AudioGetDeviceBuf_Default(_THIS) -{ - return NULL; -} - -static void -SDL_AudioWaitDone_Default(_THIS) -{ /* no-op. */ -} - -static void -SDL_AudioCloseDevice_Default(_THIS) -{ /* no-op. */ -} - -static void -SDL_AudioDeinitialize_Default(void) -{ /* no-op. */ -} - -static int -SDL_AudioOpenDevice_Default(_THIS, const char *devname, int iscapture) -{ - return 0; -} - -static const char * -SDL_AudioGetDeviceName_Default(int index, int iscapture) -{ - SDL_SetError("No such device"); - return NULL; -} - -static void -SDL_AudioLockDevice_Default(SDL_AudioDevice * device) -{ - if (device->thread && (SDL_ThreadID() == device->threadid)) { - return; - } - SDL_mutexP(device->mixer_lock); -} - -static void -SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device) -{ - if (device->thread && (SDL_ThreadID() == device->threadid)) { - return; - } - SDL_mutexV(device->mixer_lock); -} - - -static void -finalize_audio_entry_points(void) -{ - /* - * Fill in stub functions for unused driver entry points. This lets us - * blindly call them without having to check for validity first. - */ - -#define FILL_STUB(x) \ - if (current_audio.impl.x == NULL) { \ - current_audio.impl.x = SDL_Audio##x##_Default; \ - } - FILL_STUB(DetectDevices); - FILL_STUB(GetDeviceName); - FILL_STUB(OpenDevice); - FILL_STUB(ThreadInit); - FILL_STUB(WaitDevice); - FILL_STUB(PlayDevice); - FILL_STUB(GetDeviceBuf); - FILL_STUB(WaitDone); - FILL_STUB(CloseDevice); - FILL_STUB(LockDevice); - FILL_STUB(UnlockDevice); - FILL_STUB(Deinitialize); -#undef FILL_STUB -} - -/* Streaming functions (for when the input and output buffer sizes are different) */ -/* Write [length] bytes from buf into the streamer */ -static void -SDL_StreamWrite(SDL_AudioStreamer * stream, Uint8 * buf, int length) -{ - int i; - - for (i = 0; i < length; ++i) { - stream->buffer[stream->write_pos] = buf[i]; - ++stream->write_pos; - } -} - -/* Read [length] bytes out of the streamer into buf */ -static void -SDL_StreamRead(SDL_AudioStreamer * stream, Uint8 * buf, int length) -{ - int i; - - for (i = 0; i < length; ++i) { - buf[i] = stream->buffer[stream->read_pos]; - ++stream->read_pos; - } -} - -static int -SDL_StreamLength(SDL_AudioStreamer * stream) -{ - return (stream->write_pos - stream->read_pos) % stream->max_len; -} - -/* Initialize the stream by allocating the buffer and setting the read/write heads to the beginning */ -#if 0 -static int -SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence) -{ - /* First try to allocate the buffer */ - stream->buffer = (Uint8 *) SDL_malloc(max_len); - if (stream->buffer == NULL) { - return -1; - } - - stream->max_len = max_len; - stream->read_pos = 0; - stream->write_pos = 0; - - /* Zero out the buffer */ - SDL_memset(stream->buffer, silence, max_len); - - return 0; -} -#endif - -/* Deinitialize the stream simply by freeing the buffer */ -static void -SDL_StreamDeinit(SDL_AudioStreamer * stream) -{ - if (stream->buffer != NULL) { - SDL_free(stream->buffer); - } -} - -#if defined(ANDROID) -#include -#endif - -/* The general mixing thread function */ -int SDLCALL -SDL_RunAudio(void *devicep) -{ - SDL_AudioDevice *device = (SDL_AudioDevice *) devicep; - Uint8 *stream; - int stream_len; - void *udata; - void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len); - int silence; - Uint32 delay; - - /* For streaming when the buffer sizes don't match up */ - Uint8 *istream; - int istream_len = 0; - - /* Perform any thread setup */ - device->threadid = SDL_ThreadID(); - current_audio.impl.ThreadInit(device); - - /* Set up the mixing function */ - fill = device->spec.callback; - udata = device->spec.userdata; - - /* By default do not stream */ - device->use_streamer = 0; - - if (device->convert.needed) { - if (device->convert.src_format == AUDIO_U8) { - silence = 0x80; - } else { - silence = 0; - } - -#if 0 /* !!! FIXME: I took len_div out of the structure. Use rate_incr instead? */ - /* If the result of the conversion alters the length, i.e. resampling is being used, use the streamer */ - if (device->convert.len_mult != 1 || device->convert.len_div != 1) { - /* The streamer's maximum length should be twice whichever is larger: spec.size or len_cvt */ - stream_max_len = 2 * device->spec.size; - if (device->convert.len_mult > device->convert.len_div) { - stream_max_len *= device->convert.len_mult; - stream_max_len /= device->convert.len_div; - } - if (SDL_StreamInit(&device->streamer, stream_max_len, silence) < - 0) - return -1; - device->use_streamer = 1; - - /* istream_len should be the length of what we grab from the callback and feed to conversion, - so that we get close to spec_size. I.e. we want device.spec_size = istream_len * u / d - */ - istream_len = - device->spec.size * device->convert.len_div / - device->convert.len_mult; - } -#endif - - /* stream_len = device->convert.len; */ - stream_len = device->spec.size; - } else { - silence = device->spec.silence; - stream_len = device->spec.size; - } - - /* Calculate the delay while paused */ - delay = ((device->spec.samples * 1000) / device->spec.freq); - - /* Determine if the streamer is necessary here */ - if (device->use_streamer == 1) { - /* This code is almost the same as the old code. The difference is, instead of reading - directly from the callback into "stream", then converting and sending the audio off, - we go: callback -> "istream" -> (conversion) -> streamer -> stream -> device. - However, reading and writing with streamer are done separately: - - We only call the callback and write to the streamer when the streamer does not - contain enough samples to output to the device. - - We only read from the streamer and tell the device to play when the streamer - does have enough samples to output. - This allows us to perform resampling in the conversion step, where the output of the - resampling process can be any number. We will have to see what a good size for the - stream's maximum length is, but I suspect 2*max(len_cvt, stream_len) is a good figure. - */ - while (device->enabled) { - - if (device->paused) { - SDL_Delay(delay); - continue; - } - - /* Only read in audio if the streamer doesn't have enough already (if it does not have enough samples to output) */ - if (SDL_StreamLength(&device->streamer) < stream_len) { - /* Set up istream */ - if (device->convert.needed) { - if (device->convert.buf) { - istream = device->convert.buf; - } else { - continue; - } - } else { -/* FIXME: Ryan, this is probably wrong. I imagine we don't want to get - * a device buffer both here and below in the stream output. - */ - istream = current_audio.impl.GetDeviceBuf(device); - if (istream == NULL) { - istream = device->fake_stream; - } - } - - /* Read from the callback into the _input_ stream */ - SDL_mutexP(device->mixer_lock); - (*fill) (udata, istream, istream_len); - SDL_mutexV(device->mixer_lock); - - /* Convert the audio if necessary and write to the streamer */ - if (device->convert.needed) { - SDL_ConvertAudio(&device->convert); - if (istream == NULL) { - istream = device->fake_stream; - } - /*SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */ - SDL_StreamWrite(&device->streamer, device->convert.buf, - device->convert.len_cvt); - } else { - SDL_StreamWrite(&device->streamer, istream, istream_len); - } - } - - /* Only output audio if the streamer has enough to output */ - if (SDL_StreamLength(&device->streamer) >= stream_len) { - /* Set up the output stream */ - if (device->convert.needed) { - if (device->convert.buf) { - stream = device->convert.buf; - } else { - continue; - } - } else { - stream = current_audio.impl.GetDeviceBuf(device); - if (stream == NULL) { - stream = device->fake_stream; - } - } - - /* Now read from the streamer */ - SDL_StreamRead(&device->streamer, stream, stream_len); - - /* Ready current buffer for play and change current buffer */ - if (stream != device->fake_stream) { - current_audio.impl.PlayDevice(device); - /* Wait for an audio buffer to become available */ - current_audio.impl.WaitDevice(device); - } else { - SDL_Delay(delay); - } - } - - } - } else { - /* Otherwise, do not use the streamer. This is the old code. */ - - /* Loop, filling the audio buffers */ - while (device->enabled) { - - if (device->paused) { - SDL_Delay(delay); - continue; - } - - /* Fill the current buffer with sound */ - if (device->convert.needed) { - if (device->convert.buf) { - stream = device->convert.buf; - } else { - continue; - } - } else { - stream = current_audio.impl.GetDeviceBuf(device); - if (stream == NULL) { - stream = device->fake_stream; - } - } - - SDL_mutexP(device->mixer_lock); - (*fill) (udata, stream, stream_len); - SDL_mutexV(device->mixer_lock); - - /* Convert the audio if necessary */ - if (device->convert.needed) { - SDL_ConvertAudio(&device->convert); - stream = current_audio.impl.GetDeviceBuf(device); - if (stream == NULL) { - stream = device->fake_stream; - } - SDL_memcpy(stream, device->convert.buf, - device->convert.len_cvt); - } - - /* Ready current buffer for play and change current buffer */ - if (stream != device->fake_stream) { - current_audio.impl.PlayDevice(device); - /* Wait for an audio buffer to become available */ - current_audio.impl.WaitDevice(device); - } else { - SDL_Delay(delay); - } - } - } - - /* Wait for the audio to drain.. */ - current_audio.impl.WaitDone(device); - - /* If necessary, deinit the streamer */ - if (device->use_streamer == 1) - SDL_StreamDeinit(&device->streamer); - - return (0); -} - - -static SDL_AudioFormat -SDL_ParseAudioFormat(const char *string) -{ -#define CHECK_FMT_STRING(x) if (SDL_strcmp(string, #x) == 0) return AUDIO_##x - CHECK_FMT_STRING(U8); - CHECK_FMT_STRING(S8); - CHECK_FMT_STRING(U16LSB); - CHECK_FMT_STRING(S16LSB); - CHECK_FMT_STRING(U16MSB); - CHECK_FMT_STRING(S16MSB); - CHECK_FMT_STRING(U16SYS); - CHECK_FMT_STRING(S16SYS); - CHECK_FMT_STRING(U16); - CHECK_FMT_STRING(S16); - CHECK_FMT_STRING(S32LSB); - CHECK_FMT_STRING(S32MSB); - CHECK_FMT_STRING(S32SYS); - CHECK_FMT_STRING(S32); - CHECK_FMT_STRING(F32LSB); - CHECK_FMT_STRING(F32MSB); - CHECK_FMT_STRING(F32SYS); - CHECK_FMT_STRING(F32); -#undef CHECK_FMT_STRING - return 0; -} - -int -SDL_GetNumAudioDrivers(void) -{ - return (SDL_arraysize(bootstrap) - 1); -} - -const char * -SDL_GetAudioDriver(int index) -{ - if (index >= 0 && index < SDL_GetNumAudioDrivers()) { - return (bootstrap[index]->name); - } - return (NULL); -} - -int -SDL_AudioInit(const char *driver_name) -{ - int i = 0; - int initialized = 0; - int tried_to_init = 0; - - if (SDL_WasInit(SDL_INIT_AUDIO)) { - SDL_AudioQuit(); /* shutdown driver if already running. */ - } - - SDL_memset(¤t_audio, '\0', sizeof(current_audio)); - SDL_memset(open_devices, '\0', sizeof(open_devices)); - - /* Select the proper audio driver */ - if (driver_name == NULL) { - driver_name = SDL_getenv("SDL_AUDIODRIVER"); - } - - for (i = 0; (!initialized) && (bootstrap[i]); ++i) { - /* make sure we should even try this driver before doing so... */ - const AudioBootStrap *backend = bootstrap[i]; - if (((driver_name) && (SDL_strcasecmp(backend->name, driver_name))) || - ((!driver_name) && (backend->demand_only))) { - continue; - } - - tried_to_init = 1; - SDL_memset(¤t_audio, 0, sizeof(current_audio)); - current_audio.name = backend->name; - current_audio.desc = backend->desc; - initialized = backend->init(¤t_audio.impl); - } - - if (!initialized) { - /* specific drivers will set the error message if they fail... */ - if (!tried_to_init) { - if (driver_name) { - SDL_SetError("Audio target '%s' not available", driver_name); - } else { - SDL_SetError("No available audio device"); - } - } - - SDL_memset(¤t_audio, 0, sizeof(current_audio)); - return (-1); /* No driver was available, so fail. */ - } - - finalize_audio_entry_points(); - - return (0); -} - -/* - * Get the current audio driver name - */ -const char * -SDL_GetCurrentAudioDriver() -{ - return current_audio.name; -} - - -int -SDL_GetNumAudioDevices(int iscapture) -{ - if (!SDL_WasInit(SDL_INIT_AUDIO)) { - return -1; - } - if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) { - return 0; - } - - if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { - return 1; - } - - if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) { - return 1; - } - - return current_audio.impl.DetectDevices(iscapture); -} - - -const char * -SDL_GetAudioDeviceName(int index, int iscapture) -{ - if (!SDL_WasInit(SDL_INIT_AUDIO)) { - SDL_SetError("Audio subsystem is not initialized"); - return NULL; - } - - if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) { - SDL_SetError("No capture support"); - return NULL; - } - - if (index < 0) { - SDL_SetError("No such device"); - return NULL; - } - - if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { - return DEFAULT_INPUT_DEVNAME; - } - - if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) { - return DEFAULT_OUTPUT_DEVNAME; - } - - return current_audio.impl.GetDeviceName(index, iscapture); -} - - -static void -close_audio_device(SDL_AudioDevice * device) -{ - device->enabled = 0; - if (device->thread != NULL) { - SDL_WaitThread(device->thread, NULL); - } - if (device->mixer_lock != NULL) { - SDL_DestroyMutex(device->mixer_lock); - } - if (device->fake_stream != NULL) { - SDL_FreeAudioMem(device->fake_stream); - } - if (device->convert.needed) { - SDL_FreeAudioMem(device->convert.buf); - } - if (device->opened) { - current_audio.impl.CloseDevice(device); - device->opened = 0; - } - SDL_FreeAudioMem(device); -} - - -/* - * Sanity check desired AudioSpec for SDL_OpenAudio() in (orig). - * Fills in a sanitized copy in (prepared). - * Returns non-zero if okay, zero on fatal parameters in (orig). - */ -static int -prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared) -{ - SDL_memcpy(prepared, orig, sizeof(SDL_AudioSpec)); - - if (orig->callback == NULL) { - SDL_SetError("SDL_OpenAudio() passed a NULL callback"); - return 0; - } - - if (orig->freq == 0) { - const char *env = SDL_getenv("SDL_AUDIO_FREQUENCY"); - if ((!env) || ((prepared->freq = SDL_atoi(env)) == 0)) { - prepared->freq = 22050; /* a reasonable default */ - } - } - - if (orig->format == 0) { - const char *env = SDL_getenv("SDL_AUDIO_FORMAT"); - if ((!env) || ((prepared->format = SDL_ParseAudioFormat(env)) == 0)) { - prepared->format = AUDIO_S16; /* a reasonable default */ - } - } - - switch (orig->channels) { - case 0:{ - const char *env = SDL_getenv("SDL_AUDIO_CHANNELS"); - if ((!env) || ((prepared->channels = (Uint8) SDL_atoi(env)) == 0)) { - prepared->channels = 2; /* a reasonable default */ - } - break; - } - case 1: /* Mono */ - case 2: /* Stereo */ - case 4: /* surround */ - case 6: /* surround with center and lfe */ - break; - default: - SDL_SetError("Unsupported number of audio channels."); - return 0; - } - - if (orig->samples == 0) { - const char *env = SDL_getenv("SDL_AUDIO_SAMPLES"); - if ((!env) || ((prepared->samples = (Uint16) SDL_atoi(env)) == 0)) { - /* Pick a default of ~46 ms at desired frequency */ - /* !!! FIXME: remove this when the non-Po2 resampling is in. */ - const int samples = (prepared->freq / 1000) * 46; - int power2 = 1; - while (power2 < samples) { - power2 *= 2; - } - prepared->samples = power2; - } - } - - /* Calculate the silence and size of the audio specification */ - SDL_CalculateAudioSpec(prepared); - - return 1; -} - - -static SDL_AudioDeviceID -open_audio_device(const char *devname, int iscapture, - const SDL_AudioSpec * desired, SDL_AudioSpec * obtained, - int allowed_changes, int min_id) -{ - SDL_AudioDeviceID id = 0; - SDL_AudioSpec _obtained; - SDL_AudioDevice *device; - SDL_bool build_cvt; - int i = 0; - - if (!SDL_WasInit(SDL_INIT_AUDIO)) { - SDL_SetError("Audio subsystem is not initialized"); - return 0; - } - - if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) { - SDL_SetError("No capture support"); - return 0; - } - - if (!obtained) { - obtained = &_obtained; - } - if (!prepare_audiospec(desired, obtained)) { - return 0; - } - - /* If app doesn't care about a specific device, let the user override. */ - if (devname == NULL) { - devname = SDL_getenv("SDL_AUDIO_DEVICE_NAME"); - } - - /* - * Catch device names at the high level for the simple case... - * This lets us have a basic "device enumeration" for systems that - * don't have multiple devices, but makes sure the device name is - * always NULL when it hits the low level. - * - * Also make sure that the simple case prevents multiple simultaneous - * opens of the default system device. - */ - - if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { - if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) { - SDL_SetError("No such device"); - return 0; - } - devname = NULL; - - for (i = 0; i < SDL_arraysize(open_devices); i++) { - if ((open_devices[i]) && (open_devices[i]->iscapture)) { - SDL_SetError("Audio device already open"); - return 0; - } - } - } - - if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) { - if ((devname) && (SDL_strcmp(devname, DEFAULT_OUTPUT_DEVNAME) != 0)) { - SDL_SetError("No such device"); - return 0; - } - devname = NULL; - - for (i = 0; i < SDL_arraysize(open_devices); i++) { - if ((open_devices[i]) && (!open_devices[i]->iscapture)) { - SDL_SetError("Audio device already open"); - return 0; - } - } - } - - device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice)); - if (device == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(device, '\0', sizeof(SDL_AudioDevice)); - device->spec = *obtained; - device->enabled = 1; - device->paused = 1; - device->iscapture = iscapture; - - /* Create a semaphore for locking the sound buffers */ - if (!current_audio.impl.SkipMixerLock) { - device->mixer_lock = SDL_CreateMutex(); - if (device->mixer_lock == NULL) { - close_audio_device(device); - SDL_SetError("Couldn't create mixer lock"); - return 0; - } - } - - if (!current_audio.impl.OpenDevice(device, devname, iscapture)) { - close_audio_device(device); - return 0; - } - device->opened = 1; - - /* Allocate a fake audio memory buffer */ - device->fake_stream = (Uint8 *)SDL_AllocAudioMem(device->spec.size); - if (device->fake_stream == NULL) { - close_audio_device(device); - SDL_OutOfMemory(); - return 0; - } - - /* If the audio driver changes the buffer size, accept it */ - if (device->spec.samples != obtained->samples) { - obtained->samples = device->spec.samples; - SDL_CalculateAudioSpec(obtained); - } - - /* See if we need to do any conversion */ - build_cvt = SDL_FALSE; - if (obtained->freq != device->spec.freq) { - if (allowed_changes & SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) { - obtained->freq = device->spec.freq; - } else { - build_cvt = SDL_TRUE; - } - } - if (obtained->format != device->spec.format) { - if (allowed_changes & SDL_AUDIO_ALLOW_FORMAT_CHANGE) { - obtained->format = device->spec.format; - } else { - build_cvt = SDL_TRUE; - } - } - if (obtained->channels != device->spec.channels) { - if (allowed_changes & SDL_AUDIO_ALLOW_CHANNELS_CHANGE) { - obtained->channels = device->spec.channels; - } else { - build_cvt = SDL_TRUE; - } - } - if (build_cvt) { - /* Build an audio conversion block */ - if (SDL_BuildAudioCVT(&device->convert, - obtained->format, obtained->channels, - obtained->freq, - device->spec.format, device->spec.channels, - device->spec.freq) < 0) { - close_audio_device(device); - return 0; - } - if (device->convert.needed) { - device->convert.len = (int) (((double) obtained->size) / - device->convert.len_ratio); - - device->convert.buf = - (Uint8 *) SDL_AllocAudioMem(device->convert.len * - device->convert.len_mult); - if (device->convert.buf == NULL) { - close_audio_device(device); - SDL_OutOfMemory(); - return 0; - } - } - } - - /* Find an available device ID and store the structure... */ - for (id = min_id - 1; id < SDL_arraysize(open_devices); id++) { - if (open_devices[id] == NULL) { - open_devices[id] = device; - break; - } - } - - if (id == SDL_arraysize(open_devices)) { - SDL_SetError("Too many open audio devices"); - close_audio_device(device); - return 0; - } - - /* Start the audio thread if necessary */ - if (!current_audio.impl.ProvidesOwnCallbackThread) { - /* Start the audio thread */ -/* !!! FIXME: this is nasty. */ -#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) -#undef SDL_CreateThread - device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL); -#else - device->thread = SDL_CreateThread(SDL_RunAudio, device); -#endif - if (device->thread == NULL) { - SDL_CloseAudioDevice(id + 1); - SDL_SetError("Couldn't create audio thread"); - return 0; - } - } - - return id + 1; -} - - -int -SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained) -{ - SDL_AudioDeviceID id = 0; - - /* Start up the audio driver, if necessary. This is legacy behaviour! */ - if (!SDL_WasInit(SDL_INIT_AUDIO)) { - if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) { - return (-1); - } - } - - /* SDL_OpenAudio() is legacy and can only act on Device ID #1. */ - if (open_devices[0] != NULL) { - SDL_SetError("Audio device is already opened"); - return (-1); - } - - if (obtained) { - id = open_audio_device(NULL, 0, desired, obtained, - SDL_AUDIO_ALLOW_ANY_CHANGE, 1); - } else { - id = open_audio_device(NULL, 0, desired, desired, 0, 1); - } - if (id > 1) { /* this should never happen in theory... */ - SDL_CloseAudioDevice(id); - SDL_SetError("Internal error"); /* MUST be Device ID #1! */ - return (-1); - } - - return ((id == 0) ? -1 : 0); -} - -SDL_AudioDeviceID -SDL_OpenAudioDevice(const char *device, int iscapture, - const SDL_AudioSpec * desired, SDL_AudioSpec * obtained, - int allowed_changes) -{ - return open_audio_device(device, iscapture, desired, obtained, - allowed_changes, 2); -} - -SDL_AudioStatus -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid) -{ - SDL_AudioDevice *device = get_audio_device(devid); - SDL_AudioStatus status = SDL_AUDIO_STOPPED; - if (device && device->enabled) { - if (device->paused) { - status = SDL_AUDIO_PAUSED; - } else { - status = SDL_AUDIO_PLAYING; - } - } - return (status); -} - - -SDL_AudioStatus -SDL_GetAudioStatus(void) -{ - return SDL_GetAudioDeviceStatus(1); -} - -void -SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on) -{ - SDL_AudioDevice *device = get_audio_device(devid); - if (device) { - device->paused = pause_on; - } -} - -void -SDL_PauseAudio(int pause_on) -{ - SDL_PauseAudioDevice(1, pause_on); -} - - -void -SDL_LockAudioDevice(SDL_AudioDeviceID devid) -{ - /* Obtain a lock on the mixing buffers */ - SDL_AudioDevice *device = get_audio_device(devid); - if (device) { - current_audio.impl.LockDevice(device); - } -} - -void -SDL_LockAudio(void) -{ - SDL_LockAudioDevice(1); -} - -void -SDL_UnlockAudioDevice(SDL_AudioDeviceID devid) -{ - /* Obtain a lock on the mixing buffers */ - SDL_AudioDevice *device = get_audio_device(devid); - if (device) { - current_audio.impl.UnlockDevice(device); - } -} - -void -SDL_UnlockAudio(void) -{ - SDL_UnlockAudioDevice(1); -} - -void -SDL_CloseAudioDevice(SDL_AudioDeviceID devid) -{ - SDL_AudioDevice *device = get_audio_device(devid); - if (device) { - close_audio_device(device); - open_devices[devid - 1] = NULL; - } -} - -void -SDL_CloseAudio(void) -{ - SDL_CloseAudioDevice(1); -} - -void -SDL_AudioQuit(void) -{ - SDL_AudioDeviceID i; - for (i = 0; i < SDL_arraysize(open_devices); i++) { - SDL_CloseAudioDevice(i); - } - - /* Free the driver data */ - current_audio.impl.Deinitialize(); - SDL_memset(¤t_audio, '\0', sizeof(current_audio)); - SDL_memset(open_devices, '\0', sizeof(open_devices)); -} - -#define NUM_FORMATS 10 -static int format_idx; -static int format_idx_sub; -static SDL_AudioFormat format_list[NUM_FORMATS][NUM_FORMATS] = { - {AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, - AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB}, - {AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, - AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB}, - {AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S32LSB, - AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S32MSB, - AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S32LSB, - AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_S32MSB, - AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S16LSB, - AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S16MSB, - AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S16LSB, - AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8}, - {AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_S16MSB, - AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8}, -}; - -SDL_AudioFormat -SDL_FirstAudioFormat(SDL_AudioFormat format) -{ - for (format_idx = 0; format_idx < NUM_FORMATS; ++format_idx) { - if (format_list[format_idx][0] == format) { - break; - } - } - format_idx_sub = 0; - return (SDL_NextAudioFormat()); -} - -SDL_AudioFormat -SDL_NextAudioFormat(void) -{ - if ((format_idx == NUM_FORMATS) || (format_idx_sub == NUM_FORMATS)) { - return (0); - } - return (format_list[format_idx][format_idx_sub++]); -} - -void -SDL_CalculateAudioSpec(SDL_AudioSpec * spec) -{ - switch (spec->format) { - case AUDIO_U8: - spec->silence = 0x80; - break; - default: - spec->silence = 0x00; - break; - } - spec->size = SDL_AUDIO_BITSIZE(spec->format) / 8; - spec->size *= spec->channels; - spec->size *= spec->samples; -} - - -/* - * Moved here from SDL_mixer.c, since it relies on internals of an opened - * audio device (and is deprecated, by the way!). - */ -void -SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume) -{ - /* Mix the user-level audio format */ - SDL_AudioDevice *device = get_audio_device(1); - if (device != NULL) { - SDL_AudioFormat format; - if (device->convert.needed) { - format = device->convert.src_format; - } else { - format = device->spec.format; - } - SDL_MixAudioFormat(dst, src, format, len, volume); - } -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audio_c.h b/src/helper/android/SDL1.3/src/audio/SDL_audio_c.h deleted file mode 100644 index 8f4ccbc68..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audio_c.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */ - -/* Functions to get a list of "close" audio formats */ -extern SDL_AudioFormat SDL_FirstAudioFormat(SDL_AudioFormat format); -extern SDL_AudioFormat SDL_NextAudioFormat(void); - -/* Function to calculate the size and silence for a SDL_AudioSpec */ -extern void SDL_CalculateAudioSpec(SDL_AudioSpec * spec); - -/* The actual mixing thread function */ -extern int SDLCALL SDL_RunAudio(void *audiop); - -/* this is used internally to access some autogenerated code. */ -typedef struct -{ - SDL_AudioFormat src_fmt; - SDL_AudioFormat dst_fmt; - SDL_AudioFilter filter; -} SDL_AudioTypeFilters; -extern const SDL_AudioTypeFilters sdl_audio_type_filters[]; - -/* this is used internally to access some autogenerated code. */ -typedef struct -{ - SDL_AudioFormat fmt; - int channels; - int upsample; - int multiple; - SDL_AudioFilter filter; -} SDL_AudioRateFilters; -extern const SDL_AudioRateFilters sdl_audio_rate_filters[]; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audiocvt.c b/src/helper/android/SDL1.3/src/audio/SDL_audiocvt.c deleted file mode 100644 index ff3f86c13..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audiocvt.c +++ /dev/null @@ -1,1080 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Functions for audio drivers to perform runtime conversion of audio format */ - -#include "SDL_audio.h" -#include "SDL_audio_c.h" - -/* #define DEBUG_CONVERT */ - -/* !!! FIXME */ -#ifndef assert -#define assert(x) -#endif - -/* Effectively mix right and left channels into a single channel */ -static void SDLCALL -SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - Sint32 sample; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting to mono\n"); -#endif - switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) { - case AUDIO_U8: - { - Uint8 *src, *dst; - - src = cvt->buf; - dst = cvt->buf; - for (i = cvt->len_cvt / 2; i; --i) { - sample = src[0] + src[1]; - *dst = (Uint8) (sample / 2); - src += 2; - dst += 1; - } - } - break; - - case AUDIO_S8: - { - Sint8 *src, *dst; - - src = (Sint8 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / 2; i; --i) { - sample = src[0] + src[1]; - *dst = (Sint8) (sample / 2); - src += 2; - dst += 1; - } - } - break; - - case AUDIO_U16: - { - Uint8 *src, *dst; - - src = cvt->buf; - dst = cvt->buf; - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - sample = (Uint16) ((src[0] << 8) | src[1]) + - (Uint16) ((src[2] << 8) | src[3]); - sample /= 2; - dst[1] = (sample & 0xFF); - sample >>= 8; - dst[0] = (sample & 0xFF); - src += 4; - dst += 2; - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - sample = (Uint16) ((src[1] << 8) | src[0]) + - (Uint16) ((src[3] << 8) | src[2]); - sample /= 2; - dst[0] = (sample & 0xFF); - sample >>= 8; - dst[1] = (sample & 0xFF); - src += 4; - dst += 2; - } - } - } - break; - - case AUDIO_S16: - { - Uint8 *src, *dst; - - src = cvt->buf; - dst = cvt->buf; - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - sample = (Sint16) ((src[0] << 8) | src[1]) + - (Sint16) ((src[2] << 8) | src[3]); - sample /= 2; - dst[1] = (sample & 0xFF); - sample >>= 8; - dst[0] = (sample & 0xFF); - src += 4; - dst += 2; - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - sample = (Sint16) ((src[1] << 8) | src[0]) + - (Sint16) ((src[3] << 8) | src[2]); - sample /= 2; - dst[0] = (sample & 0xFF); - sample >>= 8; - dst[1] = (sample & 0xFF); - src += 4; - dst += 2; - } - } - } - break; - - case AUDIO_S32: - { - const Uint32 *src = (const Uint32 *) cvt->buf; - Uint32 *dst = (Uint32 *) cvt->buf; - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 8; i; --i, src += 2) { - const Sint64 added = - (((Sint64) (Sint32) SDL_SwapBE32(src[0])) + - ((Sint64) (Sint32) SDL_SwapBE32(src[1]))); - *(dst++) = SDL_SwapBE32((Uint32) ((Sint32) (added / 2))); - } - } else { - for (i = cvt->len_cvt / 8; i; --i, src += 2) { - const Sint64 added = - (((Sint64) (Sint32) SDL_SwapLE32(src[0])) + - ((Sint64) (Sint32) SDL_SwapLE32(src[1]))); - *(dst++) = SDL_SwapLE32((Uint32) ((Sint32) (added / 2))); - } - } - } - break; - - case AUDIO_F32: - { - const float *src = (const float *) cvt->buf; - float *dst = (float *) cvt->buf; - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 8; i; --i, src += 2) { - const float src1 = SDL_SwapFloatBE(src[0]); - const float src2 = SDL_SwapFloatBE(src[1]); - const double added = ((double) src1) + ((double) src2); - const float halved = (float) (added * 0.5); - *(dst++) = SDL_SwapFloatBE(halved); - } - } else { - for (i = cvt->len_cvt / 8; i; --i, src += 2) { - const float src1 = SDL_SwapFloatLE(src[0]); - const float src2 = SDL_SwapFloatLE(src[1]); - const double added = ((double) src1) + ((double) src2); - const float halved = (float) (added * 0.5); - *(dst++) = SDL_SwapFloatLE(halved); - } - } - } - break; - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -/* Discard top 4 channels */ -static void SDLCALL -SDL_ConvertStrip(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting down from 6 channels to stereo\n"); -#endif - -#define strip_chans_6_to_2(type) \ - { \ - const type *src = (const type *) cvt->buf; \ - type *dst = (type *) cvt->buf; \ - for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \ - dst[0] = src[0]; \ - dst[1] = src[1]; \ - src += 6; \ - dst += 2; \ - } \ - } - - /* this function only cares about typesize, and data as a block of bits. */ - switch (SDL_AUDIO_BITSIZE(format)) { - case 8: - strip_chans_6_to_2(Uint8); - break; - case 16: - strip_chans_6_to_2(Uint16); - break; - case 32: - strip_chans_6_to_2(Uint32); - break; - } - -#undef strip_chans_6_to_2 - - cvt->len_cvt /= 3; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -/* Discard top 2 channels of 6 */ -static void SDLCALL -SDL_ConvertStrip_2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting 6 down to quad\n"); -#endif - -#define strip_chans_6_to_4(type) \ - { \ - const type *src = (const type *) cvt->buf; \ - type *dst = (type *) cvt->buf; \ - for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \ - dst[0] = src[0]; \ - dst[1] = src[1]; \ - dst[2] = src[2]; \ - dst[3] = src[3]; \ - src += 6; \ - dst += 4; \ - } \ - } - - /* this function only cares about typesize, and data as a block of bits. */ - switch (SDL_AUDIO_BITSIZE(format)) { - case 8: - strip_chans_6_to_4(Uint8); - break; - case 16: - strip_chans_6_to_4(Uint16); - break; - case 32: - strip_chans_6_to_4(Uint32); - break; - } - -#undef strip_chans_6_to_4 - - cvt->len_cvt /= 6; - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -/* Duplicate a mono channel to both stereo channels */ -static void SDLCALL -SDL_ConvertStereo(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting to stereo\n"); -#endif - -#define dup_chans_1_to_2(type) \ - { \ - const type *src = (const type *) (cvt->buf + cvt->len_cvt); \ - type *dst = (type *) (cvt->buf + cvt->len_cvt * 2); \ - for (i = cvt->len_cvt / 2; i; --i, --src) { \ - const type val = *src; \ - dst -= 2; \ - dst[0] = dst[1] = val; \ - } \ - } - - /* this function only cares about typesize, and data as a block of bits. */ - switch (SDL_AUDIO_BITSIZE(format)) { - case 8: - dup_chans_1_to_2(Uint8); - break; - case 16: - dup_chans_1_to_2(Uint16); - break; - case 32: - dup_chans_1_to_2(Uint32); - break; - } - -#undef dup_chans_1_to_2 - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -/* Duplicate a stereo channel to a pseudo-5.1 stream */ -static void SDLCALL -SDL_ConvertSurround(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting stereo to surround\n"); -#endif - - switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) { - case AUDIO_U8: - { - Uint8 *src, *dst, lf, rf, ce; - - src = (Uint8 *) (cvt->buf + cvt->len_cvt); - dst = (Uint8 *) (cvt->buf + cvt->len_cvt * 3); - for (i = cvt->len_cvt; i; --i) { - dst -= 6; - src -= 2; - lf = src[0]; - rf = src[1]; - ce = (lf / 2) + (rf / 2); - dst[0] = lf; - dst[1] = rf; - dst[2] = lf - ce; - dst[3] = rf - ce; - dst[4] = ce; - dst[5] = ce; - } - } - break; - - case AUDIO_S8: - { - Sint8 *src, *dst, lf, rf, ce; - - src = (Sint8 *) cvt->buf + cvt->len_cvt; - dst = (Sint8 *) cvt->buf + cvt->len_cvt * 3; - for (i = cvt->len_cvt; i; --i) { - dst -= 6; - src -= 2; - lf = src[0]; - rf = src[1]; - ce = (lf / 2) + (rf / 2); - dst[0] = lf; - dst[1] = rf; - dst[2] = lf - ce; - dst[3] = rf - ce; - dst[4] = ce; - dst[5] = ce; - } - } - break; - - case AUDIO_U16: - { - Uint8 *src, *dst; - Uint16 lf, rf, ce, lr, rr; - - src = cvt->buf + cvt->len_cvt; - dst = cvt->buf + cvt->len_cvt * 3; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 12; - src -= 4; - lf = (Uint16) ((src[0] << 8) | src[1]); - rf = (Uint16) ((src[2] << 8) | src[3]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[1] = (lf & 0xFF); - dst[0] = ((lf >> 8) & 0xFF); - dst[3] = (rf & 0xFF); - dst[2] = ((rf >> 8) & 0xFF); - - dst[1 + 4] = (lr & 0xFF); - dst[0 + 4] = ((lr >> 8) & 0xFF); - dst[3 + 4] = (rr & 0xFF); - dst[2 + 4] = ((rr >> 8) & 0xFF); - - dst[1 + 8] = (ce & 0xFF); - dst[0 + 8] = ((ce >> 8) & 0xFF); - dst[3 + 8] = (ce & 0xFF); - dst[2 + 8] = ((ce >> 8) & 0xFF); - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 12; - src -= 4; - lf = (Uint16) ((src[1] << 8) | src[0]); - rf = (Uint16) ((src[3] << 8) | src[2]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[0] = (lf & 0xFF); - dst[1] = ((lf >> 8) & 0xFF); - dst[2] = (rf & 0xFF); - dst[3] = ((rf >> 8) & 0xFF); - - dst[0 + 4] = (lr & 0xFF); - dst[1 + 4] = ((lr >> 8) & 0xFF); - dst[2 + 4] = (rr & 0xFF); - dst[3 + 4] = ((rr >> 8) & 0xFF); - - dst[0 + 8] = (ce & 0xFF); - dst[1 + 8] = ((ce >> 8) & 0xFF); - dst[2 + 8] = (ce & 0xFF); - dst[3 + 8] = ((ce >> 8) & 0xFF); - } - } - } - break; - - case AUDIO_S16: - { - Uint8 *src, *dst; - Sint16 lf, rf, ce, lr, rr; - - src = cvt->buf + cvt->len_cvt; - dst = cvt->buf + cvt->len_cvt * 3; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 12; - src -= 4; - lf = (Sint16) ((src[0] << 8) | src[1]); - rf = (Sint16) ((src[2] << 8) | src[3]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[1] = (lf & 0xFF); - dst[0] = ((lf >> 8) & 0xFF); - dst[3] = (rf & 0xFF); - dst[2] = ((rf >> 8) & 0xFF); - - dst[1 + 4] = (lr & 0xFF); - dst[0 + 4] = ((lr >> 8) & 0xFF); - dst[3 + 4] = (rr & 0xFF); - dst[2 + 4] = ((rr >> 8) & 0xFF); - - dst[1 + 8] = (ce & 0xFF); - dst[0 + 8] = ((ce >> 8) & 0xFF); - dst[3 + 8] = (ce & 0xFF); - dst[2 + 8] = ((ce >> 8) & 0xFF); - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 12; - src -= 4; - lf = (Sint16) ((src[1] << 8) | src[0]); - rf = (Sint16) ((src[3] << 8) | src[2]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[0] = (lf & 0xFF); - dst[1] = ((lf >> 8) & 0xFF); - dst[2] = (rf & 0xFF); - dst[3] = ((rf >> 8) & 0xFF); - - dst[0 + 4] = (lr & 0xFF); - dst[1 + 4] = ((lr >> 8) & 0xFF); - dst[2 + 4] = (rr & 0xFF); - dst[3 + 4] = ((rr >> 8) & 0xFF); - - dst[0 + 8] = (ce & 0xFF); - dst[1 + 8] = ((ce >> 8) & 0xFF); - dst[2 + 8] = (ce & 0xFF); - dst[3 + 8] = ((ce >> 8) & 0xFF); - } - } - } - break; - - case AUDIO_S32: - { - Sint32 lf, rf, ce; - const Uint32 *src = (const Uint32 *) cvt->buf + cvt->len_cvt; - Uint32 *dst = (Uint32 *) cvt->buf + cvt->len_cvt * 3; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 6; - src -= 2; - lf = (Sint32) SDL_SwapBE32(src[0]); - rf = (Sint32) SDL_SwapBE32(src[1]); - ce = (lf / 2) + (rf / 2); - dst[0] = SDL_SwapBE32((Uint32) lf); - dst[1] = SDL_SwapBE32((Uint32) rf); - dst[2] = SDL_SwapBE32((Uint32) (lf - ce)); - dst[3] = SDL_SwapBE32((Uint32) (rf - ce)); - dst[4] = SDL_SwapBE32((Uint32) ce); - dst[5] = SDL_SwapBE32((Uint32) ce); - } - } else { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 6; - src -= 2; - lf = (Sint32) SDL_SwapLE32(src[0]); - rf = (Sint32) SDL_SwapLE32(src[1]); - ce = (lf / 2) + (rf / 2); - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = SDL_SwapLE32((Uint32) (lf - ce)); - dst[3] = SDL_SwapLE32((Uint32) (rf - ce)); - dst[4] = SDL_SwapLE32((Uint32) ce); - dst[5] = SDL_SwapLE32((Uint32) ce); - } - } - } - break; - - case AUDIO_F32: - { - float lf, rf, ce; - const float *src = (const float *) cvt->buf + cvt->len_cvt; - float *dst = (float *) cvt->buf + cvt->len_cvt * 3; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 6; - src -= 2; - lf = SDL_SwapFloatBE(src[0]); - rf = SDL_SwapFloatBE(src[1]); - ce = (lf * 0.5f) + (rf * 0.5f); - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = SDL_SwapFloatBE(lf - ce); - dst[3] = SDL_SwapFloatBE(rf - ce); - dst[4] = dst[5] = SDL_SwapFloatBE(ce); - } - } else { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 6; - src -= 2; - lf = SDL_SwapFloatLE(src[0]); - rf = SDL_SwapFloatLE(src[1]); - ce = (lf * 0.5f) + (rf * 0.5f); - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = SDL_SwapFloatLE(lf - ce); - dst[3] = SDL_SwapFloatLE(rf - ce); - dst[4] = dst[5] = SDL_SwapFloatLE(ce); - } - } - } - break; - - } - cvt->len_cvt *= 3; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -/* Duplicate a stereo channel to a pseudo-4.0 stream */ -static void SDLCALL -SDL_ConvertSurround_4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - -#ifdef DEBUG_CONVERT - fprintf(stderr, "Converting stereo to quad\n"); -#endif - - switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) { - case AUDIO_U8: - { - Uint8 *src, *dst, lf, rf, ce; - - src = (Uint8 *) (cvt->buf + cvt->len_cvt); - dst = (Uint8 *) (cvt->buf + cvt->len_cvt * 2); - for (i = cvt->len_cvt; i; --i) { - dst -= 4; - src -= 2; - lf = src[0]; - rf = src[1]; - ce = (lf / 2) + (rf / 2); - dst[0] = lf; - dst[1] = rf; - dst[2] = lf - ce; - dst[3] = rf - ce; - } - } - break; - - case AUDIO_S8: - { - Sint8 *src, *dst, lf, rf, ce; - - src = (Sint8 *) cvt->buf + cvt->len_cvt; - dst = (Sint8 *) cvt->buf + cvt->len_cvt * 2; - for (i = cvt->len_cvt; i; --i) { - dst -= 4; - src -= 2; - lf = src[0]; - rf = src[1]; - ce = (lf / 2) + (rf / 2); - dst[0] = lf; - dst[1] = rf; - dst[2] = lf - ce; - dst[3] = rf - ce; - } - } - break; - - case AUDIO_U16: - { - Uint8 *src, *dst; - Uint16 lf, rf, ce, lr, rr; - - src = cvt->buf + cvt->len_cvt; - dst = cvt->buf + cvt->len_cvt * 2; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 8; - src -= 4; - lf = (Uint16) ((src[0] << 8) | src[1]); - rf = (Uint16) ((src[2] << 8) | src[3]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[1] = (lf & 0xFF); - dst[0] = ((lf >> 8) & 0xFF); - dst[3] = (rf & 0xFF); - dst[2] = ((rf >> 8) & 0xFF); - - dst[1 + 4] = (lr & 0xFF); - dst[0 + 4] = ((lr >> 8) & 0xFF); - dst[3 + 4] = (rr & 0xFF); - dst[2 + 4] = ((rr >> 8) & 0xFF); - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 8; - src -= 4; - lf = (Uint16) ((src[1] << 8) | src[0]); - rf = (Uint16) ((src[3] << 8) | src[2]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[0] = (lf & 0xFF); - dst[1] = ((lf >> 8) & 0xFF); - dst[2] = (rf & 0xFF); - dst[3] = ((rf >> 8) & 0xFF); - - dst[0 + 4] = (lr & 0xFF); - dst[1 + 4] = ((lr >> 8) & 0xFF); - dst[2 + 4] = (rr & 0xFF); - dst[3 + 4] = ((rr >> 8) & 0xFF); - } - } - } - break; - - case AUDIO_S16: - { - Uint8 *src, *dst; - Sint16 lf, rf, ce, lr, rr; - - src = cvt->buf + cvt->len_cvt; - dst = cvt->buf + cvt->len_cvt * 2; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 8; - src -= 4; - lf = (Sint16) ((src[0] << 8) | src[1]); - rf = (Sint16) ((src[2] << 8) | src[3]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[1] = (lf & 0xFF); - dst[0] = ((lf >> 8) & 0xFF); - dst[3] = (rf & 0xFF); - dst[2] = ((rf >> 8) & 0xFF); - - dst[1 + 4] = (lr & 0xFF); - dst[0 + 4] = ((lr >> 8) & 0xFF); - dst[3 + 4] = (rr & 0xFF); - dst[2 + 4] = ((rr >> 8) & 0xFF); - } - } else { - for (i = cvt->len_cvt / 4; i; --i) { - dst -= 8; - src -= 4; - lf = (Sint16) ((src[1] << 8) | src[0]); - rf = (Sint16) ((src[3] << 8) | src[2]); - ce = (lf / 2) + (rf / 2); - rr = lf - ce; - lr = rf - ce; - dst[0] = (lf & 0xFF); - dst[1] = ((lf >> 8) & 0xFF); - dst[2] = (rf & 0xFF); - dst[3] = ((rf >> 8) & 0xFF); - - dst[0 + 4] = (lr & 0xFF); - dst[1 + 4] = ((lr >> 8) & 0xFF); - dst[2 + 4] = (rr & 0xFF); - dst[3 + 4] = ((rr >> 8) & 0xFF); - } - } - } - break; - - case AUDIO_S32: - { - const Uint32 *src = (const Uint32 *) (cvt->buf + cvt->len_cvt); - Uint32 *dst = (Uint32 *) (cvt->buf + cvt->len_cvt * 2); - Sint32 lf, rf, ce; - - if (SDL_AUDIO_ISBIGENDIAN(format)) { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 4; - src -= 2; - lf = (Sint32) SDL_SwapBE32(src[0]); - rf = (Sint32) SDL_SwapBE32(src[1]); - ce = (lf / 2) + (rf / 2); - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = SDL_SwapBE32((Uint32) (lf - ce)); - dst[3] = SDL_SwapBE32((Uint32) (rf - ce)); - } - } else { - for (i = cvt->len_cvt / 8; i; --i) { - dst -= 4; - src -= 2; - lf = (Sint32) SDL_SwapLE32(src[0]); - rf = (Sint32) SDL_SwapLE32(src[1]); - ce = (lf / 2) + (rf / 2); - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = SDL_SwapLE32((Uint32) (lf - ce)); - dst[3] = SDL_SwapLE32((Uint32) (rf - ce)); - } - } - } - break; - } - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -int -SDL_ConvertAudio(SDL_AudioCVT * cvt) -{ - /* !!! FIXME: (cvt) should be const; stack-copy it here. */ - /* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */ - - /* Make sure there's data to convert */ - if (cvt->buf == NULL) { - SDL_SetError("No buffer allocated for conversion"); - return (-1); - } - /* Return okay if no conversion is necessary */ - cvt->len_cvt = cvt->len; - if (cvt->filters[0] == NULL) { - return (0); - } - - /* Set up the conversion and go! */ - cvt->filter_index = 0; - cvt->filters[0] (cvt, cvt->src_format); - return (0); -} - - -static SDL_AudioFilter -SDL_HandTunedTypeCVT(SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt) -{ - /* - * Fill in any future conversions that are specialized to a - * processor, platform, compiler, or library here. - */ - - return NULL; /* no specialized converter code available. */ -} - - -/* - * Find a converter between two data types. We try to select a hand-tuned - * asm/vectorized/optimized function first, and then fallback to an - * autogenerated function that is customized to convert between two - * specific data types. - */ -static int -SDL_BuildAudioTypeCVT(SDL_AudioCVT * cvt, - SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt) -{ - if (src_fmt != dst_fmt) { - const Uint16 src_bitsize = SDL_AUDIO_BITSIZE(src_fmt); - const Uint16 dst_bitsize = SDL_AUDIO_BITSIZE(dst_fmt); - SDL_AudioFilter filter = SDL_HandTunedTypeCVT(src_fmt, dst_fmt); - - /* No hand-tuned converter? Try the autogenerated ones. */ - if (filter == NULL) { - int i; - for (i = 0; sdl_audio_type_filters[i].filter != NULL; i++) { - const SDL_AudioTypeFilters *filt = &sdl_audio_type_filters[i]; - if ((filt->src_fmt == src_fmt) && (filt->dst_fmt == dst_fmt)) { - filter = filt->filter; - break; - } - } - - if (filter == NULL) { - SDL_SetError("No conversion available for these formats"); - return -1; - } - } - - /* Update (cvt) with filter details... */ - cvt->filters[cvt->filter_index++] = filter; - if (src_bitsize < dst_bitsize) { - const int mult = (dst_bitsize / src_bitsize); - cvt->len_mult *= mult; - cvt->len_ratio *= mult; - } else if (src_bitsize > dst_bitsize) { - cvt->len_ratio /= (src_bitsize / dst_bitsize); - } - - return 1; /* added a converter. */ - } - - return 0; /* no conversion necessary. */ -} - - -static SDL_AudioFilter -SDL_HandTunedResampleCVT(SDL_AudioCVT * cvt, int dst_channels, - int src_rate, int dst_rate) -{ - /* - * Fill in any future conversions that are specialized to a - * processor, platform, compiler, or library here. - */ - - return NULL; /* no specialized converter code available. */ -} - -static int -SDL_FindFrequencyMultiple(const int src_rate, const int dst_rate) -{ - int retval = 0; - - /* If we only built with the arbitrary resamplers, ignore multiples. */ -#if !LESS_RESAMPLERS - int lo, hi; - int div; - - assert(src_rate != 0); - assert(dst_rate != 0); - assert(src_rate != dst_rate); - - if (src_rate < dst_rate) { - lo = src_rate; - hi = dst_rate; - } else { - lo = dst_rate; - hi = src_rate; - } - - /* zero means "not a supported multiple" ... we only do 2x and 4x. */ - if ((hi % lo) != 0) - return 0; /* not a multiple. */ - - div = hi / lo; - retval = ((div == 2) || (div == 4)) ? div : 0; -#endif - - return retval; -} - -static int -SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, int dst_channels, - int src_rate, int dst_rate) -{ - if (src_rate != dst_rate) { - SDL_AudioFilter filter = SDL_HandTunedResampleCVT(cvt, dst_channels, - src_rate, dst_rate); - - /* No hand-tuned converter? Try the autogenerated ones. */ - if (filter == NULL) { - int i; - const int upsample = (src_rate < dst_rate) ? 1 : 0; - const int multiple = - SDL_FindFrequencyMultiple(src_rate, dst_rate); - - for (i = 0; sdl_audio_rate_filters[i].filter != NULL; i++) { - const SDL_AudioRateFilters *filt = &sdl_audio_rate_filters[i]; - if ((filt->fmt == cvt->dst_format) && - (filt->channels == dst_channels) && - (filt->upsample == upsample) && - (filt->multiple == multiple)) { - filter = filt->filter; - break; - } - } - - if (filter == NULL) { - SDL_SetError("No conversion available for these rates"); - return -1; - } - } - - /* Update (cvt) with filter details... */ - cvt->filters[cvt->filter_index++] = filter; - if (src_rate < dst_rate) { - const double mult = ((double) dst_rate) / ((double) src_rate); - cvt->len_mult *= (int) SDL_ceil(mult); - cvt->len_ratio *= mult; - } else { - cvt->len_ratio /= ((double) src_rate) / ((double) dst_rate); - } - - return 1; /* added a converter. */ - } - - return 0; /* no conversion necessary. */ -} - - -/* Creates a set of audio filters to convert from one format to another. - Returns -1 if the format conversion is not supported, 0 if there's - no conversion needed, or 1 if the audio filter is set up. -*/ - -int -SDL_BuildAudioCVT(SDL_AudioCVT * cvt, - SDL_AudioFormat src_fmt, Uint8 src_channels, int src_rate, - SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate) -{ - /* - * !!! FIXME: reorder filters based on which grow/shrink the buffer. - * !!! FIXME: ideally, we should do everything that shrinks the buffer - * !!! FIXME: first, so we don't have to process as many bytes in a given - * !!! FIXME: filter and abuse the CPU cache less. This might not be as - * !!! FIXME: good in practice as it sounds in theory, though. - */ - - /* there are no unsigned types over 16 bits, so catch this up front. */ - if ((SDL_AUDIO_BITSIZE(src_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(src_fmt))) { - SDL_SetError("Invalid source format"); - return -1; - } - if ((SDL_AUDIO_BITSIZE(dst_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(dst_fmt))) { - SDL_SetError("Invalid destination format"); - return -1; - } - - /* prevent possible divisions by zero, etc. */ - if ((src_rate == 0) || (dst_rate == 0)) { - SDL_SetError("Source or destination rate is zero"); - return -1; - } -#ifdef DEBUG_CONVERT - printf("Build format %04x->%04x, channels %u->%u, rate %d->%d\n", - src_fmt, dst_fmt, src_channels, dst_channels, src_rate, dst_rate); -#endif - - /* Start off with no conversion necessary */ - SDL_zerop(cvt); - cvt->src_format = src_fmt; - cvt->dst_format = dst_fmt; - cvt->needed = 0; - cvt->filter_index = 0; - cvt->filters[0] = NULL; - cvt->len_mult = 1; - cvt->len_ratio = 1.0; - cvt->rate_incr = ((double) dst_rate) / ((double) src_rate); - - /* Convert data types, if necessary. Updates (cvt). */ - if (SDL_BuildAudioTypeCVT(cvt, src_fmt, dst_fmt) == -1) { - return -1; /* shouldn't happen, but just in case... */ - } - - /* Channel conversion */ - if (src_channels != dst_channels) { - if ((src_channels == 1) && (dst_channels > 1)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertStereo; - cvt->len_mult *= 2; - src_channels = 2; - cvt->len_ratio *= 2; - } - if ((src_channels == 2) && (dst_channels == 6)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertSurround; - src_channels = 6; - cvt->len_mult *= 3; - cvt->len_ratio *= 3; - } - if ((src_channels == 2) && (dst_channels == 4)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertSurround_4; - src_channels = 4; - cvt->len_mult *= 2; - cvt->len_ratio *= 2; - } - while ((src_channels * 2) <= dst_channels) { - cvt->filters[cvt->filter_index++] = SDL_ConvertStereo; - cvt->len_mult *= 2; - src_channels *= 2; - cvt->len_ratio *= 2; - } - if ((src_channels == 6) && (dst_channels <= 2)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertStrip; - src_channels = 2; - cvt->len_ratio /= 3; - } - if ((src_channels == 6) && (dst_channels == 4)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertStrip_2; - src_channels = 4; - cvt->len_ratio /= 2; - } - /* This assumes that 4 channel audio is in the format: - Left {front/back} + Right {front/back} - so converting to L/R stereo works properly. - */ - while (((src_channels % 2) == 0) && - ((src_channels / 2) >= dst_channels)) { - cvt->filters[cvt->filter_index++] = SDL_ConvertMono; - src_channels /= 2; - cvt->len_ratio /= 2; - } - if (src_channels != dst_channels) { - /* Uh oh.. */ ; - } - } - - /* Do rate conversion, if necessary. Updates (cvt). */ - if (SDL_BuildAudioResampleCVT(cvt, dst_channels, src_rate, dst_rate) == - -1) { - return -1; /* shouldn't happen, but just in case... */ - } - - /* Set up the filter information */ - if (cvt->filter_index != 0) { - cvt->needed = 1; - cvt->src_format = src_fmt; - cvt->dst_format = dst_fmt; - cvt->len = 0; - cvt->buf = NULL; - cvt->filters[cvt->filter_index] = NULL; - } - return (cvt->needed); -} - - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audiodev.c b/src/helper/android/SDL1.3/src/audio/SDL_audiodev.c deleted file mode 100644 index ed1b911b6..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audiodev.c +++ /dev/null @@ -1,139 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Get the name of the audio device we use for output */ - -#if SDL_AUDIO_DRIVER_BSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO - -#include -#include -#include -#include /* For close() */ - -#include "SDL_stdinc.h" -#include "SDL_audiodev_c.h" - -#ifndef _PATH_DEV_DSP -#if defined(__NETBSD__) || defined(__OPENBSD__) -#define _PATH_DEV_DSP "/dev/audio" -#else -#define _PATH_DEV_DSP "/dev/dsp" -#endif -#endif -#ifndef _PATH_DEV_DSP24 -#define _PATH_DEV_DSP24 "/dev/sound/dsp" -#endif -#ifndef _PATH_DEV_AUDIO -#define _PATH_DEV_AUDIO "/dev/audio" -#endif - -static inline void -test_device(const char *fname, int flags, int (*test) (int fd), - char ***devices, int *devCount) -{ - struct stat sb; - if ((stat(fname, &sb) == 0) && (S_ISCHR(sb.st_mode))) { - int audio_fd = open(fname, flags, 0); - if ((audio_fd >= 0) && (test(audio_fd))) { - void *p = - SDL_realloc(*devices, ((*devCount) + 1) * sizeof(char *)); - if (p != NULL) { - size_t len = strlen(fname) + 1; - char *str = (char *) SDL_malloc(len); - *devices = (char **) p; - if (str != NULL) { - SDL_strlcpy(str, fname, len); - (*devices)[(*devCount)++] = str; - } - } - close(audio_fd); - } - } -} - -void -SDL_FreeUnixAudioDevices(char ***devices, int *devCount) -{ - int i = *devCount; - if ((i > 0) && (*devices != NULL)) { - while (i--) { - SDL_free((*devices)[i]); - } - } - - if (*devices != NULL) { - SDL_free(*devices); - } - - *devices = NULL; - *devCount = 0; -} - -static int -test_stub(int fd) -{ - return 1; -} - -void -SDL_EnumUnixAudioDevices(int flags, int classic, int (*test) (int fd), - char ***devices, int *devCount) -{ - const char *audiodev; - char audiopath[1024]; - - if (test == NULL) - test = test_stub; - - /* Figure out what our audio device is */ - if (((audiodev = SDL_getenv("SDL_PATH_DSP")) == NULL) && - ((audiodev = SDL_getenv("AUDIODEV")) == NULL)) { - if (classic) { - audiodev = _PATH_DEV_AUDIO; - } else { - struct stat sb; - - /* Added support for /dev/sound/\* in Linux 2.4 */ - if (((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode)) - && ((stat(_PATH_DEV_DSP24, &sb) == 0) - && S_ISCHR(sb.st_mode))) { - audiodev = _PATH_DEV_DSP24; - } else { - audiodev = _PATH_DEV_DSP; - } - } - } - test_device(audiodev, flags, test, devices, devCount); - - if (SDL_strlen(audiodev) < (sizeof(audiopath) - 3)) { - int instance = 0; - while (instance++ <= 64) { - SDL_snprintf(audiopath, SDL_arraysize(audiopath), - "%s%d", audiodev, instance); - test_device(audiopath, flags, test, devices, devCount); - } - } -} - -#endif /* Audio driver selection */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audiodev_c.h b/src/helper/android/SDL1.3/src/audio/SDL_audiodev_c.h deleted file mode 100644 index 9ba18ba8d..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audiodev_c.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -void SDL_EnumUnixAudioDevices(int flags, int classic, int (*test) (int fd), - char ***devs, int *count); -void SDL_FreeUnixAudioDevices(char ***devices, int *devCount); - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audiomem.h b/src/helper/android/SDL1.3/src/audio/SDL_audiomem.h deleted file mode 100644 index d26adf195..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audiomem.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#define SDL_AllocAudioMem SDL_malloc -#define SDL_FreeAudioMem SDL_free -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_audiotypecvt.c b/src/helper/android/SDL1.3/src/audio/SDL_audiotypecvt.c deleted file mode 100644 index 2ce504095..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_audiotypecvt.c +++ /dev/null @@ -1,16216 +0,0 @@ -/* DO NOT EDIT! This file is generated by sdlgenaudiocvt.pl */ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ - -#include "SDL_config.h" -#include "SDL_audio.h" -#include "SDL_audio_c.h" - -#ifndef DEBUG_CONVERT -#define DEBUG_CONVERT 0 -#endif - - -/* If you can guarantee your data and need space, you can eliminate code... */ - -/* Just build the arbitrary resamplers if you're saving code space. */ -#ifndef LESS_RESAMPLERS -#define LESS_RESAMPLERS 0 -#endif - -/* Don't build any resamplers if you're REALLY saving code space. */ -#ifndef NO_RESAMPLERS -#define NO_RESAMPLERS 0 -#endif - -/* Don't build any type converters if you're saving code space. */ -#ifndef NO_CONVERTERS -#define NO_CONVERTERS 0 -#endif - - -/* *INDENT-OFF* */ - -#define DIVBY127 0.0078740157480315f -#define DIVBY32767 3.05185094759972e-05f -#define DIVBY2147483647 4.6566128752458e-10f - -#if !NO_CONVERTERS - -static void SDLCALL -SDL_Convert_U8_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S8.\n"); -#endif - - src = (const Uint8 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, ++src, ++dst) { - const Sint8 val = ((*src) ^ 0x80); - *dst = ((Sint8) val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_U8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Uint16 val = (((Uint16) *src) << 8); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Uint16 val = (((Uint16) *src) << 8); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const float val = ((((float) *src) * DIVBY127) - 1.0f); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_U8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const float val = ((((float) *src) * DIVBY127) - 1.0f); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U8.\n"); -#endif - - src = (const Uint8 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, ++src, ++dst) { - const Uint8 val = ((((Sint8) *src)) ^ 0x80); - *dst = val; - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_S8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint16 val = (((Sint16) ((Sint8) *src)) << 8); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint16 val = (((Sint16) ((Sint8) *src)) << 8); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint8) *src)) << 24); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint8) *src)) << 24); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const float val = (((float) ((Sint8) *src)) * DIVBY127); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_S8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint8 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1; - for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { - const float val = (((float) ((Sint8) *src)) * DIVBY127); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_U8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (SDL_SwapLE16(*src) >> 8)); - *dst = val; - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((SDL_SwapLE16(*src)) ^ 0x8000) >> 8)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((SDL_SwapLE16(*src)) ^ 0x8000); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_U16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = SDL_SwapLE16(*src); - *dst = SDL_SwapBE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((SDL_SwapLE16(*src)) ^ 0x8000); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_U16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000) >> 8)); - *dst = val; - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((Sint16) SDL_SwapLE16(*src)) >> 8)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = ((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000); - *dst = SDL_SwapLE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = ((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000); - *dst = SDL_SwapBE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) SDL_SwapLE16(*src)); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_S16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_U8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (SDL_SwapBE16(*src) >> 8)); - *dst = val; - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((SDL_SwapBE16(*src)) ^ 0x8000) >> 8)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_U16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = SDL_SwapBE16(*src); - *dst = SDL_SwapLE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((SDL_SwapBE16(*src)) ^ 0x8000); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((SDL_SwapBE16(*src)) ^ 0x8000); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_U16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000) >> 8)); - *dst = val; - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S8.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((Sint16) SDL_SwapBE16(*src)) >> 8)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = ((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000); - *dst = SDL_SwapLE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S16LSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) SDL_SwapBE16(*src)); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U16MSB.\n"); -#endif - - src = (const Uint16 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) { - const Uint16 val = ((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000); - *dst = SDL_SwapBE16(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32LSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767); - *dst = SDL_SwapFloatLE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_S16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint16 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32MSB.\n"); -#endif - - src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1; - for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { - const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767); - *dst = SDL_SwapFloatBE(val); - } - - cvt->len_cvt *= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U8.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 24)); - *dst = val; - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S8.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((Sint32) SDL_SwapLE32(*src)) >> 24)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U16LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 16)); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S16LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (((Sint32) SDL_SwapLE32(*src)) >> 16)); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U16MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 16)); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S16MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (((Sint32) SDL_SwapLE32(*src)) >> 16)); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S32MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) SDL_SwapLE32(*src)); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_F32LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const float val = (((float) ((Sint32) SDL_SwapLE32(*src))) * DIVBY2147483647); - *dst = SDL_SwapFloatLE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_S32LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_F32MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const float val = (((float) ((Sint32) SDL_SwapLE32(*src))) * DIVBY2147483647); - *dst = SDL_SwapFloatBE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U8.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 24)); - *dst = val; - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S8.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (((Sint32) SDL_SwapBE32(*src)) >> 24)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U16LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 16)); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S16LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (((Sint32) SDL_SwapBE32(*src)) >> 16)); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U16MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 16)); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S16MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (((Sint32) SDL_SwapBE32(*src)) >> 16)); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S32LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) SDL_SwapBE32(*src)); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_F32LSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const float val = (((float) ((Sint32) SDL_SwapBE32(*src))) * DIVBY2147483647); - *dst = SDL_SwapFloatLE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -static void SDLCALL -SDL_Convert_S32MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const Uint32 *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_F32MSB.\n"); -#endif - - src = (const Uint32 *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) { - const float val = (((float) ((Sint32) SDL_SwapBE32(*src))) * DIVBY2147483647); - *dst = SDL_SwapFloatBE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U8.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) ((SDL_SwapFloatLE(*src) + 1.0f) * 127.0f)); - *dst = val; - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S8.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (SDL_SwapFloatLE(*src) * 127.0f)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U16LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) ((SDL_SwapFloatLE(*src) + 1.0f) * 32767.0f)); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S16LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (SDL_SwapFloatLE(*src) * 32767.0f)); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U16MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) ((SDL_SwapFloatLE(*src) + 1.0f) * 32767.0f)); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S16MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (SDL_SwapFloatLE(*src) * 32767.0f)); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S32LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) (SDL_SwapFloatLE(*src) * 2147483647.0)); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S32MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) (SDL_SwapFloatLE(*src) * 2147483647.0)); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_F32LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_F32MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const float val = SDL_SwapFloatLE(*src); - *dst = SDL_SwapFloatBE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U8.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint8 val = ((Uint8) ((SDL_SwapFloatBE(*src) + 1.0f) * 127.0f)); - *dst = val; - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U8); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint8 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S8.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint8 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint8 val = ((Sint8) (SDL_SwapFloatBE(*src) * 127.0f)); - *dst = ((Sint8) val); - } - - cvt->len_cvt /= 4; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S8); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U16LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) ((SDL_SwapFloatBE(*src) + 1.0f) * 32767.0f)); - *dst = SDL_SwapLE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S16LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (SDL_SwapFloatBE(*src) * 32767.0f)); - *dst = ((Sint16) SDL_SwapLE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Uint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U16MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Uint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Uint16 val = ((Uint16) ((SDL_SwapFloatBE(*src) + 1.0f) * 32767.0f)); - *dst = SDL_SwapBE16(val); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint16 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S16MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint16 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint16 val = ((Sint16) (SDL_SwapFloatBE(*src) * 32767.0f)); - *dst = ((Sint16) SDL_SwapBE16(val)); - } - - cvt->len_cvt /= 2; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S32LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) (SDL_SwapFloatBE(*src) * 2147483647.0)); - *dst = ((Sint32) SDL_SwapLE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - Sint32 *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S32MSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (Sint32 *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const Sint32 val = ((Sint32) (SDL_SwapFloatBE(*src) * 2147483647.0)); - *dst = ((Sint32) SDL_SwapBE32(val)); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB); - } -} - -static void SDLCALL -SDL_Convert_F32MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ - int i; - const float *src; - float *dst; - -#if DEBUG_CONVERT - fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_F32LSB.\n"); -#endif - - src = (const float *) cvt->buf; - dst = (float *) cvt->buf; - for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) { - const float val = SDL_SwapFloatBE(*src); - *dst = SDL_SwapFloatLE(val); - } - - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB); - } -} - -#endif /* !NO_CONVERTERS */ - - -const SDL_AudioTypeFilters sdl_audio_type_filters[] = -{ -#if !NO_CONVERTERS - { AUDIO_U8, AUDIO_S8, SDL_Convert_U8_to_S8 }, - { AUDIO_U8, AUDIO_U16LSB, SDL_Convert_U8_to_U16LSB }, - { AUDIO_U8, AUDIO_S16LSB, SDL_Convert_U8_to_S16LSB }, - { AUDIO_U8, AUDIO_U16MSB, SDL_Convert_U8_to_U16MSB }, - { AUDIO_U8, AUDIO_S16MSB, SDL_Convert_U8_to_S16MSB }, - { AUDIO_U8, AUDIO_S32LSB, SDL_Convert_U8_to_S32LSB }, - { AUDIO_U8, AUDIO_S32MSB, SDL_Convert_U8_to_S32MSB }, - { AUDIO_U8, AUDIO_F32LSB, SDL_Convert_U8_to_F32LSB }, - { AUDIO_U8, AUDIO_F32MSB, SDL_Convert_U8_to_F32MSB }, - { AUDIO_S8, AUDIO_U8, SDL_Convert_S8_to_U8 }, - { AUDIO_S8, AUDIO_U16LSB, SDL_Convert_S8_to_U16LSB }, - { AUDIO_S8, AUDIO_S16LSB, SDL_Convert_S8_to_S16LSB }, - { AUDIO_S8, AUDIO_U16MSB, SDL_Convert_S8_to_U16MSB }, - { AUDIO_S8, AUDIO_S16MSB, SDL_Convert_S8_to_S16MSB }, - { AUDIO_S8, AUDIO_S32LSB, SDL_Convert_S8_to_S32LSB }, - { AUDIO_S8, AUDIO_S32MSB, SDL_Convert_S8_to_S32MSB }, - { AUDIO_S8, AUDIO_F32LSB, SDL_Convert_S8_to_F32LSB }, - { AUDIO_S8, AUDIO_F32MSB, SDL_Convert_S8_to_F32MSB }, - { AUDIO_U16LSB, AUDIO_U8, SDL_Convert_U16LSB_to_U8 }, - { AUDIO_U16LSB, AUDIO_S8, SDL_Convert_U16LSB_to_S8 }, - { AUDIO_U16LSB, AUDIO_S16LSB, SDL_Convert_U16LSB_to_S16LSB }, - { AUDIO_U16LSB, AUDIO_U16MSB, SDL_Convert_U16LSB_to_U16MSB }, - { AUDIO_U16LSB, AUDIO_S16MSB, SDL_Convert_U16LSB_to_S16MSB }, - { AUDIO_U16LSB, AUDIO_S32LSB, SDL_Convert_U16LSB_to_S32LSB }, - { AUDIO_U16LSB, AUDIO_S32MSB, SDL_Convert_U16LSB_to_S32MSB }, - { AUDIO_U16LSB, AUDIO_F32LSB, SDL_Convert_U16LSB_to_F32LSB }, - { AUDIO_U16LSB, AUDIO_F32MSB, SDL_Convert_U16LSB_to_F32MSB }, - { AUDIO_S16LSB, AUDIO_U8, SDL_Convert_S16LSB_to_U8 }, - { AUDIO_S16LSB, AUDIO_S8, SDL_Convert_S16LSB_to_S8 }, - { AUDIO_S16LSB, AUDIO_U16LSB, SDL_Convert_S16LSB_to_U16LSB }, - { AUDIO_S16LSB, AUDIO_U16MSB, SDL_Convert_S16LSB_to_U16MSB }, - { AUDIO_S16LSB, AUDIO_S16MSB, SDL_Convert_S16LSB_to_S16MSB }, - { AUDIO_S16LSB, AUDIO_S32LSB, SDL_Convert_S16LSB_to_S32LSB }, - { AUDIO_S16LSB, AUDIO_S32MSB, SDL_Convert_S16LSB_to_S32MSB }, - { AUDIO_S16LSB, AUDIO_F32LSB, SDL_Convert_S16LSB_to_F32LSB }, - { AUDIO_S16LSB, AUDIO_F32MSB, SDL_Convert_S16LSB_to_F32MSB }, - { AUDIO_U16MSB, AUDIO_U8, SDL_Convert_U16MSB_to_U8 }, - { AUDIO_U16MSB, AUDIO_S8, SDL_Convert_U16MSB_to_S8 }, - { AUDIO_U16MSB, AUDIO_U16LSB, SDL_Convert_U16MSB_to_U16LSB }, - { AUDIO_U16MSB, AUDIO_S16LSB, SDL_Convert_U16MSB_to_S16LSB }, - { AUDIO_U16MSB, AUDIO_S16MSB, SDL_Convert_U16MSB_to_S16MSB }, - { AUDIO_U16MSB, AUDIO_S32LSB, SDL_Convert_U16MSB_to_S32LSB }, - { AUDIO_U16MSB, AUDIO_S32MSB, SDL_Convert_U16MSB_to_S32MSB }, - { AUDIO_U16MSB, AUDIO_F32LSB, SDL_Convert_U16MSB_to_F32LSB }, - { AUDIO_U16MSB, AUDIO_F32MSB, SDL_Convert_U16MSB_to_F32MSB }, - { AUDIO_S16MSB, AUDIO_U8, SDL_Convert_S16MSB_to_U8 }, - { AUDIO_S16MSB, AUDIO_S8, SDL_Convert_S16MSB_to_S8 }, - { AUDIO_S16MSB, AUDIO_U16LSB, SDL_Convert_S16MSB_to_U16LSB }, - { AUDIO_S16MSB, AUDIO_S16LSB, SDL_Convert_S16MSB_to_S16LSB }, - { AUDIO_S16MSB, AUDIO_U16MSB, SDL_Convert_S16MSB_to_U16MSB }, - { AUDIO_S16MSB, AUDIO_S32LSB, SDL_Convert_S16MSB_to_S32LSB }, - { AUDIO_S16MSB, AUDIO_S32MSB, SDL_Convert_S16MSB_to_S32MSB }, - { AUDIO_S16MSB, AUDIO_F32LSB, SDL_Convert_S16MSB_to_F32LSB }, - { AUDIO_S16MSB, AUDIO_F32MSB, SDL_Convert_S16MSB_to_F32MSB }, - { AUDIO_S32LSB, AUDIO_U8, SDL_Convert_S32LSB_to_U8 }, - { AUDIO_S32LSB, AUDIO_S8, SDL_Convert_S32LSB_to_S8 }, - { AUDIO_S32LSB, AUDIO_U16LSB, SDL_Convert_S32LSB_to_U16LSB }, - { AUDIO_S32LSB, AUDIO_S16LSB, SDL_Convert_S32LSB_to_S16LSB }, - { AUDIO_S32LSB, AUDIO_U16MSB, SDL_Convert_S32LSB_to_U16MSB }, - { AUDIO_S32LSB, AUDIO_S16MSB, SDL_Convert_S32LSB_to_S16MSB }, - { AUDIO_S32LSB, AUDIO_S32MSB, SDL_Convert_S32LSB_to_S32MSB }, - { AUDIO_S32LSB, AUDIO_F32LSB, SDL_Convert_S32LSB_to_F32LSB }, - { AUDIO_S32LSB, AUDIO_F32MSB, SDL_Convert_S32LSB_to_F32MSB }, - { AUDIO_S32MSB, AUDIO_U8, SDL_Convert_S32MSB_to_U8 }, - { AUDIO_S32MSB, AUDIO_S8, SDL_Convert_S32MSB_to_S8 }, - { AUDIO_S32MSB, AUDIO_U16LSB, SDL_Convert_S32MSB_to_U16LSB }, - { AUDIO_S32MSB, AUDIO_S16LSB, SDL_Convert_S32MSB_to_S16LSB }, - { AUDIO_S32MSB, AUDIO_U16MSB, SDL_Convert_S32MSB_to_U16MSB }, - { AUDIO_S32MSB, AUDIO_S16MSB, SDL_Convert_S32MSB_to_S16MSB }, - { AUDIO_S32MSB, AUDIO_S32LSB, SDL_Convert_S32MSB_to_S32LSB }, - { AUDIO_S32MSB, AUDIO_F32LSB, SDL_Convert_S32MSB_to_F32LSB }, - { AUDIO_S32MSB, AUDIO_F32MSB, SDL_Convert_S32MSB_to_F32MSB }, - { AUDIO_F32LSB, AUDIO_U8, SDL_Convert_F32LSB_to_U8 }, - { AUDIO_F32LSB, AUDIO_S8, SDL_Convert_F32LSB_to_S8 }, - { AUDIO_F32LSB, AUDIO_U16LSB, SDL_Convert_F32LSB_to_U16LSB }, - { AUDIO_F32LSB, AUDIO_S16LSB, SDL_Convert_F32LSB_to_S16LSB }, - { AUDIO_F32LSB, AUDIO_U16MSB, SDL_Convert_F32LSB_to_U16MSB }, - { AUDIO_F32LSB, AUDIO_S16MSB, SDL_Convert_F32LSB_to_S16MSB }, - { AUDIO_F32LSB, AUDIO_S32LSB, SDL_Convert_F32LSB_to_S32LSB }, - { AUDIO_F32LSB, AUDIO_S32MSB, SDL_Convert_F32LSB_to_S32MSB }, - { AUDIO_F32LSB, AUDIO_F32MSB, SDL_Convert_F32LSB_to_F32MSB }, - { AUDIO_F32MSB, AUDIO_U8, SDL_Convert_F32MSB_to_U8 }, - { AUDIO_F32MSB, AUDIO_S8, SDL_Convert_F32MSB_to_S8 }, - { AUDIO_F32MSB, AUDIO_U16LSB, SDL_Convert_F32MSB_to_U16LSB }, - { AUDIO_F32MSB, AUDIO_S16LSB, SDL_Convert_F32MSB_to_S16LSB }, - { AUDIO_F32MSB, AUDIO_U16MSB, SDL_Convert_F32MSB_to_U16MSB }, - { AUDIO_F32MSB, AUDIO_S16MSB, SDL_Convert_F32MSB_to_S16MSB }, - { AUDIO_F32MSB, AUDIO_S32LSB, SDL_Convert_F32MSB_to_S32LSB }, - { AUDIO_F32MSB, AUDIO_S32MSB, SDL_Convert_F32MSB_to_S32MSB }, - { AUDIO_F32MSB, AUDIO_F32LSB, SDL_Convert_F32MSB_to_F32LSB }, -#endif /* !NO_CONVERTERS */ - { 0, 0, NULL } -}; - - -#if !NO_RESAMPLERS - -static void SDLCALL -SDL_Upsample_U8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 16; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 1; - Uint8 sample0 = src[0]; - Uint8 last_sample0 = sample0; - while (dst > target) { - dst[0] = sample0; - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 16; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Uint8 sample0 = src[0]; - Uint8 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = sample0; - dst++; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 2; - Uint8 sample1 = src[1]; - Uint8 sample0 = src[0]; - Uint8 last_sample1 = sample1; - Uint8 last_sample0 = sample0; - while (dst > target) { - dst[1] = sample1; - dst[0] = sample0; - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Uint8 sample0 = src[0]; - Uint8 sample1 = src[1]; - Uint8 last_sample0 = sample0; - Uint8 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = sample0; - dst[1] = sample1; - dst += 2; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 4; - Uint8 sample3 = src[3]; - Uint8 sample2 = src[2]; - Uint8 sample1 = src[1]; - Uint8 sample0 = src[0]; - Uint8 last_sample3 = sample3; - Uint8 last_sample2 = sample2; - Uint8 last_sample1 = sample1; - Uint8 last_sample0 = sample0; - while (dst > target) { - dst[3] = sample3; - dst[2] = sample2; - dst[1] = sample1; - dst[0] = sample0; - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Uint8 sample0 = src[0]; - Uint8 sample1 = src[1]; - Uint8 sample2 = src[2]; - Uint8 sample3 = src[3]; - Uint8 last_sample0 = sample0; - Uint8 last_sample1 = sample1; - Uint8 last_sample2 = sample2; - Uint8 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = sample0; - dst[1] = sample1; - dst[2] = sample2; - dst[3] = sample3; - dst += 4; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 96; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 6; - Uint8 sample5 = src[5]; - Uint8 sample4 = src[4]; - Uint8 sample3 = src[3]; - Uint8 sample2 = src[2]; - Uint8 sample1 = src[1]; - Uint8 sample0 = src[0]; - Uint8 last_sample5 = sample5; - Uint8 last_sample4 = sample4; - Uint8 last_sample3 = sample3; - Uint8 last_sample2 = sample2; - Uint8 last_sample1 = sample1; - Uint8 last_sample0 = sample0; - while (dst > target) { - dst[5] = sample5; - dst[4] = sample4; - dst[3] = sample3; - dst[2] = sample2; - dst[1] = sample1; - dst[0] = sample0; - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1); - sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1); - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 96; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Uint8 sample0 = src[0]; - Uint8 sample1 = src[1]; - Uint8 sample2 = src[2]; - Uint8 sample3 = src[3]; - Uint8 sample4 = src[4]; - Uint8 sample5 = src[5]; - Uint8 last_sample0 = sample0; - Uint8 last_sample1 = sample1; - Uint8 last_sample2 = sample2; - Uint8 last_sample3 = sample3; - Uint8 last_sample4 = sample4; - Uint8 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = sample0; - dst[1] = sample1; - dst[2] = sample2; - dst[3] = sample3; - dst[4] = sample4; - dst[5] = sample5; - dst += 6; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1); - sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 8; - Uint8 sample7 = src[7]; - Uint8 sample6 = src[6]; - Uint8 sample5 = src[5]; - Uint8 sample4 = src[4]; - Uint8 sample3 = src[3]; - Uint8 sample2 = src[2]; - Uint8 sample1 = src[1]; - Uint8 sample0 = src[0]; - Uint8 last_sample7 = sample7; - Uint8 last_sample6 = sample6; - Uint8 last_sample5 = sample5; - Uint8 last_sample4 = sample4; - Uint8 last_sample3 = sample3; - Uint8 last_sample2 = sample2; - Uint8 last_sample1 = sample1; - Uint8 last_sample0 = sample0; - while (dst > target) { - dst[7] = sample7; - dst[6] = sample6; - dst[5] = sample5; - dst[4] = sample4; - dst[3] = sample3; - dst[2] = sample2; - dst[1] = sample1; - dst[0] = sample0; - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Uint8) ((((Sint16) src[7]) + ((Sint16) last_sample7)) >> 1); - sample6 = (Uint8) ((((Sint16) src[6]) + ((Sint16) last_sample6)) >> 1); - sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1); - sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1); - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Uint8 sample0 = src[0]; - Uint8 sample1 = src[1]; - Uint8 sample2 = src[2]; - Uint8 sample3 = src[3]; - Uint8 sample4 = src[4]; - Uint8 sample5 = src[5]; - Uint8 sample6 = src[6]; - Uint8 sample7 = src[7]; - Uint8 last_sample0 = sample0; - Uint8 last_sample1 = sample1; - Uint8 last_sample2 = sample2; - Uint8 last_sample3 = sample3; - Uint8 last_sample4 = sample4; - Uint8 last_sample5 = sample5; - Uint8 last_sample6 = sample6; - Uint8 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = sample0; - dst[1] = sample1; - dst[2] = sample2; - dst[3] = sample3; - dst[4] = sample4; - dst[5] = sample5; - dst[6] = sample6; - dst[7] = sample7; - dst += 8; - sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1); - sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1); - sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1); - sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1); - sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1); - sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1); - sample6 = (Uint8) ((((Sint16) src[6]) + ((Sint16) last_sample6)) >> 1); - sample7 = (Uint8) ((((Sint16) src[7]) + ((Sint16) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 16; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 1; - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample0 = sample0; - while (dst > target) { - dst[0] = ((Sint8) sample0); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 16; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint8) sample0); - dst++; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 2; - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample1 = sample1; - Sint8 last_sample0 = sample0; - while (dst > target) { - dst[1] = ((Sint8) sample1); - dst[0] = ((Sint8) sample0); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 last_sample0 = sample0; - Sint8 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint8) sample0); - dst[1] = ((Sint8) sample1); - dst += 2; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 4; - Sint8 sample3 = ((Sint8) src[3]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample3 = sample3; - Sint8 last_sample2 = sample2; - Sint8 last_sample1 = sample1; - Sint8 last_sample0 = sample0; - while (dst > target) { - dst[3] = ((Sint8) sample3); - dst[2] = ((Sint8) sample2); - dst[1] = ((Sint8) sample1); - dst[0] = ((Sint8) sample0); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample3 = ((Sint8) src[3]); - Sint8 last_sample0 = sample0; - Sint8 last_sample1 = sample1; - Sint8 last_sample2 = sample2; - Sint8 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint8) sample0); - dst[1] = ((Sint8) sample1); - dst[2] = ((Sint8) sample2); - dst[3] = ((Sint8) sample3); - dst += 4; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 96; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 6; - Sint8 sample5 = ((Sint8) src[5]); - Sint8 sample4 = ((Sint8) src[4]); - Sint8 sample3 = ((Sint8) src[3]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample5 = sample5; - Sint8 last_sample4 = sample4; - Sint8 last_sample3 = sample3; - Sint8 last_sample2 = sample2; - Sint8 last_sample1 = sample1; - Sint8 last_sample0 = sample0; - while (dst > target) { - dst[5] = ((Sint8) sample5); - dst[4] = ((Sint8) sample4); - dst[3] = ((Sint8) sample3); - dst[2] = ((Sint8) sample2); - dst[1] = ((Sint8) sample1); - dst[0] = ((Sint8) sample0); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1); - sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1); - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 96; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample3 = ((Sint8) src[3]); - Sint8 sample4 = ((Sint8) src[4]); - Sint8 sample5 = ((Sint8) src[5]); - Sint8 last_sample0 = sample0; - Sint8 last_sample1 = sample1; - Sint8 last_sample2 = sample2; - Sint8 last_sample3 = sample3; - Sint8 last_sample4 = sample4; - Sint8 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint8) sample0); - dst[1] = ((Sint8) sample1); - dst[2] = ((Sint8) sample2); - dst[3] = ((Sint8) sample3); - dst[4] = ((Sint8) sample4); - dst[5] = ((Sint8) sample5); - dst += 6; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1); - sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 8; - Sint8 sample7 = ((Sint8) src[7]); - Sint8 sample6 = ((Sint8) src[6]); - Sint8 sample5 = ((Sint8) src[5]); - Sint8 sample4 = ((Sint8) src[4]); - Sint8 sample3 = ((Sint8) src[3]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 last_sample7 = sample7; - Sint8 last_sample6 = sample6; - Sint8 last_sample5 = sample5; - Sint8 last_sample4 = sample4; - Sint8 last_sample3 = sample3; - Sint8 last_sample2 = sample2; - Sint8 last_sample1 = sample1; - Sint8 last_sample0 = sample0; - while (dst > target) { - dst[7] = ((Sint8) sample7); - dst[6] = ((Sint8) sample6); - dst[5] = ((Sint8) sample5); - dst[4] = ((Sint8) sample4); - dst[3] = ((Sint8) sample3); - dst[2] = ((Sint8) sample2); - dst[1] = ((Sint8) sample1); - dst[0] = ((Sint8) sample0); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Sint8) ((((Sint16) ((Sint8) src[7])) + ((Sint16) last_sample7)) >> 1); - sample6 = (Sint8) ((((Sint16) ((Sint8) src[6])) + ((Sint16) last_sample6)) >> 1); - sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1); - sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1); - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint8 sample0 = ((Sint8) src[0]); - Sint8 sample1 = ((Sint8) src[1]); - Sint8 sample2 = ((Sint8) src[2]); - Sint8 sample3 = ((Sint8) src[3]); - Sint8 sample4 = ((Sint8) src[4]); - Sint8 sample5 = ((Sint8) src[5]); - Sint8 sample6 = ((Sint8) src[6]); - Sint8 sample7 = ((Sint8) src[7]); - Sint8 last_sample0 = sample0; - Sint8 last_sample1 = sample1; - Sint8 last_sample2 = sample2; - Sint8 last_sample3 = sample3; - Sint8 last_sample4 = sample4; - Sint8 last_sample5 = sample5; - Sint8 last_sample6 = sample6; - Sint8 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint8) sample0); - dst[1] = ((Sint8) sample1); - dst[2] = ((Sint8) sample2); - dst[3] = ((Sint8) sample3); - dst[4] = ((Sint8) sample4); - dst[5] = ((Sint8) sample5); - dst[6] = ((Sint8) sample6); - dst[7] = ((Sint8) sample7); - dst += 8; - sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1); - sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1); - sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1); - sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1); - sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1); - sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1); - sample6 = (Sint8) ((((Sint16) ((Sint8) src[6])) + ((Sint16) last_sample6)) >> 1); - sample7 = (Sint8) ((((Sint16) ((Sint8) src[7])) + ((Sint16) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[0] = SDL_SwapLE16(sample0); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapLE16(sample0); - dst++; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[1] = SDL_SwapLE16(sample1); - dst[0] = SDL_SwapLE16(sample0); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapLE16(sample0); - dst[1] = SDL_SwapLE16(sample1); - dst += 2; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[3] = SDL_SwapLE16(sample3); - dst[2] = SDL_SwapLE16(sample2); - dst[1] = SDL_SwapLE16(sample1); - dst[0] = SDL_SwapLE16(sample0); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapLE16(sample0); - dst[1] = SDL_SwapLE16(sample1); - dst[2] = SDL_SwapLE16(sample2); - dst[3] = SDL_SwapLE16(sample3); - dst += 4; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Uint16 sample5 = SDL_SwapLE16(src[5]); - Uint16 sample4 = SDL_SwapLE16(src[4]); - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample5 = sample5; - Uint16 last_sample4 = sample4; - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[5] = SDL_SwapLE16(sample5); - dst[4] = SDL_SwapLE16(sample4); - dst[3] = SDL_SwapLE16(sample3); - dst[2] = SDL_SwapLE16(sample2); - dst[1] = SDL_SwapLE16(sample1); - dst[0] = SDL_SwapLE16(sample0); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 sample4 = SDL_SwapLE16(src[4]); - Uint16 sample5 = SDL_SwapLE16(src[5]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - Uint16 last_sample4 = sample4; - Uint16 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapLE16(sample0); - dst[1] = SDL_SwapLE16(sample1); - dst[2] = SDL_SwapLE16(sample2); - dst[3] = SDL_SwapLE16(sample3); - dst[4] = SDL_SwapLE16(sample4); - dst[5] = SDL_SwapLE16(sample5); - dst += 6; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Uint16 sample7 = SDL_SwapLE16(src[7]); - Uint16 sample6 = SDL_SwapLE16(src[6]); - Uint16 sample5 = SDL_SwapLE16(src[5]); - Uint16 sample4 = SDL_SwapLE16(src[4]); - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 last_sample7 = sample7; - Uint16 last_sample6 = sample6; - Uint16 last_sample5 = sample5; - Uint16 last_sample4 = sample4; - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[7] = SDL_SwapLE16(sample7); - dst[6] = SDL_SwapLE16(sample6); - dst[5] = SDL_SwapLE16(sample5); - dst[4] = SDL_SwapLE16(sample4); - dst[3] = SDL_SwapLE16(sample3); - dst[2] = SDL_SwapLE16(sample2); - dst[1] = SDL_SwapLE16(sample1); - dst[0] = SDL_SwapLE16(sample0); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Uint16) ((((Sint32) SDL_SwapLE16(src[7])) + ((Sint32) last_sample7)) >> 1); - sample6 = (Uint16) ((((Sint32) SDL_SwapLE16(src[6])) + ((Sint32) last_sample6)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapLE16(src[0]); - Uint16 sample1 = SDL_SwapLE16(src[1]); - Uint16 sample2 = SDL_SwapLE16(src[2]); - Uint16 sample3 = SDL_SwapLE16(src[3]); - Uint16 sample4 = SDL_SwapLE16(src[4]); - Uint16 sample5 = SDL_SwapLE16(src[5]); - Uint16 sample6 = SDL_SwapLE16(src[6]); - Uint16 sample7 = SDL_SwapLE16(src[7]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - Uint16 last_sample4 = sample4; - Uint16 last_sample5 = sample5; - Uint16 last_sample6 = sample6; - Uint16 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapLE16(sample0); - dst[1] = SDL_SwapLE16(sample1); - dst[2] = SDL_SwapLE16(sample2); - dst[3] = SDL_SwapLE16(sample3); - dst[4] = SDL_SwapLE16(sample4); - dst[5] = SDL_SwapLE16(sample5); - dst[6] = SDL_SwapLE16(sample6); - dst[7] = SDL_SwapLE16(sample7); - dst += 8; - sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample6 = (Uint16) ((((Sint32) SDL_SwapLE16(src[6])) + ((Sint32) last_sample6)) >> 1); - sample7 = (Uint16) ((((Sint32) SDL_SwapLE16(src[7])) + ((Sint32) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst++; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst += 2; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst += 4; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5])); - Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4])); - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample5 = sample5; - Sint16 last_sample4 = sample4; - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[5] = ((Sint16) SDL_SwapLE16(sample5)); - dst[4] = ((Sint16) SDL_SwapLE16(sample4)); - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4])); - Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - Sint16 last_sample4 = sample4; - Sint16 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst[4] = ((Sint16) SDL_SwapLE16(sample4)); - dst[5] = ((Sint16) SDL_SwapLE16(sample5)); - dst += 6; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint16 sample7 = ((Sint16) SDL_SwapLE16(src[7])); - Sint16 sample6 = ((Sint16) SDL_SwapLE16(src[6])); - Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5])); - Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4])); - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 last_sample7 = sample7; - Sint16 last_sample6 = sample6; - Sint16 last_sample5 = sample5; - Sint16 last_sample4 = sample4; - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[7] = ((Sint16) SDL_SwapLE16(sample7)); - dst[6] = ((Sint16) SDL_SwapLE16(sample6)); - dst[5] = ((Sint16) SDL_SwapLE16(sample5)); - dst[4] = ((Sint16) SDL_SwapLE16(sample4)); - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[7]))) + ((Sint32) last_sample7)) >> 1); - sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[6]))) + ((Sint32) last_sample6)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3])); - Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4])); - Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5])); - Sint16 sample6 = ((Sint16) SDL_SwapLE16(src[6])); - Sint16 sample7 = ((Sint16) SDL_SwapLE16(src[7])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - Sint16 last_sample4 = sample4; - Sint16 last_sample5 = sample5; - Sint16 last_sample6 = sample6; - Sint16 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapLE16(sample0)); - dst[1] = ((Sint16) SDL_SwapLE16(sample1)); - dst[2] = ((Sint16) SDL_SwapLE16(sample2)); - dst[3] = ((Sint16) SDL_SwapLE16(sample3)); - dst[4] = ((Sint16) SDL_SwapLE16(sample4)); - dst[5] = ((Sint16) SDL_SwapLE16(sample5)); - dst[6] = ((Sint16) SDL_SwapLE16(sample6)); - dst[7] = ((Sint16) SDL_SwapLE16(sample7)); - dst += 8; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[6]))) + ((Sint32) last_sample6)) >> 1); - sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[7]))) + ((Sint32) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[0] = SDL_SwapBE16(sample0); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapBE16(sample0); - dst++; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[1] = SDL_SwapBE16(sample1); - dst[0] = SDL_SwapBE16(sample0); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapBE16(sample0); - dst[1] = SDL_SwapBE16(sample1); - dst += 2; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[3] = SDL_SwapBE16(sample3); - dst[2] = SDL_SwapBE16(sample2); - dst[1] = SDL_SwapBE16(sample1); - dst[0] = SDL_SwapBE16(sample0); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapBE16(sample0); - dst[1] = SDL_SwapBE16(sample1); - dst[2] = SDL_SwapBE16(sample2); - dst[3] = SDL_SwapBE16(sample3); - dst += 4; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Uint16 sample5 = SDL_SwapBE16(src[5]); - Uint16 sample4 = SDL_SwapBE16(src[4]); - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample5 = sample5; - Uint16 last_sample4 = sample4; - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[5] = SDL_SwapBE16(sample5); - dst[4] = SDL_SwapBE16(sample4); - dst[3] = SDL_SwapBE16(sample3); - dst[2] = SDL_SwapBE16(sample2); - dst[1] = SDL_SwapBE16(sample1); - dst[0] = SDL_SwapBE16(sample0); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 sample4 = SDL_SwapBE16(src[4]); - Uint16 sample5 = SDL_SwapBE16(src[5]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - Uint16 last_sample4 = sample4; - Uint16 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapBE16(sample0); - dst[1] = SDL_SwapBE16(sample1); - dst[2] = SDL_SwapBE16(sample2); - dst[3] = SDL_SwapBE16(sample3); - dst[4] = SDL_SwapBE16(sample4); - dst[5] = SDL_SwapBE16(sample5); - dst += 6; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Uint16 sample7 = SDL_SwapBE16(src[7]); - Uint16 sample6 = SDL_SwapBE16(src[6]); - Uint16 sample5 = SDL_SwapBE16(src[5]); - Uint16 sample4 = SDL_SwapBE16(src[4]); - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 last_sample7 = sample7; - Uint16 last_sample6 = sample6; - Uint16 last_sample5 = sample5; - Uint16 last_sample4 = sample4; - Uint16 last_sample3 = sample3; - Uint16 last_sample2 = sample2; - Uint16 last_sample1 = sample1; - Uint16 last_sample0 = sample0; - while (dst > target) { - dst[7] = SDL_SwapBE16(sample7); - dst[6] = SDL_SwapBE16(sample6); - dst[5] = SDL_SwapBE16(sample5); - dst[4] = SDL_SwapBE16(sample4); - dst[3] = SDL_SwapBE16(sample3); - dst[2] = SDL_SwapBE16(sample2); - dst[1] = SDL_SwapBE16(sample1); - dst[0] = SDL_SwapBE16(sample0); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Uint16) ((((Sint32) SDL_SwapBE16(src[7])) + ((Sint32) last_sample7)) >> 1); - sample6 = (Uint16) ((((Sint32) SDL_SwapBE16(src[6])) + ((Sint32) last_sample6)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Uint16 sample0 = SDL_SwapBE16(src[0]); - Uint16 sample1 = SDL_SwapBE16(src[1]); - Uint16 sample2 = SDL_SwapBE16(src[2]); - Uint16 sample3 = SDL_SwapBE16(src[3]); - Uint16 sample4 = SDL_SwapBE16(src[4]); - Uint16 sample5 = SDL_SwapBE16(src[5]); - Uint16 sample6 = SDL_SwapBE16(src[6]); - Uint16 sample7 = SDL_SwapBE16(src[7]); - Uint16 last_sample0 = sample0; - Uint16 last_sample1 = sample1; - Uint16 last_sample2 = sample2; - Uint16 last_sample3 = sample3; - Uint16 last_sample4 = sample4; - Uint16 last_sample5 = sample5; - Uint16 last_sample6 = sample6; - Uint16 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapBE16(sample0); - dst[1] = SDL_SwapBE16(sample1); - dst[2] = SDL_SwapBE16(sample2); - dst[3] = SDL_SwapBE16(sample3); - dst[4] = SDL_SwapBE16(sample4); - dst[5] = SDL_SwapBE16(sample5); - dst[6] = SDL_SwapBE16(sample6); - dst[7] = SDL_SwapBE16(sample7); - dst += 8; - sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1); - sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1); - sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1); - sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1); - sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1); - sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1); - sample6 = (Uint16) ((((Sint32) SDL_SwapBE16(src[6])) + ((Sint32) last_sample6)) >> 1); - sample7 = (Uint16) ((((Sint32) SDL_SwapBE16(src[7])) + ((Sint32) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 32; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst++; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst += 2; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst += 4; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5])); - Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4])); - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample5 = sample5; - Sint16 last_sample4 = sample4; - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[5] = ((Sint16) SDL_SwapBE16(sample5)); - dst[4] = ((Sint16) SDL_SwapBE16(sample4)); - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 192; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4])); - Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - Sint16 last_sample4 = sample4; - Sint16 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst[4] = ((Sint16) SDL_SwapBE16(sample4)); - dst[5] = ((Sint16) SDL_SwapBE16(sample5)); - dst += 6; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint16 sample7 = ((Sint16) SDL_SwapBE16(src[7])); - Sint16 sample6 = ((Sint16) SDL_SwapBE16(src[6])); - Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5])); - Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4])); - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 last_sample7 = sample7; - Sint16 last_sample6 = sample6; - Sint16 last_sample5 = sample5; - Sint16 last_sample4 = sample4; - Sint16 last_sample3 = sample3; - Sint16 last_sample2 = sample2; - Sint16 last_sample1 = sample1; - Sint16 last_sample0 = sample0; - while (dst > target) { - dst[7] = ((Sint16) SDL_SwapBE16(sample7)); - dst[6] = ((Sint16) SDL_SwapBE16(sample6)); - dst[5] = ((Sint16) SDL_SwapBE16(sample5)); - dst[4] = ((Sint16) SDL_SwapBE16(sample4)); - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[7]))) + ((Sint32) last_sample7)) >> 1); - sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[6]))) + ((Sint32) last_sample6)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0])); - Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1])); - Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2])); - Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3])); - Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4])); - Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5])); - Sint16 sample6 = ((Sint16) SDL_SwapBE16(src[6])); - Sint16 sample7 = ((Sint16) SDL_SwapBE16(src[7])); - Sint16 last_sample0 = sample0; - Sint16 last_sample1 = sample1; - Sint16 last_sample2 = sample2; - Sint16 last_sample3 = sample3; - Sint16 last_sample4 = sample4; - Sint16 last_sample5 = sample5; - Sint16 last_sample6 = sample6; - Sint16 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint16) SDL_SwapBE16(sample0)); - dst[1] = ((Sint16) SDL_SwapBE16(sample1)); - dst[2] = ((Sint16) SDL_SwapBE16(sample2)); - dst[3] = ((Sint16) SDL_SwapBE16(sample3)); - dst[4] = ((Sint16) SDL_SwapBE16(sample4)); - dst[5] = ((Sint16) SDL_SwapBE16(sample5)); - dst[6] = ((Sint16) SDL_SwapBE16(sample6)); - dst[7] = ((Sint16) SDL_SwapBE16(sample7)); - dst += 8; - sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1); - sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1); - sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1); - sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1); - sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1); - sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1); - sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[6]))) + ((Sint32) last_sample6)) >> 1); - sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[7]))) + ((Sint32) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst++; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst += 2; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst += 4; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5])); - Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4])); - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample5 = sample5; - Sint32 last_sample4 = sample4; - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[5] = ((Sint32) SDL_SwapLE32(sample5)); - dst[4] = ((Sint32) SDL_SwapLE32(sample4)); - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4])); - Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - Sint32 last_sample4 = sample4; - Sint32 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst[4] = ((Sint32) SDL_SwapLE32(sample4)); - dst[5] = ((Sint32) SDL_SwapLE32(sample5)); - dst += 6; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint32 sample7 = ((Sint32) SDL_SwapLE32(src[7])); - Sint32 sample6 = ((Sint32) SDL_SwapLE32(src[6])); - Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5])); - Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4])); - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 last_sample7 = sample7; - Sint32 last_sample6 = sample6; - Sint32 last_sample5 = sample5; - Sint32 last_sample4 = sample4; - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[7] = ((Sint32) SDL_SwapLE32(sample7)); - dst[6] = ((Sint32) SDL_SwapLE32(sample6)); - dst[5] = ((Sint32) SDL_SwapLE32(sample5)); - dst[4] = ((Sint32) SDL_SwapLE32(sample4)); - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[7]))) + ((Sint64) last_sample7)) >> 1); - sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[6]))) + ((Sint64) last_sample6)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3])); - Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4])); - Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5])); - Sint32 sample6 = ((Sint32) SDL_SwapLE32(src[6])); - Sint32 sample7 = ((Sint32) SDL_SwapLE32(src[7])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - Sint32 last_sample4 = sample4; - Sint32 last_sample5 = sample5; - Sint32 last_sample6 = sample6; - Sint32 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapLE32(sample0)); - dst[1] = ((Sint32) SDL_SwapLE32(sample1)); - dst[2] = ((Sint32) SDL_SwapLE32(sample2)); - dst[3] = ((Sint32) SDL_SwapLE32(sample3)); - dst[4] = ((Sint32) SDL_SwapLE32(sample4)); - dst[5] = ((Sint32) SDL_SwapLE32(sample5)); - dst[6] = ((Sint32) SDL_SwapLE32(sample6)); - dst[7] = ((Sint32) SDL_SwapLE32(sample7)); - dst += 8; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[6]))) + ((Sint64) last_sample6)) >> 1); - sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[7]))) + ((Sint64) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst++; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst += 2; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst += 4; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5])); - Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4])); - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample5 = sample5; - Sint32 last_sample4 = sample4; - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[5] = ((Sint32) SDL_SwapBE32(sample5)); - dst[4] = ((Sint32) SDL_SwapBE32(sample4)); - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4])); - Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - Sint32 last_sample4 = sample4; - Sint32 last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst[4] = ((Sint32) SDL_SwapBE32(sample4)); - dst[5] = ((Sint32) SDL_SwapBE32(sample5)); - dst += 6; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint32 sample7 = ((Sint32) SDL_SwapBE32(src[7])); - Sint32 sample6 = ((Sint32) SDL_SwapBE32(src[6])); - Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5])); - Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4])); - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 last_sample7 = sample7; - Sint32 last_sample6 = sample6; - Sint32 last_sample5 = sample5; - Sint32 last_sample4 = sample4; - Sint32 last_sample3 = sample3; - Sint32 last_sample2 = sample2; - Sint32 last_sample1 = sample1; - Sint32 last_sample0 = sample0; - while (dst > target) { - dst[7] = ((Sint32) SDL_SwapBE32(sample7)); - dst[6] = ((Sint32) SDL_SwapBE32(sample6)); - dst[5] = ((Sint32) SDL_SwapBE32(sample5)); - dst[4] = ((Sint32) SDL_SwapBE32(sample4)); - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[7]))) + ((Sint64) last_sample7)) >> 1); - sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[6]))) + ((Sint64) last_sample6)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0])); - Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1])); - Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2])); - Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3])); - Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4])); - Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5])); - Sint32 sample6 = ((Sint32) SDL_SwapBE32(src[6])); - Sint32 sample7 = ((Sint32) SDL_SwapBE32(src[7])); - Sint32 last_sample0 = sample0; - Sint32 last_sample1 = sample1; - Sint32 last_sample2 = sample2; - Sint32 last_sample3 = sample3; - Sint32 last_sample4 = sample4; - Sint32 last_sample5 = sample5; - Sint32 last_sample6 = sample6; - Sint32 last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = ((Sint32) SDL_SwapBE32(sample0)); - dst[1] = ((Sint32) SDL_SwapBE32(sample1)); - dst[2] = ((Sint32) SDL_SwapBE32(sample2)); - dst[3] = ((Sint32) SDL_SwapBE32(sample3)); - dst[4] = ((Sint32) SDL_SwapBE32(sample4)); - dst[5] = ((Sint32) SDL_SwapBE32(sample5)); - dst[6] = ((Sint32) SDL_SwapBE32(sample6)); - dst[7] = ((Sint32) SDL_SwapBE32(sample7)); - dst += 8; - sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1); - sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1); - sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1); - sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1); - sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1); - sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1); - sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[6]))) + ((Sint64) last_sample6)) >> 1); - sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[7]))) + ((Sint64) last_sample7)) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample0 = sample0; - while (dst > target) { - dst[0] = SDL_SwapFloatLE(sample0); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatLE(sample0); - dst++; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - float sample1 = SDL_SwapFloatLE(src[1]); - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[1] = SDL_SwapFloatLE(sample1); - dst[0] = SDL_SwapFloatLE(sample0); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatLE(src[0]); - float sample1 = SDL_SwapFloatLE(src[1]); - float last_sample0 = sample0; - float last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatLE(sample0); - dst[1] = SDL_SwapFloatLE(sample1); - dst += 2; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - float sample3 = SDL_SwapFloatLE(src[3]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[3] = SDL_SwapFloatLE(sample3); - dst[2] = SDL_SwapFloatLE(sample2); - dst[1] = SDL_SwapFloatLE(sample1); - dst[0] = SDL_SwapFloatLE(sample0); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatLE(src[0]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample3 = SDL_SwapFloatLE(src[3]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatLE(sample0); - dst[1] = SDL_SwapFloatLE(sample1); - dst[2] = SDL_SwapFloatLE(sample2); - dst[3] = SDL_SwapFloatLE(sample3); - dst += 4; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - float sample5 = SDL_SwapFloatLE(src[5]); - float sample4 = SDL_SwapFloatLE(src[4]); - float sample3 = SDL_SwapFloatLE(src[3]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample5 = sample5; - float last_sample4 = sample4; - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[5] = SDL_SwapFloatLE(sample5); - dst[4] = SDL_SwapFloatLE(sample4); - dst[3] = SDL_SwapFloatLE(sample3); - dst[2] = SDL_SwapFloatLE(sample2); - dst[1] = SDL_SwapFloatLE(sample1); - dst[0] = SDL_SwapFloatLE(sample0); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatLE(src[0]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample3 = SDL_SwapFloatLE(src[3]); - float sample4 = SDL_SwapFloatLE(src[4]); - float sample5 = SDL_SwapFloatLE(src[5]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - float last_sample4 = sample4; - float last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatLE(sample0); - dst[1] = SDL_SwapFloatLE(sample1); - dst[2] = SDL_SwapFloatLE(sample2); - dst[3] = SDL_SwapFloatLE(sample3); - dst[4] = SDL_SwapFloatLE(sample4); - dst[5] = SDL_SwapFloatLE(sample5); - dst += 6; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - float sample7 = SDL_SwapFloatLE(src[7]); - float sample6 = SDL_SwapFloatLE(src[6]); - float sample5 = SDL_SwapFloatLE(src[5]); - float sample4 = SDL_SwapFloatLE(src[4]); - float sample3 = SDL_SwapFloatLE(src[3]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample0 = SDL_SwapFloatLE(src[0]); - float last_sample7 = sample7; - float last_sample6 = sample6; - float last_sample5 = sample5; - float last_sample4 = sample4; - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[7] = SDL_SwapFloatLE(sample7); - dst[6] = SDL_SwapFloatLE(sample6); - dst[5] = SDL_SwapFloatLE(sample5); - dst[4] = SDL_SwapFloatLE(sample4); - dst[3] = SDL_SwapFloatLE(sample3); - dst[2] = SDL_SwapFloatLE(sample2); - dst[1] = SDL_SwapFloatLE(sample1); - dst[0] = SDL_SwapFloatLE(sample0); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (float) ((((double) SDL_SwapFloatLE(src[7])) + ((double) last_sample7)) * 0.5); - sample6 = (float) ((((double) SDL_SwapFloatLE(src[6])) + ((double) last_sample6)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatLE(src[0]); - float sample1 = SDL_SwapFloatLE(src[1]); - float sample2 = SDL_SwapFloatLE(src[2]); - float sample3 = SDL_SwapFloatLE(src[3]); - float sample4 = SDL_SwapFloatLE(src[4]); - float sample5 = SDL_SwapFloatLE(src[5]); - float sample6 = SDL_SwapFloatLE(src[6]); - float sample7 = SDL_SwapFloatLE(src[7]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - float last_sample4 = sample4; - float last_sample5 = sample5; - float last_sample6 = sample6; - float last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatLE(sample0); - dst[1] = SDL_SwapFloatLE(sample1); - dst[2] = SDL_SwapFloatLE(sample2); - dst[3] = SDL_SwapFloatLE(sample3); - dst[4] = SDL_SwapFloatLE(sample4); - dst[5] = SDL_SwapFloatLE(sample5); - dst[6] = SDL_SwapFloatLE(sample6); - dst[7] = SDL_SwapFloatLE(sample7); - dst += 8; - sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5); - sample6 = (float) ((((double) SDL_SwapFloatLE(src[6])) + ((double) last_sample6)) * 0.5); - sample7 = (float) ((((double) SDL_SwapFloatLE(src[7])) + ((double) last_sample7)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample0 = sample0; - while (dst > target) { - dst[0] = SDL_SwapFloatBE(sample0); - dst--; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src--; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 1 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 64; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample0 = sample0; - while (dst < target) { - src++; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatBE(sample0); - dst++; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample0 = sample0; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - float sample1 = SDL_SwapFloatBE(src[1]); - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[1] = SDL_SwapFloatBE(sample1); - dst[0] = SDL_SwapFloatBE(sample0); - dst -= 2; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 2; - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 2 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 128; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatBE(src[0]); - float sample1 = SDL_SwapFloatBE(src[1]); - float last_sample0 = sample0; - float last_sample1 = sample1; - while (dst < target) { - src += 2; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatBE(sample0); - dst[1] = SDL_SwapFloatBE(sample1); - dst += 2; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - float sample3 = SDL_SwapFloatBE(src[3]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[3] = SDL_SwapFloatBE(sample3); - dst[2] = SDL_SwapFloatBE(sample2); - dst[1] = SDL_SwapFloatBE(sample1); - dst[0] = SDL_SwapFloatBE(sample0); - dst -= 4; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 4; - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 4 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 256; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatBE(src[0]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample3 = SDL_SwapFloatBE(src[3]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - while (dst < target) { - src += 4; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatBE(sample0); - dst[1] = SDL_SwapFloatBE(sample1); - dst[2] = SDL_SwapFloatBE(sample2); - dst[3] = SDL_SwapFloatBE(sample3); - dst += 4; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - float sample5 = SDL_SwapFloatBE(src[5]); - float sample4 = SDL_SwapFloatBE(src[4]); - float sample3 = SDL_SwapFloatBE(src[3]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample5 = sample5; - float last_sample4 = sample4; - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[5] = SDL_SwapFloatBE(sample5); - dst[4] = SDL_SwapFloatBE(sample4); - dst[3] = SDL_SwapFloatBE(sample3); - dst[2] = SDL_SwapFloatBE(sample2); - dst[1] = SDL_SwapFloatBE(sample1); - dst[0] = SDL_SwapFloatBE(sample0); - dst -= 6; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 6; - sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 6 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 384; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatBE(src[0]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample3 = SDL_SwapFloatBE(src[3]); - float sample4 = SDL_SwapFloatBE(src[4]); - float sample5 = SDL_SwapFloatBE(src[5]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - float last_sample4 = sample4; - float last_sample5 = sample5; - while (dst < target) { - src += 6; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatBE(sample0); - dst[1] = SDL_SwapFloatBE(sample1); - dst[2] = SDL_SwapFloatBE(sample2); - dst[3] = SDL_SwapFloatBE(sample3); - dst[4] = SDL_SwapFloatBE(sample4); - dst[5] = SDL_SwapFloatBE(sample5); - dst += 6; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - float sample7 = SDL_SwapFloatBE(src[7]); - float sample6 = SDL_SwapFloatBE(src[6]); - float sample5 = SDL_SwapFloatBE(src[5]); - float sample4 = SDL_SwapFloatBE(src[4]); - float sample3 = SDL_SwapFloatBE(src[3]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample0 = SDL_SwapFloatBE(src[0]); - float last_sample7 = sample7; - float last_sample6 = sample6; - float last_sample5 = sample5; - float last_sample4 = sample4; - float last_sample3 = sample3; - float last_sample2 = sample2; - float last_sample1 = sample1; - float last_sample0 = sample0; - while (dst > target) { - dst[7] = SDL_SwapFloatBE(sample7); - dst[6] = SDL_SwapFloatBE(sample6); - dst[5] = SDL_SwapFloatBE(sample5); - dst[4] = SDL_SwapFloatBE(sample4); - dst[3] = SDL_SwapFloatBE(sample3); - dst[2] = SDL_SwapFloatBE(sample2); - dst[1] = SDL_SwapFloatBE(sample1); - dst[0] = SDL_SwapFloatBE(sample0); - dst -= 8; - eps += srcsize; - if ((eps << 1) >= dstsize) { - src -= 8; - sample7 = (float) ((((double) SDL_SwapFloatBE(src[7])) + ((double) last_sample7)) * 0.5); - sample6 = (float) ((((double) SDL_SwapFloatBE(src[6])) + ((double) last_sample6)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - eps -= dstsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 8 channels.\n", cvt->rate_incr); -#endif - - const int srcsize = cvt->len_cvt - 512; - const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr); - register int eps = 0; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - float sample0 = SDL_SwapFloatBE(src[0]); - float sample1 = SDL_SwapFloatBE(src[1]); - float sample2 = SDL_SwapFloatBE(src[2]); - float sample3 = SDL_SwapFloatBE(src[3]); - float sample4 = SDL_SwapFloatBE(src[4]); - float sample5 = SDL_SwapFloatBE(src[5]); - float sample6 = SDL_SwapFloatBE(src[6]); - float sample7 = SDL_SwapFloatBE(src[7]); - float last_sample0 = sample0; - float last_sample1 = sample1; - float last_sample2 = sample2; - float last_sample3 = sample3; - float last_sample4 = sample4; - float last_sample5 = sample5; - float last_sample6 = sample6; - float last_sample7 = sample7; - while (dst < target) { - src += 8; - eps += dstsize; - if ((eps << 1) >= srcsize) { - dst[0] = SDL_SwapFloatBE(sample0); - dst[1] = SDL_SwapFloatBE(sample1); - dst[2] = SDL_SwapFloatBE(sample2); - dst[3] = SDL_SwapFloatBE(sample3); - dst[4] = SDL_SwapFloatBE(sample4); - dst[5] = SDL_SwapFloatBE(sample5); - dst[6] = SDL_SwapFloatBE(sample6); - dst[7] = SDL_SwapFloatBE(sample7); - dst += 8; - sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5); - sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5); - sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5); - sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5); - sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5); - sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5); - sample6 = (float) ((((double) SDL_SwapFloatBE(src[6])) + ((double) last_sample6)) * 0.5); - sample7 = (float) ((((double) SDL_SwapFloatBE(src[7])) + ((double) last_sample7)) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - eps -= srcsize; - } - } - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - - -#if !LESS_RESAMPLERS - -static void SDLCALL -SDL_Upsample_U8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 1; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample0 = (Sint16) src[0]; - src--; - dst[1] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint8) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - src += 2; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 1; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample0 = (Sint16) src[0]; - src--; - dst[3] = (Uint8) sample0; - dst[2] = (Uint8) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - src += 4; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 2; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 2; - dst[3] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) sample1; - dst[0] = (Uint8) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - src += 4; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 2; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 2; - dst[7] = (Uint8) sample1; - dst[6] = (Uint8) sample0; - dst[5] = (Uint8) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Uint8) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - src += 8; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 4; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 4; - dst[7] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint8) sample3; - dst[2] = (Uint8) sample2; - dst[1] = (Uint8) sample1; - dst[0] = (Uint8) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - src += 8; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 4; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 4; - dst[15] = (Uint8) sample3; - dst[14] = (Uint8) sample2; - dst[13] = (Uint8) sample1; - dst[12] = (Uint8) sample0; - dst[11] = (Uint8) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Uint8) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Uint8) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Uint8) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - src += 16; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 6; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 6; - dst[11] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint8) sample5; - dst[4] = (Uint8) sample4; - dst[3] = (Uint8) sample3; - dst[2] = (Uint8) sample2; - dst[1] = (Uint8) sample1; - dst[0] = (Uint8) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample5 = (Sint16) src[5]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample5 = (Sint16) src[5]; - src += 12; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint8) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 6; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 6; - dst[23] = (Uint8) sample5; - dst[22] = (Uint8) sample4; - dst[21] = (Uint8) sample3; - dst[20] = (Uint8) sample2; - dst[19] = (Uint8) sample1; - dst[18] = (Uint8) sample0; - dst[17] = (Uint8) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Uint8) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Uint8) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Uint8) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Uint8) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Uint8) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint8) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint8) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample5 = (Sint16) src[5]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample5 = (Sint16) src[5]; - src += 24; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint8) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 8; - Sint16 last_sample7 = (Sint16) src[7]; - Sint16 last_sample6 = (Sint16) src[6]; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample7 = (Sint16) src[7]; - const Sint16 sample6 = (Sint16) src[6]; - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 8; - dst[15] = (Uint8) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint8) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint8) sample7; - dst[6] = (Uint8) sample6; - dst[5] = (Uint8) sample5; - dst[4] = (Uint8) sample4; - dst[3] = (Uint8) sample3; - dst[2] = (Uint8) sample2; - dst[1] = (Uint8) sample1; - dst[0] = (Uint8) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample6 = (Sint16) src[6]; - Sint16 last_sample7 = (Sint16) src[7]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample6 = (Sint16) src[6]; - const Sint16 sample7 = (Sint16) src[7]; - src += 16; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint8) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint8) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8; - const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint8 *target = ((const Uint8 *) cvt->buf) - 8; - Sint16 last_sample7 = (Sint16) src[7]; - Sint16 last_sample6 = (Sint16) src[6]; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample0 = (Sint16) src[0]; - while (dst > target) { - const Sint16 sample7 = (Sint16) src[7]; - const Sint16 sample6 = (Sint16) src[6]; - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample0 = (Sint16) src[0]; - src -= 8; - dst[31] = (Uint8) sample7; - dst[30] = (Uint8) sample6; - dst[29] = (Uint8) sample5; - dst[28] = (Uint8) sample4; - dst[27] = (Uint8) sample3; - dst[26] = (Uint8) sample2; - dst[25] = (Uint8) sample1; - dst[24] = (Uint8) sample0; - dst[23] = (Uint8) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Uint8) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Uint8) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Uint8) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Uint8) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Uint8) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Uint8) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Uint8) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Uint8) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint8) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint8) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Uint8) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Uint8) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint8) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint8 *dst = (Uint8 *) cvt->buf; - const Uint8 *src = (Uint8 *) cvt->buf; - const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) src[0]; - Sint16 last_sample1 = (Sint16) src[1]; - Sint16 last_sample2 = (Sint16) src[2]; - Sint16 last_sample3 = (Sint16) src[3]; - Sint16 last_sample4 = (Sint16) src[4]; - Sint16 last_sample5 = (Sint16) src[5]; - Sint16 last_sample6 = (Sint16) src[6]; - Sint16 last_sample7 = (Sint16) src[7]; - while (dst < target) { - const Sint16 sample0 = (Sint16) src[0]; - const Sint16 sample1 = (Sint16) src[1]; - const Sint16 sample2 = (Sint16) src[2]; - const Sint16 sample3 = (Sint16) src[3]; - const Sint16 sample4 = (Sint16) src[4]; - const Sint16 sample5 = (Sint16) src[5]; - const Sint16 sample6 = (Sint16) src[6]; - const Sint16 sample7 = (Sint16) src[7]; - src += 32; - dst[0] = (Uint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint8) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint8) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint8) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 1; - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src--; - dst[1] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint8) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src += 2; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 1; - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src--; - dst[3] = (Sint8) sample0; - dst[2] = (Sint8) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S8, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src += 4; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 2; - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 2; - dst[3] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) sample1; - dst[0] = (Sint8) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - src += 4; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 2; - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 2; - dst[7] = (Sint8) sample1; - dst[6] = (Sint8) sample0; - dst[5] = (Sint8) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Sint8) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S8, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - src += 8; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 4; - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 4; - dst[7] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint8) sample3; - dst[2] = (Sint8) sample2; - dst[1] = (Sint8) sample1; - dst[0] = (Sint8) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - src += 8; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 4; - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 4; - dst[15] = (Sint8) sample3; - dst[14] = (Sint8) sample2; - dst[13] = (Sint8) sample1; - dst[12] = (Sint8) sample0; - dst[11] = (Sint8) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Sint8) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Sint8) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Sint8) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S8, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - src += 16; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 6; - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 6; - dst[11] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint8) sample5; - dst[4] = (Sint8) sample4; - dst[3] = (Sint8) sample3; - dst[2] = (Sint8) sample2; - dst[1] = (Sint8) sample1; - dst[0] = (Sint8) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - src += 12; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint8) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 6; - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 6; - dst[23] = (Sint8) sample5; - dst[22] = (Sint8) sample4; - dst[21] = (Sint8) sample3; - dst[20] = (Sint8) sample2; - dst[19] = (Sint8) sample1; - dst[18] = (Sint8) sample0; - dst[17] = (Sint8) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Sint8) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Sint8) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Sint8) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Sint8) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Sint8) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint8) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint8) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S8, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - src += 24; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint8) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 8; - Sint16 last_sample7 = (Sint16) ((Sint8) src[7]); - Sint16 last_sample6 = (Sint16) ((Sint8) src[6]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample7 = (Sint16) ((Sint8) src[7]); - const Sint16 sample6 = (Sint16) ((Sint8) src[6]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 8; - dst[15] = (Sint8) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint8) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint8) sample7; - dst[6] = (Sint8) sample6; - dst[5] = (Sint8) sample5; - dst[4] = (Sint8) sample4; - dst[3] = (Sint8) sample3; - dst[2] = (Sint8) sample2; - dst[1] = (Sint8) sample1; - dst[0] = (Sint8) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample6 = (Sint16) ((Sint8) src[6]); - Sint16 last_sample7 = (Sint16) ((Sint8) src[7]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample6 = (Sint16) ((Sint8) src[6]); - const Sint16 sample7 = (Sint16) ((Sint8) src[7]); - src += 16; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint8) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint8) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8; - const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint8 *target = ((const Sint8 *) cvt->buf) - 8; - Sint16 last_sample7 = (Sint16) ((Sint8) src[7]); - Sint16 last_sample6 = (Sint16) ((Sint8) src[6]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - while (dst > target) { - const Sint16 sample7 = (Sint16) ((Sint8) src[7]); - const Sint16 sample6 = (Sint16) ((Sint8) src[6]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - src -= 8; - dst[31] = (Sint8) sample7; - dst[30] = (Sint8) sample6; - dst[29] = (Sint8) sample5; - dst[28] = (Sint8) sample4; - dst[27] = (Sint8) sample3; - dst[26] = (Sint8) sample2; - dst[25] = (Sint8) sample1; - dst[24] = (Sint8) sample0; - dst[23] = (Sint8) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Sint8) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Sint8) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Sint8) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Sint8) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Sint8) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Sint8) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Sint8) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Sint8) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint8) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint8) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Sint8) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Sint8) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint8) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S8, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint8 *dst = (Sint8 *) cvt->buf; - const Sint8 *src = (Sint8 *) cvt->buf; - const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize); - Sint16 last_sample0 = (Sint16) ((Sint8) src[0]); - Sint16 last_sample1 = (Sint16) ((Sint8) src[1]); - Sint16 last_sample2 = (Sint16) ((Sint8) src[2]); - Sint16 last_sample3 = (Sint16) ((Sint8) src[3]); - Sint16 last_sample4 = (Sint16) ((Sint8) src[4]); - Sint16 last_sample5 = (Sint16) ((Sint8) src[5]); - Sint16 last_sample6 = (Sint16) ((Sint8) src[6]); - Sint16 last_sample7 = (Sint16) ((Sint8) src[7]); - while (dst < target) { - const Sint16 sample0 = (Sint16) ((Sint8) src[0]); - const Sint16 sample1 = (Sint16) ((Sint8) src[1]); - const Sint16 sample2 = (Sint16) ((Sint8) src[2]); - const Sint16 sample3 = (Sint16) ((Sint8) src[3]); - const Sint16 sample4 = (Sint16) ((Sint8) src[4]); - const Sint16 sample5 = (Sint16) ((Sint8) src[5]); - const Sint16 sample6 = (Sint16) ((Sint8) src[6]); - const Sint16 sample7 = (Sint16) ((Sint8) src[7]); - src += 32; - dst[0] = (Sint8) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint8) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint8) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint8) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint8) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint8) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint8) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint8) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src--; - dst[1] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint16) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src += 2; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src--; - dst[3] = (Uint16) sample0; - dst[2] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src += 4; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 2; - dst[3] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - src += 4; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 2; - dst[7] = (Uint16) sample1; - dst[6] = (Uint16) sample0; - dst[5] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - src += 8; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 4; - dst[7] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - src += 8; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 4; - dst[15] = (Uint16) sample3; - dst[14] = (Uint16) sample2; - dst[13] = (Uint16) sample1; - dst[12] = (Uint16) sample0; - dst[11] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - src += 16; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 6; - dst[11] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint16) sample5; - dst[4] = (Uint16) sample4; - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - src += 12; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 6; - dst[23] = (Uint16) sample5; - dst[22] = (Uint16) sample4; - dst[21] = (Uint16) sample3; - dst[20] = (Uint16) sample2; - dst[19] = (Uint16) sample1; - dst[18] = (Uint16) sample0; - dst[17] = (Uint16) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Uint16) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - src += 24; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]); - Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]); - const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 8; - dst[15] = (Uint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint16) sample7; - dst[6] = (Uint16) sample6; - dst[5] = (Uint16) sample5; - dst[4] = (Uint16) sample4; - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]); - Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]); - const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]); - src += 16; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]); - Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - while (dst > target) { - const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]); - const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - src -= 8; - dst[31] = (Uint16) sample7; - dst[30] = (Uint16) sample6; - dst[29] = (Uint16) sample5; - dst[28] = (Uint16) sample4; - dst[27] = (Uint16) sample3; - dst[26] = (Uint16) sample2; - dst[25] = (Uint16) sample1; - dst[24] = (Uint16) sample0; - dst[23] = (Uint16) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Uint16) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Uint16) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Uint16) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Uint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint16) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Uint16) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]); - Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]); - Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]); - const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]); - const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]); - src += 32; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src--; - dst[1] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint16) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src += 2; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src--; - dst[3] = (Sint16) sample0; - dst[2] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src += 4; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 2; - dst[3] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - src += 4; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 2; - dst[7] = (Sint16) sample1; - dst[6] = (Sint16) sample0; - dst[5] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - src += 8; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 4; - dst[7] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - src += 8; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 4; - dst[15] = (Sint16) sample3; - dst[14] = (Sint16) sample2; - dst[13] = (Sint16) sample1; - dst[12] = (Sint16) sample0; - dst[11] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - src += 16; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 6; - dst[11] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint16) sample5; - dst[4] = (Sint16) sample4; - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - src += 12; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 6; - dst[23] = (Sint16) sample5; - dst[22] = (Sint16) sample4; - dst[21] = (Sint16) sample3; - dst[20] = (Sint16) sample2; - dst[19] = (Sint16) sample1; - dst[18] = (Sint16) sample0; - dst[17] = (Sint16) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Sint16) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - src += 24; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 8; - dst[15] = (Sint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint16) sample7; - dst[6] = (Sint16) sample6; - dst[5] = (Sint16) sample5; - dst[4] = (Sint16) sample4; - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - src += 16; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - while (dst > target) { - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - src -= 8; - dst[31] = (Sint16) sample7; - dst[30] = (Sint16) sample6; - dst[29] = (Sint16) sample5; - dst[28] = (Sint16) sample4; - dst[27] = (Sint16) sample3; - dst[26] = (Sint16) sample2; - dst[25] = (Sint16) sample1; - dst[24] = (Sint16) sample0; - dst[23] = (Sint16) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Sint16) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Sint16) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Sint16) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Sint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint16) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Sint16) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6])); - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7])); - src += 32; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src--; - dst[1] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint16) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src += 2; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src--; - dst[3] = (Uint16) sample0; - dst[2] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src += 4; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 2; - dst[3] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - src += 4; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 2; - dst[7] = (Uint16) sample1; - dst[6] = (Uint16) sample0; - dst[5] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - src += 8; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 4; - dst[7] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - src += 8; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 4; - dst[15] = (Uint16) sample3; - dst[14] = (Uint16) sample2; - dst[13] = (Uint16) sample1; - dst[12] = (Uint16) sample0; - dst[11] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - src += 16; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 6; - dst[11] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint16) sample5; - dst[4] = (Uint16) sample4; - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - src += 12; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 6; - dst[23] = (Uint16) sample5; - dst[22] = (Uint16) sample4; - dst[21] = (Uint16) sample3; - dst[20] = (Uint16) sample2; - dst[19] = (Uint16) sample1; - dst[18] = (Uint16) sample0; - dst[17] = (Uint16) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Uint16) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - src += 24; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]); - Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]); - const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 8; - dst[15] = (Uint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint16) sample7; - dst[6] = (Uint16) sample6; - dst[5] = (Uint16) sample5; - dst[4] = (Uint16) sample4; - dst[3] = (Uint16) sample3; - dst[2] = (Uint16) sample2; - dst[1] = (Uint16) sample1; - dst[0] = (Uint16) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]); - Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]); - const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]); - src += 16; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_U16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8; - const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Uint16 *target = ((const Uint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]); - Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - while (dst > target) { - const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]); - const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - src -= 8; - dst[31] = (Uint16) sample7; - dst[30] = (Uint16) sample6; - dst[29] = (Uint16) sample5; - dst[28] = (Uint16) sample4; - dst[27] = (Uint16) sample3; - dst[26] = (Uint16) sample2; - dst[25] = (Uint16) sample1; - dst[24] = (Uint16) sample0; - dst[23] = (Uint16) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Uint16) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Uint16) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Uint16) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Uint16) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Uint16) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Uint16) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Uint16) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Uint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Uint16) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Uint16) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_U16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Uint16 *dst = (Uint16 *) cvt->buf; - const Uint16 *src = (Uint16 *) cvt->buf; - const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]); - Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]); - Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]); - Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]); - Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]); - Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]); - Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]); - Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]); - while (dst < target) { - const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]); - const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]); - const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]); - const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]); - const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]); - const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]); - const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]); - const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]); - src += 32; - dst[0] = (Uint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Uint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Uint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Uint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Uint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Uint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Uint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Uint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src--; - dst[1] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint16) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src += 2; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 1; - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src--; - dst[3] = (Sint16) sample0; - dst[2] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src += 4; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 2; - dst[3] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - src += 4; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 2; - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 2; - dst[7] = (Sint16) sample1; - dst[6] = (Sint16) sample0; - dst[5] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - src += 8; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 4; - dst[7] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - src += 8; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 4; - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 4; - dst[15] = (Sint16) sample3; - dst[14] = (Sint16) sample2; - dst[13] = (Sint16) sample1; - dst[12] = (Sint16) sample0; - dst[11] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - src += 16; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 6; - dst[11] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint16) sample5; - dst[4] = (Sint16) sample4; - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - src += 12; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 6; - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 6; - dst[23] = (Sint16) sample5; - dst[22] = (Sint16) sample4; - dst[21] = (Sint16) sample3; - dst[20] = (Sint16) sample2; - dst[19] = (Sint16) sample1; - dst[18] = (Sint16) sample0; - dst[17] = (Sint16) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Sint16) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - src += 24; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 8; - dst[15] = (Sint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint16) sample7; - dst[6] = (Sint16) sample6; - dst[5] = (Sint16) sample5; - dst[4] = (Sint16) sample4; - dst[3] = (Sint16) sample3; - dst[2] = (Sint16) sample2; - dst[1] = (Sint16) sample1; - dst[0] = (Sint16) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - src += 16; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8; - const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint16 *target = ((const Sint16 *) cvt->buf) - 8; - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - while (dst > target) { - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - src -= 8; - dst[31] = (Sint16) sample7; - dst[30] = (Sint16) sample6; - dst[29] = (Sint16) sample5; - dst[28] = (Sint16) sample4; - dst[27] = (Sint16) sample3; - dst[26] = (Sint16) sample2; - dst[25] = (Sint16) sample1; - dst[24] = (Sint16) sample0; - dst[23] = (Sint16) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Sint16) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Sint16) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Sint16) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Sint16) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Sint16) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Sint16) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Sint16) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Sint16) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint16) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Sint16) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint16 *dst = (Sint16 *) cvt->buf; - const Sint16 *src = (Sint16 *) cvt->buf; - const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize); - Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - while (dst < target) { - const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0])); - const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1])); - const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2])); - const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3])); - const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4])); - const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5])); - const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6])); - const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7])); - src += 32; - dst[0] = (Sint16) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint16) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint16) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint16) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint16) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint16) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint16) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint16) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src--; - dst[1] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint32) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src += 2; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src--; - dst[3] = (Sint32) sample0; - dst[2] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src += 4; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 2; - dst[3] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - src += 4; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 2; - dst[7] = (Sint32) sample1; - dst[6] = (Sint32) sample0; - dst[5] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - src += 8; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 4; - dst[7] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - src += 8; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 4; - dst[15] = (Sint32) sample3; - dst[14] = (Sint32) sample2; - dst[13] = (Sint32) sample1; - dst[12] = (Sint32) sample0; - dst[11] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - src += 16; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 6; - dst[11] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint32) sample5; - dst[4] = (Sint32) sample4; - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - src += 12; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 6; - dst[23] = (Sint32) sample5; - dst[22] = (Sint32) sample4; - dst[21] = (Sint32) sample3; - dst[20] = (Sint32) sample2; - dst[19] = (Sint32) sample1; - dst[18] = (Sint32) sample0; - dst[17] = (Sint32) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Sint32) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - src += 24; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 8; - dst[15] = (Sint32) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint32) sample7; - dst[6] = (Sint32) sample6; - dst[5] = (Sint32) sample5; - dst[4] = (Sint32) sample4; - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - src += 16; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint32) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - while (dst > target) { - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - src -= 8; - dst[31] = (Sint32) sample7; - dst[30] = (Sint32) sample6; - dst[29] = (Sint32) sample5; - dst[28] = (Sint32) sample4; - dst[27] = (Sint32) sample3; - dst[26] = (Sint32) sample2; - dst[25] = (Sint32) sample1; - dst[24] = (Sint32) sample0; - dst[23] = (Sint32) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Sint32) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Sint32) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Sint32) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Sint32) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint32) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Sint32) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6])); - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7])); - src += 32; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint32) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src--; - dst[1] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint32) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src += 2; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 1; - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src--; - dst[3] = (Sint32) sample0; - dst[2] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[1] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src += 4; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 2; - dst[3] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - src += 4; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 2; - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 2; - dst[7] = (Sint32) sample1; - dst[6] = (Sint32) sample0; - dst[5] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[4] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[3] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - src += 8; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 4; - dst[7] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - src += 8; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 4; - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 4; - dst[15] = (Sint32) sample3; - dst[14] = (Sint32) sample2; - dst[13] = (Sint32) sample1; - dst[12] = (Sint32) sample0; - dst[11] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[10] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[9] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[8] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[7] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[6] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[5] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[4] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - src += 16; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 6; - dst[11] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint32) sample5; - dst[4] = (Sint32) sample4; - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - src += 12; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 6; - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 6; - dst[23] = (Sint32) sample5; - dst[22] = (Sint32) sample4; - dst[21] = (Sint32) sample3; - dst[20] = (Sint32) sample2; - dst[19] = (Sint32) sample1; - dst[18] = (Sint32) sample0; - dst[17] = (Sint32) (((3 * sample5) + last_sample5) >> 2); - dst[16] = (Sint32) (((3 * sample4) + last_sample4) >> 2); - dst[15] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[14] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[13] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[12] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[11] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[10] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[9] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[8] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[7] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[6] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[5] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - src += 24; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 8; - dst[15] = (Sint32) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint32) sample7; - dst[6] = (Sint32) sample6; - dst[5] = (Sint32) sample5; - dst[4] = (Sint32) sample4; - dst[3] = (Sint32) sample3; - dst[2] = (Sint32) sample2; - dst[1] = (Sint32) sample1; - dst[0] = (Sint32) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - src += 16; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint32) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_S32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8; - const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8; - const Sint32 *target = ((const Sint32 *) cvt->buf) - 8; - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - while (dst > target) { - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - src -= 8; - dst[31] = (Sint32) sample7; - dst[30] = (Sint32) sample6; - dst[29] = (Sint32) sample5; - dst[28] = (Sint32) sample4; - dst[27] = (Sint32) sample3; - dst[26] = (Sint32) sample2; - dst[25] = (Sint32) sample1; - dst[24] = (Sint32) sample0; - dst[23] = (Sint32) (((3 * sample7) + last_sample7) >> 2); - dst[22] = (Sint32) (((3 * sample6) + last_sample6) >> 2); - dst[21] = (Sint32) (((3 * sample5) + last_sample5) >> 2); - dst[20] = (Sint32) (((3 * sample4) + last_sample4) >> 2); - dst[19] = (Sint32) (((3 * sample3) + last_sample3) >> 2); - dst[18] = (Sint32) (((3 * sample2) + last_sample2) >> 2); - dst[17] = (Sint32) (((3 * sample1) + last_sample1) >> 2); - dst[16] = (Sint32) (((3 * sample0) + last_sample0) >> 2); - dst[15] = (Sint32) ((sample7 + last_sample7) >> 1); - dst[14] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[13] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[12] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[11] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[10] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[9] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[8] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[7] = (Sint32) ((sample7 + (3 * last_sample7)) >> 2); - dst[6] = (Sint32) ((sample6 + (3 * last_sample6)) >> 2); - dst[5] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2); - dst[4] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2); - dst[3] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2); - dst[2] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2); - dst[1] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2); - dst[0] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_S32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - Sint32 *dst = (Sint32 *) cvt->buf; - const Sint32 *src = (Sint32 *) cvt->buf; - const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize); - Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - while (dst < target) { - const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0])); - const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1])); - const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2])); - const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3])); - const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4])); - const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5])); - const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6])); - const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7])); - src += 32; - dst[0] = (Sint32) ((sample0 + last_sample0) >> 1); - dst[1] = (Sint32) ((sample1 + last_sample1) >> 1); - dst[2] = (Sint32) ((sample2 + last_sample2) >> 1); - dst[3] = (Sint32) ((sample3 + last_sample3) >> 1); - dst[4] = (Sint32) ((sample4 + last_sample4) >> 1); - dst[5] = (Sint32) ((sample5 + last_sample5) >> 1); - dst[6] = (Sint32) ((sample6 + last_sample6) >> 1); - dst[7] = (Sint32) ((sample7 + last_sample7) >> 1); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src--; - dst[1] = (float) ((sample0 + last_sample0) * 0.5); - dst[0] = (float) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src += 2; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src--; - dst[3] = (float) sample0; - dst[2] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[1] = (float) ((sample0 + last_sample0) * 0.5); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src += 4; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 2; - dst[3] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - src += 4; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 2; - dst[7] = (float) sample1; - dst[6] = (float) sample0; - dst[5] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[4] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[3] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - src += 8; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 4; - dst[7] = (float) ((sample3 + last_sample3) * 0.5); - dst[6] = (float) ((sample2 + last_sample2) * 0.5); - dst[5] = (float) ((sample1 + last_sample1) * 0.5); - dst[4] = (float) ((sample0 + last_sample0) * 0.5); - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - src += 8; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 4; - dst[15] = (float) sample3; - dst[14] = (float) sample2; - dst[13] = (float) sample1; - dst[12] = (float) sample0; - dst[11] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[10] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[9] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[8] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[7] = (float) ((sample3 + last_sample3) * 0.5); - dst[6] = (float) ((sample2 + last_sample2) * 0.5); - dst[5] = (float) ((sample1 + last_sample1) * 0.5); - dst[4] = (float) ((sample0 + last_sample0) * 0.5); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - src += 16; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 6; - dst[11] = (float) ((sample5 + last_sample5) * 0.5); - dst[10] = (float) ((sample4 + last_sample4) * 0.5); - dst[9] = (float) ((sample3 + last_sample3) * 0.5); - dst[8] = (float) ((sample2 + last_sample2) * 0.5); - dst[7] = (float) ((sample1 + last_sample1) * 0.5); - dst[6] = (float) ((sample0 + last_sample0) * 0.5); - dst[5] = (float) sample5; - dst[4] = (float) sample4; - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - src += 12; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 6; - dst[23] = (float) sample5; - dst[22] = (float) sample4; - dst[21] = (float) sample3; - dst[20] = (float) sample2; - dst[19] = (float) sample1; - dst[18] = (float) sample0; - dst[17] = (float) (((3.0 * sample5) + last_sample5) * 0.25); - dst[16] = (float) (((3.0 * sample4) + last_sample4) * 0.25); - dst[15] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[14] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[13] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[12] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[11] = (float) ((sample5 + last_sample5) * 0.5); - dst[10] = (float) ((sample4 + last_sample4) * 0.5); - dst[9] = (float) ((sample3 + last_sample3) * 0.5); - dst[8] = (float) ((sample2 + last_sample2) * 0.5); - dst[7] = (float) ((sample1 + last_sample1) * 0.5); - dst[6] = (float) ((sample0 + last_sample0) * 0.5); - dst[5] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25); - dst[4] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - src += 24; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - double last_sample7 = (double) SDL_SwapFloatLE(src[7]); - double last_sample6 = (double) SDL_SwapFloatLE(src[6]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample7 = (double) SDL_SwapFloatLE(src[7]); - const double sample6 = (double) SDL_SwapFloatLE(src[6]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 8; - dst[15] = (float) ((sample7 + last_sample7) * 0.5); - dst[14] = (float) ((sample6 + last_sample6) * 0.5); - dst[13] = (float) ((sample5 + last_sample5) * 0.5); - dst[12] = (float) ((sample4 + last_sample4) * 0.5); - dst[11] = (float) ((sample3 + last_sample3) * 0.5); - dst[10] = (float) ((sample2 + last_sample2) * 0.5); - dst[9] = (float) ((sample1 + last_sample1) * 0.5); - dst[8] = (float) ((sample0 + last_sample0) * 0.5); - dst[7] = (float) sample7; - dst[6] = (float) sample6; - dst[5] = (float) sample5; - dst[4] = (float) sample4; - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample6 = (double) SDL_SwapFloatLE(src[6]); - double last_sample7 = (double) SDL_SwapFloatLE(src[7]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample6 = (double) SDL_SwapFloatLE(src[6]); - const double sample7 = (double) SDL_SwapFloatLE(src[7]); - src += 16; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - dst[6] = (float) ((sample6 + last_sample6) * 0.5); - dst[7] = (float) ((sample7 + last_sample7) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - double last_sample7 = (double) SDL_SwapFloatLE(src[7]); - double last_sample6 = (double) SDL_SwapFloatLE(src[6]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - while (dst > target) { - const double sample7 = (double) SDL_SwapFloatLE(src[7]); - const double sample6 = (double) SDL_SwapFloatLE(src[6]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - src -= 8; - dst[31] = (float) sample7; - dst[30] = (float) sample6; - dst[29] = (float) sample5; - dst[28] = (float) sample4; - dst[27] = (float) sample3; - dst[26] = (float) sample2; - dst[25] = (float) sample1; - dst[24] = (float) sample0; - dst[23] = (float) (((3.0 * sample7) + last_sample7) * 0.25); - dst[22] = (float) (((3.0 * sample6) + last_sample6) * 0.25); - dst[21] = (float) (((3.0 * sample5) + last_sample5) * 0.25); - dst[20] = (float) (((3.0 * sample4) + last_sample4) * 0.25); - dst[19] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[18] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[17] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[16] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[15] = (float) ((sample7 + last_sample7) * 0.5); - dst[14] = (float) ((sample6 + last_sample6) * 0.5); - dst[13] = (float) ((sample5 + last_sample5) * 0.5); - dst[12] = (float) ((sample4 + last_sample4) * 0.5); - dst[11] = (float) ((sample3 + last_sample3) * 0.5); - dst[10] = (float) ((sample2 + last_sample2) * 0.5); - dst[9] = (float) ((sample1 + last_sample1) * 0.5); - dst[8] = (float) ((sample0 + last_sample0) * 0.5); - dst[7] = (float) ((sample7 + (3.0 * last_sample7)) * 0.25); - dst[6] = (float) ((sample6 + (3.0 * last_sample6)) * 0.25); - dst[5] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25); - dst[4] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatLE(src[0]); - double last_sample1 = (double) SDL_SwapFloatLE(src[1]); - double last_sample2 = (double) SDL_SwapFloatLE(src[2]); - double last_sample3 = (double) SDL_SwapFloatLE(src[3]); - double last_sample4 = (double) SDL_SwapFloatLE(src[4]); - double last_sample5 = (double) SDL_SwapFloatLE(src[5]); - double last_sample6 = (double) SDL_SwapFloatLE(src[6]); - double last_sample7 = (double) SDL_SwapFloatLE(src[7]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatLE(src[0]); - const double sample1 = (double) SDL_SwapFloatLE(src[1]); - const double sample2 = (double) SDL_SwapFloatLE(src[2]); - const double sample3 = (double) SDL_SwapFloatLE(src[3]); - const double sample4 = (double) SDL_SwapFloatLE(src[4]); - const double sample5 = (double) SDL_SwapFloatLE(src[5]); - const double sample6 = (double) SDL_SwapFloatLE(src[6]); - const double sample7 = (double) SDL_SwapFloatLE(src[7]); - src += 32; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - dst[6] = (float) ((sample6 + last_sample6) * 0.5); - dst[7] = (float) ((sample7 + last_sample7) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src--; - dst[1] = (float) ((sample0 + last_sample0) * 0.5); - dst[0] = (float) sample0; - last_sample0 = sample0; - dst -= 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src += 2; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 1; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1; - const float *target = ((const float *) cvt->buf) - 1; - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src--; - dst[3] = (float) sample0; - dst[2] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[1] = (float) ((sample0 + last_sample0) * 0.5); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 1 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src += 4; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - last_sample0 = sample0; - dst++; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 2; - dst[3] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - src += 4; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 2; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2; - const float *target = ((const float *) cvt->buf) - 2; - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 2; - dst[7] = (float) sample1; - dst[6] = (float) sample0; - dst[5] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[4] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[3] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 2 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - src += 8; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - dst += 2; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 4; - dst[7] = (float) ((sample3 + last_sample3) * 0.5); - dst[6] = (float) ((sample2 + last_sample2) * 0.5); - dst[5] = (float) ((sample1 + last_sample1) * 0.5); - dst[4] = (float) ((sample0 + last_sample0) * 0.5); - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - src += 8; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 4; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4; - const float *target = ((const float *) cvt->buf) - 4; - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 4; - dst[15] = (float) sample3; - dst[14] = (float) sample2; - dst[13] = (float) sample1; - dst[12] = (float) sample0; - dst[11] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[10] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[9] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[8] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[7] = (float) ((sample3 + last_sample3) * 0.5); - dst[6] = (float) ((sample2 + last_sample2) * 0.5); - dst[5] = (float) ((sample1 + last_sample1) * 0.5); - dst[4] = (float) ((sample0 + last_sample0) * 0.5); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 4 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - src += 16; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - dst += 4; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 6; - dst[11] = (float) ((sample5 + last_sample5) * 0.5); - dst[10] = (float) ((sample4 + last_sample4) * 0.5); - dst[9] = (float) ((sample3 + last_sample3) * 0.5); - dst[8] = (float) ((sample2 + last_sample2) * 0.5); - dst[7] = (float) ((sample1 + last_sample1) * 0.5); - dst[6] = (float) ((sample0 + last_sample0) * 0.5); - dst[5] = (float) sample5; - dst[4] = (float) sample4; - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 12; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - src += 12; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 6; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6; - const float *target = ((const float *) cvt->buf) - 6; - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 6; - dst[23] = (float) sample5; - dst[22] = (float) sample4; - dst[21] = (float) sample3; - dst[20] = (float) sample2; - dst[19] = (float) sample1; - dst[18] = (float) sample0; - dst[17] = (float) (((3.0 * sample5) + last_sample5) * 0.25); - dst[16] = (float) (((3.0 * sample4) + last_sample4) * 0.25); - dst[15] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[14] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[13] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[12] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[11] = (float) ((sample5 + last_sample5) * 0.5); - dst[10] = (float) ((sample4 + last_sample4) * 0.5); - dst[9] = (float) ((sample3 + last_sample3) * 0.5); - dst[8] = (float) ((sample2 + last_sample2) * 0.5); - dst[7] = (float) ((sample1 + last_sample1) * 0.5); - dst[6] = (float) ((sample0 + last_sample0) * 0.5); - dst[5] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25); - dst[4] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 24; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 6 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - src += 24; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - dst += 6; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 2; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - double last_sample7 = (double) SDL_SwapFloatBE(src[7]); - double last_sample6 = (double) SDL_SwapFloatBE(src[6]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample7 = (double) SDL_SwapFloatBE(src[7]); - const double sample6 = (double) SDL_SwapFloatBE(src[6]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 8; - dst[15] = (float) ((sample7 + last_sample7) * 0.5); - dst[14] = (float) ((sample6 + last_sample6) * 0.5); - dst[13] = (float) ((sample5 + last_sample5) * 0.5); - dst[12] = (float) ((sample4 + last_sample4) * 0.5); - dst[11] = (float) ((sample3 + last_sample3) * 0.5); - dst[10] = (float) ((sample2 + last_sample2) * 0.5); - dst[9] = (float) ((sample1 + last_sample1) * 0.5); - dst[8] = (float) ((sample0 + last_sample0) * 0.5); - dst[7] = (float) sample7; - dst[6] = (float) sample6; - dst[5] = (float) sample5; - dst[4] = (float) sample4; - dst[3] = (float) sample3; - dst[2] = (float) sample2; - dst[1] = (float) sample1; - dst[0] = (float) sample0; - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 16; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 2; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample6 = (double) SDL_SwapFloatBE(src[6]); - double last_sample7 = (double) SDL_SwapFloatBE(src[7]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample6 = (double) SDL_SwapFloatBE(src[6]); - const double sample7 = (double) SDL_SwapFloatBE(src[7]); - src += 16; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - dst[6] = (float) ((sample6 + last_sample6) * 0.5); - dst[7] = (float) ((sample7 + last_sample7) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Upsample_F32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt * 4; - float *dst = ((float *) (cvt->buf + dstsize)) - 8; - const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; - const float *target = ((const float *) cvt->buf) - 8; - double last_sample7 = (double) SDL_SwapFloatBE(src[7]); - double last_sample6 = (double) SDL_SwapFloatBE(src[6]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - while (dst > target) { - const double sample7 = (double) SDL_SwapFloatBE(src[7]); - const double sample6 = (double) SDL_SwapFloatBE(src[6]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - src -= 8; - dst[31] = (float) sample7; - dst[30] = (float) sample6; - dst[29] = (float) sample5; - dst[28] = (float) sample4; - dst[27] = (float) sample3; - dst[26] = (float) sample2; - dst[25] = (float) sample1; - dst[24] = (float) sample0; - dst[23] = (float) (((3.0 * sample7) + last_sample7) * 0.25); - dst[22] = (float) (((3.0 * sample6) + last_sample6) * 0.25); - dst[21] = (float) (((3.0 * sample5) + last_sample5) * 0.25); - dst[20] = (float) (((3.0 * sample4) + last_sample4) * 0.25); - dst[19] = (float) (((3.0 * sample3) + last_sample3) * 0.25); - dst[18] = (float) (((3.0 * sample2) + last_sample2) * 0.25); - dst[17] = (float) (((3.0 * sample1) + last_sample1) * 0.25); - dst[16] = (float) (((3.0 * sample0) + last_sample0) * 0.25); - dst[15] = (float) ((sample7 + last_sample7) * 0.5); - dst[14] = (float) ((sample6 + last_sample6) * 0.5); - dst[13] = (float) ((sample5 + last_sample5) * 0.5); - dst[12] = (float) ((sample4 + last_sample4) * 0.5); - dst[11] = (float) ((sample3 + last_sample3) * 0.5); - dst[10] = (float) ((sample2 + last_sample2) * 0.5); - dst[9] = (float) ((sample1 + last_sample1) * 0.5); - dst[8] = (float) ((sample0 + last_sample0) * 0.5); - dst[7] = (float) ((sample7 + (3.0 * last_sample7)) * 0.25); - dst[6] = (float) ((sample6 + (3.0 * last_sample6)) * 0.25); - dst[5] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25); - dst[4] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25); - dst[3] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25); - dst[2] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25); - dst[1] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25); - dst[0] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25); - last_sample7 = sample7; - last_sample6 = sample6; - last_sample5 = sample5; - last_sample4 = sample4; - last_sample3 = sample3; - last_sample2 = sample2; - last_sample1 = sample1; - last_sample0 = sample0; - dst -= 32; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -static void SDLCALL -SDL_Downsample_F32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format) -{ -#if DEBUG_CONVERT - fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 8 channels.\n"); -#endif - - const int srcsize = cvt->len_cvt; - const int dstsize = cvt->len_cvt / 4; - float *dst = (float *) cvt->buf; - const float *src = (float *) cvt->buf; - const float *target = (const float *) (cvt->buf + dstsize); - double last_sample0 = (double) SDL_SwapFloatBE(src[0]); - double last_sample1 = (double) SDL_SwapFloatBE(src[1]); - double last_sample2 = (double) SDL_SwapFloatBE(src[2]); - double last_sample3 = (double) SDL_SwapFloatBE(src[3]); - double last_sample4 = (double) SDL_SwapFloatBE(src[4]); - double last_sample5 = (double) SDL_SwapFloatBE(src[5]); - double last_sample6 = (double) SDL_SwapFloatBE(src[6]); - double last_sample7 = (double) SDL_SwapFloatBE(src[7]); - while (dst < target) { - const double sample0 = (double) SDL_SwapFloatBE(src[0]); - const double sample1 = (double) SDL_SwapFloatBE(src[1]); - const double sample2 = (double) SDL_SwapFloatBE(src[2]); - const double sample3 = (double) SDL_SwapFloatBE(src[3]); - const double sample4 = (double) SDL_SwapFloatBE(src[4]); - const double sample5 = (double) SDL_SwapFloatBE(src[5]); - const double sample6 = (double) SDL_SwapFloatBE(src[6]); - const double sample7 = (double) SDL_SwapFloatBE(src[7]); - src += 32; - dst[0] = (float) ((sample0 + last_sample0) * 0.5); - dst[1] = (float) ((sample1 + last_sample1) * 0.5); - dst[2] = (float) ((sample2 + last_sample2) * 0.5); - dst[3] = (float) ((sample3 + last_sample3) * 0.5); - dst[4] = (float) ((sample4 + last_sample4) * 0.5); - dst[5] = (float) ((sample5 + last_sample5) * 0.5); - dst[6] = (float) ((sample6 + last_sample6) * 0.5); - dst[7] = (float) ((sample7 + last_sample7) * 0.5); - last_sample0 = sample0; - last_sample1 = sample1; - last_sample2 = sample2; - last_sample3 = sample3; - last_sample4 = sample4; - last_sample5 = sample5; - last_sample6 = sample6; - last_sample7 = sample7; - dst += 8; - } - - cvt->len_cvt = dstsize; - if (cvt->filters[++cvt->filter_index]) { - cvt->filters[cvt->filter_index] (cvt, format); - } -} - -#endif /* !LESS_RESAMPLERS */ -#endif /* !NO_RESAMPLERS */ - - -const SDL_AudioRateFilters sdl_audio_rate_filters[] = -{ -#if !NO_RESAMPLERS - { AUDIO_U8, 1, 0, 0, SDL_Downsample_U8_1c }, - { AUDIO_U8, 1, 1, 0, SDL_Upsample_U8_1c }, - { AUDIO_U8, 2, 0, 0, SDL_Downsample_U8_2c }, - { AUDIO_U8, 2, 1, 0, SDL_Upsample_U8_2c }, - { AUDIO_U8, 4, 0, 0, SDL_Downsample_U8_4c }, - { AUDIO_U8, 4, 1, 0, SDL_Upsample_U8_4c }, - { AUDIO_U8, 6, 0, 0, SDL_Downsample_U8_6c }, - { AUDIO_U8, 6, 1, 0, SDL_Upsample_U8_6c }, - { AUDIO_U8, 8, 0, 0, SDL_Downsample_U8_8c }, - { AUDIO_U8, 8, 1, 0, SDL_Upsample_U8_8c }, - { AUDIO_S8, 1, 0, 0, SDL_Downsample_S8_1c }, - { AUDIO_S8, 1, 1, 0, SDL_Upsample_S8_1c }, - { AUDIO_S8, 2, 0, 0, SDL_Downsample_S8_2c }, - { AUDIO_S8, 2, 1, 0, SDL_Upsample_S8_2c }, - { AUDIO_S8, 4, 0, 0, SDL_Downsample_S8_4c }, - { AUDIO_S8, 4, 1, 0, SDL_Upsample_S8_4c }, - { AUDIO_S8, 6, 0, 0, SDL_Downsample_S8_6c }, - { AUDIO_S8, 6, 1, 0, SDL_Upsample_S8_6c }, - { AUDIO_S8, 8, 0, 0, SDL_Downsample_S8_8c }, - { AUDIO_S8, 8, 1, 0, SDL_Upsample_S8_8c }, - { AUDIO_U16LSB, 1, 0, 0, SDL_Downsample_U16LSB_1c }, - { AUDIO_U16LSB, 1, 1, 0, SDL_Upsample_U16LSB_1c }, - { AUDIO_U16LSB, 2, 0, 0, SDL_Downsample_U16LSB_2c }, - { AUDIO_U16LSB, 2, 1, 0, SDL_Upsample_U16LSB_2c }, - { AUDIO_U16LSB, 4, 0, 0, SDL_Downsample_U16LSB_4c }, - { AUDIO_U16LSB, 4, 1, 0, SDL_Upsample_U16LSB_4c }, - { AUDIO_U16LSB, 6, 0, 0, SDL_Downsample_U16LSB_6c }, - { AUDIO_U16LSB, 6, 1, 0, SDL_Upsample_U16LSB_6c }, - { AUDIO_U16LSB, 8, 0, 0, SDL_Downsample_U16LSB_8c }, - { AUDIO_U16LSB, 8, 1, 0, SDL_Upsample_U16LSB_8c }, - { AUDIO_S16LSB, 1, 0, 0, SDL_Downsample_S16LSB_1c }, - { AUDIO_S16LSB, 1, 1, 0, SDL_Upsample_S16LSB_1c }, - { AUDIO_S16LSB, 2, 0, 0, SDL_Downsample_S16LSB_2c }, - { AUDIO_S16LSB, 2, 1, 0, SDL_Upsample_S16LSB_2c }, - { AUDIO_S16LSB, 4, 0, 0, SDL_Downsample_S16LSB_4c }, - { AUDIO_S16LSB, 4, 1, 0, SDL_Upsample_S16LSB_4c }, - { AUDIO_S16LSB, 6, 0, 0, SDL_Downsample_S16LSB_6c }, - { AUDIO_S16LSB, 6, 1, 0, SDL_Upsample_S16LSB_6c }, - { AUDIO_S16LSB, 8, 0, 0, SDL_Downsample_S16LSB_8c }, - { AUDIO_S16LSB, 8, 1, 0, SDL_Upsample_S16LSB_8c }, - { AUDIO_U16MSB, 1, 0, 0, SDL_Downsample_U16MSB_1c }, - { AUDIO_U16MSB, 1, 1, 0, SDL_Upsample_U16MSB_1c }, - { AUDIO_U16MSB, 2, 0, 0, SDL_Downsample_U16MSB_2c }, - { AUDIO_U16MSB, 2, 1, 0, SDL_Upsample_U16MSB_2c }, - { AUDIO_U16MSB, 4, 0, 0, SDL_Downsample_U16MSB_4c }, - { AUDIO_U16MSB, 4, 1, 0, SDL_Upsample_U16MSB_4c }, - { AUDIO_U16MSB, 6, 0, 0, SDL_Downsample_U16MSB_6c }, - { AUDIO_U16MSB, 6, 1, 0, SDL_Upsample_U16MSB_6c }, - { AUDIO_U16MSB, 8, 0, 0, SDL_Downsample_U16MSB_8c }, - { AUDIO_U16MSB, 8, 1, 0, SDL_Upsample_U16MSB_8c }, - { AUDIO_S16MSB, 1, 0, 0, SDL_Downsample_S16MSB_1c }, - { AUDIO_S16MSB, 1, 1, 0, SDL_Upsample_S16MSB_1c }, - { AUDIO_S16MSB, 2, 0, 0, SDL_Downsample_S16MSB_2c }, - { AUDIO_S16MSB, 2, 1, 0, SDL_Upsample_S16MSB_2c }, - { AUDIO_S16MSB, 4, 0, 0, SDL_Downsample_S16MSB_4c }, - { AUDIO_S16MSB, 4, 1, 0, SDL_Upsample_S16MSB_4c }, - { AUDIO_S16MSB, 6, 0, 0, SDL_Downsample_S16MSB_6c }, - { AUDIO_S16MSB, 6, 1, 0, SDL_Upsample_S16MSB_6c }, - { AUDIO_S16MSB, 8, 0, 0, SDL_Downsample_S16MSB_8c }, - { AUDIO_S16MSB, 8, 1, 0, SDL_Upsample_S16MSB_8c }, - { AUDIO_S32LSB, 1, 0, 0, SDL_Downsample_S32LSB_1c }, - { AUDIO_S32LSB, 1, 1, 0, SDL_Upsample_S32LSB_1c }, - { AUDIO_S32LSB, 2, 0, 0, SDL_Downsample_S32LSB_2c }, - { AUDIO_S32LSB, 2, 1, 0, SDL_Upsample_S32LSB_2c }, - { AUDIO_S32LSB, 4, 0, 0, SDL_Downsample_S32LSB_4c }, - { AUDIO_S32LSB, 4, 1, 0, SDL_Upsample_S32LSB_4c }, - { AUDIO_S32LSB, 6, 0, 0, SDL_Downsample_S32LSB_6c }, - { AUDIO_S32LSB, 6, 1, 0, SDL_Upsample_S32LSB_6c }, - { AUDIO_S32LSB, 8, 0, 0, SDL_Downsample_S32LSB_8c }, - { AUDIO_S32LSB, 8, 1, 0, SDL_Upsample_S32LSB_8c }, - { AUDIO_S32MSB, 1, 0, 0, SDL_Downsample_S32MSB_1c }, - { AUDIO_S32MSB, 1, 1, 0, SDL_Upsample_S32MSB_1c }, - { AUDIO_S32MSB, 2, 0, 0, SDL_Downsample_S32MSB_2c }, - { AUDIO_S32MSB, 2, 1, 0, SDL_Upsample_S32MSB_2c }, - { AUDIO_S32MSB, 4, 0, 0, SDL_Downsample_S32MSB_4c }, - { AUDIO_S32MSB, 4, 1, 0, SDL_Upsample_S32MSB_4c }, - { AUDIO_S32MSB, 6, 0, 0, SDL_Downsample_S32MSB_6c }, - { AUDIO_S32MSB, 6, 1, 0, SDL_Upsample_S32MSB_6c }, - { AUDIO_S32MSB, 8, 0, 0, SDL_Downsample_S32MSB_8c }, - { AUDIO_S32MSB, 8, 1, 0, SDL_Upsample_S32MSB_8c }, - { AUDIO_F32LSB, 1, 0, 0, SDL_Downsample_F32LSB_1c }, - { AUDIO_F32LSB, 1, 1, 0, SDL_Upsample_F32LSB_1c }, - { AUDIO_F32LSB, 2, 0, 0, SDL_Downsample_F32LSB_2c }, - { AUDIO_F32LSB, 2, 1, 0, SDL_Upsample_F32LSB_2c }, - { AUDIO_F32LSB, 4, 0, 0, SDL_Downsample_F32LSB_4c }, - { AUDIO_F32LSB, 4, 1, 0, SDL_Upsample_F32LSB_4c }, - { AUDIO_F32LSB, 6, 0, 0, SDL_Downsample_F32LSB_6c }, - { AUDIO_F32LSB, 6, 1, 0, SDL_Upsample_F32LSB_6c }, - { AUDIO_F32LSB, 8, 0, 0, SDL_Downsample_F32LSB_8c }, - { AUDIO_F32LSB, 8, 1, 0, SDL_Upsample_F32LSB_8c }, - { AUDIO_F32MSB, 1, 0, 0, SDL_Downsample_F32MSB_1c }, - { AUDIO_F32MSB, 1, 1, 0, SDL_Upsample_F32MSB_1c }, - { AUDIO_F32MSB, 2, 0, 0, SDL_Downsample_F32MSB_2c }, - { AUDIO_F32MSB, 2, 1, 0, SDL_Upsample_F32MSB_2c }, - { AUDIO_F32MSB, 4, 0, 0, SDL_Downsample_F32MSB_4c }, - { AUDIO_F32MSB, 4, 1, 0, SDL_Upsample_F32MSB_4c }, - { AUDIO_F32MSB, 6, 0, 0, SDL_Downsample_F32MSB_6c }, - { AUDIO_F32MSB, 6, 1, 0, SDL_Upsample_F32MSB_6c }, - { AUDIO_F32MSB, 8, 0, 0, SDL_Downsample_F32MSB_8c }, - { AUDIO_F32MSB, 8, 1, 0, SDL_Upsample_F32MSB_8c }, -#if !LESS_RESAMPLERS - { AUDIO_U8, 1, 0, 2, SDL_Downsample_U8_1c_x2 }, - { AUDIO_U8, 1, 1, 2, SDL_Upsample_U8_1c_x2 }, - { AUDIO_U8, 1, 0, 4, SDL_Downsample_U8_1c_x4 }, - { AUDIO_U8, 1, 1, 4, SDL_Upsample_U8_1c_x4 }, - { AUDIO_U8, 2, 0, 2, SDL_Downsample_U8_2c_x2 }, - { AUDIO_U8, 2, 1, 2, SDL_Upsample_U8_2c_x2 }, - { AUDIO_U8, 2, 0, 4, SDL_Downsample_U8_2c_x4 }, - { AUDIO_U8, 2, 1, 4, SDL_Upsample_U8_2c_x4 }, - { AUDIO_U8, 4, 0, 2, SDL_Downsample_U8_4c_x2 }, - { AUDIO_U8, 4, 1, 2, SDL_Upsample_U8_4c_x2 }, - { AUDIO_U8, 4, 0, 4, SDL_Downsample_U8_4c_x4 }, - { AUDIO_U8, 4, 1, 4, SDL_Upsample_U8_4c_x4 }, - { AUDIO_U8, 6, 0, 2, SDL_Downsample_U8_6c_x2 }, - { AUDIO_U8, 6, 1, 2, SDL_Upsample_U8_6c_x2 }, - { AUDIO_U8, 6, 0, 4, SDL_Downsample_U8_6c_x4 }, - { AUDIO_U8, 6, 1, 4, SDL_Upsample_U8_6c_x4 }, - { AUDIO_U8, 8, 0, 2, SDL_Downsample_U8_8c_x2 }, - { AUDIO_U8, 8, 1, 2, SDL_Upsample_U8_8c_x2 }, - { AUDIO_U8, 8, 0, 4, SDL_Downsample_U8_8c_x4 }, - { AUDIO_U8, 8, 1, 4, SDL_Upsample_U8_8c_x4 }, - { AUDIO_S8, 1, 0, 2, SDL_Downsample_S8_1c_x2 }, - { AUDIO_S8, 1, 1, 2, SDL_Upsample_S8_1c_x2 }, - { AUDIO_S8, 1, 0, 4, SDL_Downsample_S8_1c_x4 }, - { AUDIO_S8, 1, 1, 4, SDL_Upsample_S8_1c_x4 }, - { AUDIO_S8, 2, 0, 2, SDL_Downsample_S8_2c_x2 }, - { AUDIO_S8, 2, 1, 2, SDL_Upsample_S8_2c_x2 }, - { AUDIO_S8, 2, 0, 4, SDL_Downsample_S8_2c_x4 }, - { AUDIO_S8, 2, 1, 4, SDL_Upsample_S8_2c_x4 }, - { AUDIO_S8, 4, 0, 2, SDL_Downsample_S8_4c_x2 }, - { AUDIO_S8, 4, 1, 2, SDL_Upsample_S8_4c_x2 }, - { AUDIO_S8, 4, 0, 4, SDL_Downsample_S8_4c_x4 }, - { AUDIO_S8, 4, 1, 4, SDL_Upsample_S8_4c_x4 }, - { AUDIO_S8, 6, 0, 2, SDL_Downsample_S8_6c_x2 }, - { AUDIO_S8, 6, 1, 2, SDL_Upsample_S8_6c_x2 }, - { AUDIO_S8, 6, 0, 4, SDL_Downsample_S8_6c_x4 }, - { AUDIO_S8, 6, 1, 4, SDL_Upsample_S8_6c_x4 }, - { AUDIO_S8, 8, 0, 2, SDL_Downsample_S8_8c_x2 }, - { AUDIO_S8, 8, 1, 2, SDL_Upsample_S8_8c_x2 }, - { AUDIO_S8, 8, 0, 4, SDL_Downsample_S8_8c_x4 }, - { AUDIO_S8, 8, 1, 4, SDL_Upsample_S8_8c_x4 }, - { AUDIO_U16LSB, 1, 0, 2, SDL_Downsample_U16LSB_1c_x2 }, - { AUDIO_U16LSB, 1, 1, 2, SDL_Upsample_U16LSB_1c_x2 }, - { AUDIO_U16LSB, 1, 0, 4, SDL_Downsample_U16LSB_1c_x4 }, - { AUDIO_U16LSB, 1, 1, 4, SDL_Upsample_U16LSB_1c_x4 }, - { AUDIO_U16LSB, 2, 0, 2, SDL_Downsample_U16LSB_2c_x2 }, - { AUDIO_U16LSB, 2, 1, 2, SDL_Upsample_U16LSB_2c_x2 }, - { AUDIO_U16LSB, 2, 0, 4, SDL_Downsample_U16LSB_2c_x4 }, - { AUDIO_U16LSB, 2, 1, 4, SDL_Upsample_U16LSB_2c_x4 }, - { AUDIO_U16LSB, 4, 0, 2, SDL_Downsample_U16LSB_4c_x2 }, - { AUDIO_U16LSB, 4, 1, 2, SDL_Upsample_U16LSB_4c_x2 }, - { AUDIO_U16LSB, 4, 0, 4, SDL_Downsample_U16LSB_4c_x4 }, - { AUDIO_U16LSB, 4, 1, 4, SDL_Upsample_U16LSB_4c_x4 }, - { AUDIO_U16LSB, 6, 0, 2, SDL_Downsample_U16LSB_6c_x2 }, - { AUDIO_U16LSB, 6, 1, 2, SDL_Upsample_U16LSB_6c_x2 }, - { AUDIO_U16LSB, 6, 0, 4, SDL_Downsample_U16LSB_6c_x4 }, - { AUDIO_U16LSB, 6, 1, 4, SDL_Upsample_U16LSB_6c_x4 }, - { AUDIO_U16LSB, 8, 0, 2, SDL_Downsample_U16LSB_8c_x2 }, - { AUDIO_U16LSB, 8, 1, 2, SDL_Upsample_U16LSB_8c_x2 }, - { AUDIO_U16LSB, 8, 0, 4, SDL_Downsample_U16LSB_8c_x4 }, - { AUDIO_U16LSB, 8, 1, 4, SDL_Upsample_U16LSB_8c_x4 }, - { AUDIO_S16LSB, 1, 0, 2, SDL_Downsample_S16LSB_1c_x2 }, - { AUDIO_S16LSB, 1, 1, 2, SDL_Upsample_S16LSB_1c_x2 }, - { AUDIO_S16LSB, 1, 0, 4, SDL_Downsample_S16LSB_1c_x4 }, - { AUDIO_S16LSB, 1, 1, 4, SDL_Upsample_S16LSB_1c_x4 }, - { AUDIO_S16LSB, 2, 0, 2, SDL_Downsample_S16LSB_2c_x2 }, - { AUDIO_S16LSB, 2, 1, 2, SDL_Upsample_S16LSB_2c_x2 }, - { AUDIO_S16LSB, 2, 0, 4, SDL_Downsample_S16LSB_2c_x4 }, - { AUDIO_S16LSB, 2, 1, 4, SDL_Upsample_S16LSB_2c_x4 }, - { AUDIO_S16LSB, 4, 0, 2, SDL_Downsample_S16LSB_4c_x2 }, - { AUDIO_S16LSB, 4, 1, 2, SDL_Upsample_S16LSB_4c_x2 }, - { AUDIO_S16LSB, 4, 0, 4, SDL_Downsample_S16LSB_4c_x4 }, - { AUDIO_S16LSB, 4, 1, 4, SDL_Upsample_S16LSB_4c_x4 }, - { AUDIO_S16LSB, 6, 0, 2, SDL_Downsample_S16LSB_6c_x2 }, - { AUDIO_S16LSB, 6, 1, 2, SDL_Upsample_S16LSB_6c_x2 }, - { AUDIO_S16LSB, 6, 0, 4, SDL_Downsample_S16LSB_6c_x4 }, - { AUDIO_S16LSB, 6, 1, 4, SDL_Upsample_S16LSB_6c_x4 }, - { AUDIO_S16LSB, 8, 0, 2, SDL_Downsample_S16LSB_8c_x2 }, - { AUDIO_S16LSB, 8, 1, 2, SDL_Upsample_S16LSB_8c_x2 }, - { AUDIO_S16LSB, 8, 0, 4, SDL_Downsample_S16LSB_8c_x4 }, - { AUDIO_S16LSB, 8, 1, 4, SDL_Upsample_S16LSB_8c_x4 }, - { AUDIO_U16MSB, 1, 0, 2, SDL_Downsample_U16MSB_1c_x2 }, - { AUDIO_U16MSB, 1, 1, 2, SDL_Upsample_U16MSB_1c_x2 }, - { AUDIO_U16MSB, 1, 0, 4, SDL_Downsample_U16MSB_1c_x4 }, - { AUDIO_U16MSB, 1, 1, 4, SDL_Upsample_U16MSB_1c_x4 }, - { AUDIO_U16MSB, 2, 0, 2, SDL_Downsample_U16MSB_2c_x2 }, - { AUDIO_U16MSB, 2, 1, 2, SDL_Upsample_U16MSB_2c_x2 }, - { AUDIO_U16MSB, 2, 0, 4, SDL_Downsample_U16MSB_2c_x4 }, - { AUDIO_U16MSB, 2, 1, 4, SDL_Upsample_U16MSB_2c_x4 }, - { AUDIO_U16MSB, 4, 0, 2, SDL_Downsample_U16MSB_4c_x2 }, - { AUDIO_U16MSB, 4, 1, 2, SDL_Upsample_U16MSB_4c_x2 }, - { AUDIO_U16MSB, 4, 0, 4, SDL_Downsample_U16MSB_4c_x4 }, - { AUDIO_U16MSB, 4, 1, 4, SDL_Upsample_U16MSB_4c_x4 }, - { AUDIO_U16MSB, 6, 0, 2, SDL_Downsample_U16MSB_6c_x2 }, - { AUDIO_U16MSB, 6, 1, 2, SDL_Upsample_U16MSB_6c_x2 }, - { AUDIO_U16MSB, 6, 0, 4, SDL_Downsample_U16MSB_6c_x4 }, - { AUDIO_U16MSB, 6, 1, 4, SDL_Upsample_U16MSB_6c_x4 }, - { AUDIO_U16MSB, 8, 0, 2, SDL_Downsample_U16MSB_8c_x2 }, - { AUDIO_U16MSB, 8, 1, 2, SDL_Upsample_U16MSB_8c_x2 }, - { AUDIO_U16MSB, 8, 0, 4, SDL_Downsample_U16MSB_8c_x4 }, - { AUDIO_U16MSB, 8, 1, 4, SDL_Upsample_U16MSB_8c_x4 }, - { AUDIO_S16MSB, 1, 0, 2, SDL_Downsample_S16MSB_1c_x2 }, - { AUDIO_S16MSB, 1, 1, 2, SDL_Upsample_S16MSB_1c_x2 }, - { AUDIO_S16MSB, 1, 0, 4, SDL_Downsample_S16MSB_1c_x4 }, - { AUDIO_S16MSB, 1, 1, 4, SDL_Upsample_S16MSB_1c_x4 }, - { AUDIO_S16MSB, 2, 0, 2, SDL_Downsample_S16MSB_2c_x2 }, - { AUDIO_S16MSB, 2, 1, 2, SDL_Upsample_S16MSB_2c_x2 }, - { AUDIO_S16MSB, 2, 0, 4, SDL_Downsample_S16MSB_2c_x4 }, - { AUDIO_S16MSB, 2, 1, 4, SDL_Upsample_S16MSB_2c_x4 }, - { AUDIO_S16MSB, 4, 0, 2, SDL_Downsample_S16MSB_4c_x2 }, - { AUDIO_S16MSB, 4, 1, 2, SDL_Upsample_S16MSB_4c_x2 }, - { AUDIO_S16MSB, 4, 0, 4, SDL_Downsample_S16MSB_4c_x4 }, - { AUDIO_S16MSB, 4, 1, 4, SDL_Upsample_S16MSB_4c_x4 }, - { AUDIO_S16MSB, 6, 0, 2, SDL_Downsample_S16MSB_6c_x2 }, - { AUDIO_S16MSB, 6, 1, 2, SDL_Upsample_S16MSB_6c_x2 }, - { AUDIO_S16MSB, 6, 0, 4, SDL_Downsample_S16MSB_6c_x4 }, - { AUDIO_S16MSB, 6, 1, 4, SDL_Upsample_S16MSB_6c_x4 }, - { AUDIO_S16MSB, 8, 0, 2, SDL_Downsample_S16MSB_8c_x2 }, - { AUDIO_S16MSB, 8, 1, 2, SDL_Upsample_S16MSB_8c_x2 }, - { AUDIO_S16MSB, 8, 0, 4, SDL_Downsample_S16MSB_8c_x4 }, - { AUDIO_S16MSB, 8, 1, 4, SDL_Upsample_S16MSB_8c_x4 }, - { AUDIO_S32LSB, 1, 0, 2, SDL_Downsample_S32LSB_1c_x2 }, - { AUDIO_S32LSB, 1, 1, 2, SDL_Upsample_S32LSB_1c_x2 }, - { AUDIO_S32LSB, 1, 0, 4, SDL_Downsample_S32LSB_1c_x4 }, - { AUDIO_S32LSB, 1, 1, 4, SDL_Upsample_S32LSB_1c_x4 }, - { AUDIO_S32LSB, 2, 0, 2, SDL_Downsample_S32LSB_2c_x2 }, - { AUDIO_S32LSB, 2, 1, 2, SDL_Upsample_S32LSB_2c_x2 }, - { AUDIO_S32LSB, 2, 0, 4, SDL_Downsample_S32LSB_2c_x4 }, - { AUDIO_S32LSB, 2, 1, 4, SDL_Upsample_S32LSB_2c_x4 }, - { AUDIO_S32LSB, 4, 0, 2, SDL_Downsample_S32LSB_4c_x2 }, - { AUDIO_S32LSB, 4, 1, 2, SDL_Upsample_S32LSB_4c_x2 }, - { AUDIO_S32LSB, 4, 0, 4, SDL_Downsample_S32LSB_4c_x4 }, - { AUDIO_S32LSB, 4, 1, 4, SDL_Upsample_S32LSB_4c_x4 }, - { AUDIO_S32LSB, 6, 0, 2, SDL_Downsample_S32LSB_6c_x2 }, - { AUDIO_S32LSB, 6, 1, 2, SDL_Upsample_S32LSB_6c_x2 }, - { AUDIO_S32LSB, 6, 0, 4, SDL_Downsample_S32LSB_6c_x4 }, - { AUDIO_S32LSB, 6, 1, 4, SDL_Upsample_S32LSB_6c_x4 }, - { AUDIO_S32LSB, 8, 0, 2, SDL_Downsample_S32LSB_8c_x2 }, - { AUDIO_S32LSB, 8, 1, 2, SDL_Upsample_S32LSB_8c_x2 }, - { AUDIO_S32LSB, 8, 0, 4, SDL_Downsample_S32LSB_8c_x4 }, - { AUDIO_S32LSB, 8, 1, 4, SDL_Upsample_S32LSB_8c_x4 }, - { AUDIO_S32MSB, 1, 0, 2, SDL_Downsample_S32MSB_1c_x2 }, - { AUDIO_S32MSB, 1, 1, 2, SDL_Upsample_S32MSB_1c_x2 }, - { AUDIO_S32MSB, 1, 0, 4, SDL_Downsample_S32MSB_1c_x4 }, - { AUDIO_S32MSB, 1, 1, 4, SDL_Upsample_S32MSB_1c_x4 }, - { AUDIO_S32MSB, 2, 0, 2, SDL_Downsample_S32MSB_2c_x2 }, - { AUDIO_S32MSB, 2, 1, 2, SDL_Upsample_S32MSB_2c_x2 }, - { AUDIO_S32MSB, 2, 0, 4, SDL_Downsample_S32MSB_2c_x4 }, - { AUDIO_S32MSB, 2, 1, 4, SDL_Upsample_S32MSB_2c_x4 }, - { AUDIO_S32MSB, 4, 0, 2, SDL_Downsample_S32MSB_4c_x2 }, - { AUDIO_S32MSB, 4, 1, 2, SDL_Upsample_S32MSB_4c_x2 }, - { AUDIO_S32MSB, 4, 0, 4, SDL_Downsample_S32MSB_4c_x4 }, - { AUDIO_S32MSB, 4, 1, 4, SDL_Upsample_S32MSB_4c_x4 }, - { AUDIO_S32MSB, 6, 0, 2, SDL_Downsample_S32MSB_6c_x2 }, - { AUDIO_S32MSB, 6, 1, 2, SDL_Upsample_S32MSB_6c_x2 }, - { AUDIO_S32MSB, 6, 0, 4, SDL_Downsample_S32MSB_6c_x4 }, - { AUDIO_S32MSB, 6, 1, 4, SDL_Upsample_S32MSB_6c_x4 }, - { AUDIO_S32MSB, 8, 0, 2, SDL_Downsample_S32MSB_8c_x2 }, - { AUDIO_S32MSB, 8, 1, 2, SDL_Upsample_S32MSB_8c_x2 }, - { AUDIO_S32MSB, 8, 0, 4, SDL_Downsample_S32MSB_8c_x4 }, - { AUDIO_S32MSB, 8, 1, 4, SDL_Upsample_S32MSB_8c_x4 }, - { AUDIO_F32LSB, 1, 0, 2, SDL_Downsample_F32LSB_1c_x2 }, - { AUDIO_F32LSB, 1, 1, 2, SDL_Upsample_F32LSB_1c_x2 }, - { AUDIO_F32LSB, 1, 0, 4, SDL_Downsample_F32LSB_1c_x4 }, - { AUDIO_F32LSB, 1, 1, 4, SDL_Upsample_F32LSB_1c_x4 }, - { AUDIO_F32LSB, 2, 0, 2, SDL_Downsample_F32LSB_2c_x2 }, - { AUDIO_F32LSB, 2, 1, 2, SDL_Upsample_F32LSB_2c_x2 }, - { AUDIO_F32LSB, 2, 0, 4, SDL_Downsample_F32LSB_2c_x4 }, - { AUDIO_F32LSB, 2, 1, 4, SDL_Upsample_F32LSB_2c_x4 }, - { AUDIO_F32LSB, 4, 0, 2, SDL_Downsample_F32LSB_4c_x2 }, - { AUDIO_F32LSB, 4, 1, 2, SDL_Upsample_F32LSB_4c_x2 }, - { AUDIO_F32LSB, 4, 0, 4, SDL_Downsample_F32LSB_4c_x4 }, - { AUDIO_F32LSB, 4, 1, 4, SDL_Upsample_F32LSB_4c_x4 }, - { AUDIO_F32LSB, 6, 0, 2, SDL_Downsample_F32LSB_6c_x2 }, - { AUDIO_F32LSB, 6, 1, 2, SDL_Upsample_F32LSB_6c_x2 }, - { AUDIO_F32LSB, 6, 0, 4, SDL_Downsample_F32LSB_6c_x4 }, - { AUDIO_F32LSB, 6, 1, 4, SDL_Upsample_F32LSB_6c_x4 }, - { AUDIO_F32LSB, 8, 0, 2, SDL_Downsample_F32LSB_8c_x2 }, - { AUDIO_F32LSB, 8, 1, 2, SDL_Upsample_F32LSB_8c_x2 }, - { AUDIO_F32LSB, 8, 0, 4, SDL_Downsample_F32LSB_8c_x4 }, - { AUDIO_F32LSB, 8, 1, 4, SDL_Upsample_F32LSB_8c_x4 }, - { AUDIO_F32MSB, 1, 0, 2, SDL_Downsample_F32MSB_1c_x2 }, - { AUDIO_F32MSB, 1, 1, 2, SDL_Upsample_F32MSB_1c_x2 }, - { AUDIO_F32MSB, 1, 0, 4, SDL_Downsample_F32MSB_1c_x4 }, - { AUDIO_F32MSB, 1, 1, 4, SDL_Upsample_F32MSB_1c_x4 }, - { AUDIO_F32MSB, 2, 0, 2, SDL_Downsample_F32MSB_2c_x2 }, - { AUDIO_F32MSB, 2, 1, 2, SDL_Upsample_F32MSB_2c_x2 }, - { AUDIO_F32MSB, 2, 0, 4, SDL_Downsample_F32MSB_2c_x4 }, - { AUDIO_F32MSB, 2, 1, 4, SDL_Upsample_F32MSB_2c_x4 }, - { AUDIO_F32MSB, 4, 0, 2, SDL_Downsample_F32MSB_4c_x2 }, - { AUDIO_F32MSB, 4, 1, 2, SDL_Upsample_F32MSB_4c_x2 }, - { AUDIO_F32MSB, 4, 0, 4, SDL_Downsample_F32MSB_4c_x4 }, - { AUDIO_F32MSB, 4, 1, 4, SDL_Upsample_F32MSB_4c_x4 }, - { AUDIO_F32MSB, 6, 0, 2, SDL_Downsample_F32MSB_6c_x2 }, - { AUDIO_F32MSB, 6, 1, 2, SDL_Upsample_F32MSB_6c_x2 }, - { AUDIO_F32MSB, 6, 0, 4, SDL_Downsample_F32MSB_6c_x4 }, - { AUDIO_F32MSB, 6, 1, 4, SDL_Upsample_F32MSB_6c_x4 }, - { AUDIO_F32MSB, 8, 0, 2, SDL_Downsample_F32MSB_8c_x2 }, - { AUDIO_F32MSB, 8, 1, 2, SDL_Upsample_F32MSB_8c_x2 }, - { AUDIO_F32MSB, 8, 0, 4, SDL_Downsample_F32MSB_8c_x4 }, - { AUDIO_F32MSB, 8, 1, 4, SDL_Upsample_F32MSB_8c_x4 }, -#endif /* !LESS_RESAMPLERS */ -#endif /* !NO_RESAMPLERS */ - { 0, 0, 0, 0, NULL } -}; - -/* 390 converters generated. */ - -/* *INDENT-ON* */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer.c b/src/helper/android/SDL1.3/src/audio/SDL_mixer.c deleted file mode 100644 index a051f5b4b..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* This provides the default mixing callback for the SDL audio routines */ - -#include "SDL_cpuinfo.h" -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "SDL_sysaudio.h" -#include "SDL_mixer_MMX.h" -#include "SDL_mixer_MMX_VC.h" -#include "SDL_mixer_m68k.h" - -/* This table is used to add two sound values together and pin - * the value to avoid overflow. (used with permission from ARDI) - * Changed to use 0xFE instead of 0xFF for better sound quality. - */ -static const Uint8 mix8[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, - 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, - 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, - 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, - 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, - 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, - 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, - 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, - 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, - 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, - 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, - 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, - 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, - 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, - 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, - 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, - 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, - 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, - 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, - 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, - 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, - 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, - 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE -}; - -/* The volume ranges from 0 - 128 */ -#define ADJUST_VOLUME(s, v) (s = (s*v)/SDL_MIX_MAXVOLUME) -#define ADJUST_VOLUME_U8(s, v) (s = (((s-128)*v)/SDL_MIX_MAXVOLUME)+128) - - -void -SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, - Uint32 len, int volume) -{ - if (volume == 0) { - return; - } - - switch (format) { - - case AUDIO_U8: - { -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) - SDL_MixAudio_m68k_U8((char *) dst, (char *) src, - (unsigned long) len, (long) volume, - (char *) mix8); -#else - Uint8 src_sample; - - while (len--) { - src_sample = *src; - ADJUST_VOLUME_U8(src_sample, volume); - *dst = mix8[*dst + src_sample]; - ++dst; - ++src; - } -#endif - } - break; - - case AUDIO_S8: - { -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) - if (SDL_HasMMX()) { - SDL_MixAudio_MMX_S8((char *) dst, (char *) src, - (unsigned int) len, (int) volume); - } else -#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) - if (SDL_HasMMX()) { - SDL_MixAudio_MMX_S8_VC((char *) dst, (char *) src, - (unsigned int) len, (int) volume); - } else -#endif -#endif -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) - SDL_MixAudio_m68k_S8((char *) dst, (char *) src, - (unsigned long) len, (long) volume); -#else - { - Sint8 *dst8, *src8; - Sint8 src_sample; - int dst_sample; - const int max_audioval = ((1 << (8 - 1)) - 1); - const int min_audioval = -(1 << (8 - 1)); - - src8 = (Sint8 *) src; - dst8 = (Sint8 *) dst; - while (len--) { - src_sample = *src8; - ADJUST_VOLUME(src_sample, volume); - dst_sample = *dst8 + src_sample; - if (dst_sample > max_audioval) { - *dst8 = max_audioval; - } else if (dst_sample < min_audioval) { - *dst8 = min_audioval; - } else { - *dst8 = dst_sample; - } - ++dst8; - ++src8; - } - } -#endif - } - break; - - case AUDIO_S16LSB: - { -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) - if (SDL_HasMMX()) { - SDL_MixAudio_MMX_S16((char *) dst, (char *) src, - (unsigned int) len, (int) volume); - } else -#elif ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) - if (SDL_HasMMX()) { - SDL_MixAudio_MMX_S16_VC((char *) dst, (char *) src, - (unsigned int) len, (int) volume); - } else -#endif -#endif -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) - SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src, - (unsigned long) len, (long) volume); -#else - { - Sint16 src1, src2; - int dst_sample; - const int max_audioval = ((1 << (16 - 1)) - 1); - const int min_audioval = -(1 << (16 - 1)); - - len /= 2; - while (len--) { - src1 = ((src[1]) << 8 | src[0]); - ADJUST_VOLUME(src1, volume); - src2 = ((dst[1]) << 8 | dst[0]); - src += 2; - dst_sample = src1 + src2; - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - dst[0] = dst_sample & 0xFF; - dst_sample >>= 8; - dst[1] = dst_sample & 0xFF; - dst += 2; - } - } -#endif - } - break; - - case AUDIO_S16MSB: - { -#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES) - SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src, - (unsigned long) len, (long) volume); -#else - Sint16 src1, src2; - int dst_sample; - const int max_audioval = ((1 << (16 - 1)) - 1); - const int min_audioval = -(1 << (16 - 1)); - - len /= 2; - while (len--) { - src1 = ((src[0]) << 8 | src[1]); - ADJUST_VOLUME(src1, volume); - src2 = ((dst[0]) << 8 | dst[1]); - src += 2; - dst_sample = src1 + src2; - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - dst[1] = dst_sample & 0xFF; - dst_sample >>= 8; - dst[0] = dst_sample & 0xFF; - dst += 2; - } -#endif - } - break; - - case AUDIO_S32LSB: - { - const Uint32 *src32 = (Uint32 *) src; - Uint32 *dst32 = (Uint32 *) dst; - Sint64 src1, src2; - Sint64 dst_sample; - const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1); - const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1)); - - len /= 4; - while (len--) { - src1 = (Sint64) ((Sint32) SDL_SwapLE32(*src32)); - src32++; - ADJUST_VOLUME(src1, volume); - src2 = (Sint64) ((Sint32) SDL_SwapLE32(*dst32)); - dst_sample = src1 + src2; - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - *(dst32++) = SDL_SwapLE32((Uint32) ((Sint32) dst_sample)); - } - } - break; - - case AUDIO_S32MSB: - { - const Uint32 *src32 = (Uint32 *) src; - Uint32 *dst32 = (Uint32 *) dst; - Sint64 src1, src2; - Sint64 dst_sample; - const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1); - const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1)); - - len /= 4; - while (len--) { - src1 = (Sint64) ((Sint32) SDL_SwapBE32(*src32)); - src32++; - ADJUST_VOLUME(src1, volume); - src2 = (Sint64) ((Sint32) SDL_SwapBE32(*dst32)); - dst_sample = src1 + src2; - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - *(dst32++) = SDL_SwapBE32((Uint32) ((Sint32) dst_sample)); - } - } - break; - - case AUDIO_F32LSB: - { - const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME); - const float fvolume = (float) volume; - const float *src32 = (float *) src; - float *dst32 = (float *) dst; - float src1, src2; - double dst_sample; - /* !!! FIXME: are these right? */ - const double max_audioval = 3.402823466e+38F; - const double min_audioval = -3.402823466e+38F; - - len /= 4; - while (len--) { - src1 = ((SDL_SwapFloatLE(*src32) * fvolume) * fmaxvolume); - src2 = SDL_SwapFloatLE(*dst32); - src32++; - - dst_sample = ((double) src1) + ((double) src2); - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - *(dst32++) = SDL_SwapFloatLE((float) dst_sample); - } - } - break; - - case AUDIO_F32MSB: - { - const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME); - const float fvolume = (float) volume; - const float *src32 = (float *) src; - float *dst32 = (float *) dst; - float src1, src2; - double dst_sample; - /* !!! FIXME: are these right? */ - const double max_audioval = 3.402823466e+38F; - const double min_audioval = -3.402823466e+38F; - - len /= 4; - while (len--) { - src1 = ((SDL_SwapFloatBE(*src32) * fvolume) * fmaxvolume); - src2 = SDL_SwapFloatBE(*dst32); - src32++; - - dst_sample = ((double) src1) + ((double) src2); - if (dst_sample > max_audioval) { - dst_sample = max_audioval; - } else if (dst_sample < min_audioval) { - dst_sample = min_audioval; - } - *(dst32++) = SDL_SwapFloatBE((float) dst_sample); - } - } - break; - - default: /* If this happens... FIXME! */ - SDL_SetError("SDL_MixAudio(): unknown audio format"); - return; - } -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.c b/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.c deleted file mode 100644 index a7e3789a5..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples - Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) - This code is licensed under the LGPL (see COPYING for details) - - Assumes buffer size in bytes is a multiple of 16 - Assumes SDL_MIX_MAXVOLUME = 128 -*/ - - -/*********************************************** -* Mixing for 16 bit signed buffers -***********************************************/ - -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) -void -SDL_MixAudio_MMX_S16(char *dst, char *src, unsigned int size, int volume) -{ - __asm__ __volatile__(" movl %3,%%eax\n" /* eax = volume */ - " movl %2,%%edx\n" /* edx = size */ - " shrl $4,%%edx\n" /* process 16 bytes per iteration = 8 samples */ - " jz .endS16\n" " pxor %%mm0,%%mm0\n" " movd %%eax,%%mm0\n" " movq %%mm0,%%mm1\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" /* mm0 = vol|vol|vol|vol */ - ".align 8\n" " .mixloopS16:\n" " movq (%1),%%mm1\n" /* mm1 = a|b|c|d */ - " movq %%mm1,%%mm2\n" /* mm2 = a|b|c|d */ - " movq 8(%1),%%mm4\n" /* mm4 = e|f|g|h */ - /* pré charger le buffer dst dans mm7 */ - " movq (%0),%%mm7\n" /* mm7 = dst[0] */ - /* multiplier par le volume */ - " pmullw %%mm0,%%mm1\n" /* mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */ - " pmulhw %%mm0,%%mm2\n" /* mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v) */ - " movq %%mm4,%%mm5\n" /* mm5 = e|f|g|h */ - " pmullw %%mm0,%%mm4\n" /* mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */ - " pmulhw %%mm0,%%mm5\n" /* mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v) */ - " movq %%mm1,%%mm3\n" /* mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v) */ - " punpckhwd %%mm2,%%mm1\n" /* mm1 = a*v|b*v */ - " movq %%mm4,%%mm6\n" /* mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v) */ - " punpcklwd %%mm2,%%mm3\n" /* mm3 = c*v|d*v */ - " punpckhwd %%mm5,%%mm4\n" /* mm4 = e*f|f*v */ - " punpcklwd %%mm5,%%mm6\n" /* mm6 = g*v|h*v */ - /* pré charger le buffer dst dans mm5 */ - " movq 8(%0),%%mm5\n" /* mm5 = dst[1] */ - /* diviser par 128 */ - " psrad $7,%%mm1\n" /* mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME */ - " add $16,%1\n" " psrad $7,%%mm3\n" /* mm3 = c*v/128|d*v/128 */ - " psrad $7,%%mm4\n" /* mm4 = e*v/128|f*v/128 */ - /* mm1 = le sample avec le volume modifié */ - " packssdw %%mm1,%%mm3\n" /* mm3 = s(a*v|b*v|c*v|d*v) */ - " psrad $7,%%mm6\n" /* mm6= g*v/128|h*v/128 */ - " paddsw %%mm7,%%mm3\n" /* mm3 = adjust_volume(src)+dst */ - /* mm4 = le sample avec le volume modifié */ - " packssdw %%mm4,%%mm6\n" /* mm6 = s(e*v|f*v|g*v|h*v) */ - " movq %%mm3,(%0)\n" " paddsw %%mm5,%%mm6\n" /* mm6 = adjust_volume(src)+dst */ - " movq %%mm6,8(%0)\n" - " add $16,%0\n" - " dec %%edx\n" - " jnz .mixloopS16\n" - " emms\n" - ".endS16:\n"::"r"(dst), "r"(src), - "m"(size), "m"(volume):"eax", "edx", "memory"); -} - - - -/*////////////////////////////////////////////// */ -/* Mixing for 8 bit signed buffers */ -/*////////////////////////////////////////////// */ - -void -SDL_MixAudio_MMX_S8(char *dst, char *src, unsigned int size, int volume) -{ - __asm__ __volatile__(" movl %3,%%eax\n" /* eax = volume */ - " movd %%eax,%%mm0\n" " movq %%mm0,%%mm1\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" " psllq $16,%%mm0\n" " por %%mm1,%%mm0\n" " movl %2,%%edx\n" /* edx = size */ - " shr $3,%%edx\n" /* process 8 bytes per iteration = 8 samples */ - " cmp $0,%%edx\n" " je .endS8\n" ".align 8\n" " .mixloopS8:\n" " pxor %%mm2,%%mm2\n" /* mm2 = 0 */ - " movq (%1),%%mm1\n" /* mm1 = a|b|c|d|e|f|g|h */ - " movq %%mm1,%%mm3\n" /* mm3 = a|b|c|d|e|f|g|h */ - /* on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0 */ - " pcmpgtb %%mm1,%%mm2\n" /* mm2 = 11111111|00000000|00000000.... */ - " punpckhbw %%mm2,%%mm1\n" /* mm1 = 0|a|0|b|0|c|0|d */ - " punpcklbw %%mm2,%%mm3\n" /* mm3 = 0|e|0|f|0|g|0|h */ - " movq (%0),%%mm2\n" /* mm2 = destination */ - " pmullw %%mm0,%%mm1\n" /* mm1 = v*a|v*b|v*c|v*d */ - " add $8,%1\n" " pmullw %%mm0,%%mm3\n" /* mm3 = v*e|v*f|v*g|v*h */ - " psraw $7,%%mm1\n" /* mm1 = v*a/128|v*b/128|v*c/128|v*d/128 */ - " psraw $7,%%mm3\n" /* mm3 = v*e/128|v*f/128|v*g/128|v*h/128 */ - " packsswb %%mm1,%%mm3\n" /* mm1 = v*a/128|v*b/128|v*c/128|v*d/128|v*e/128|v*f/128|v*g/128|v*h/128 */ - " paddsb %%mm2,%%mm3\n" /* add to destination buffer */ - " movq %%mm3,(%0)\n" /* store back to ram */ - " add $8,%0\n" - " dec %%edx\n" - " jnz .mixloopS8\n" - ".endS8:\n" - " emms\n"::"r"(dst), "r"(src), "m"(size), - "m"(volume):"eax", "edx", "memory"); -} -#endif - -#endif /* SDL_BUGGY_MMX_MIXERS */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.h b/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.h deleted file mode 100644 index c45b5731a..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - headers for MMX assembler version of SDL_MixAudio - Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) - This code is licensed under the LGPL (see COPYING for details) - - Assumes buffer size in bytes is a multiple of 16 - Assumes SDL_MIX_MAXVOLUME = 128 -*/ -#include "SDL_config.h" - -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES) -void SDL_MixAudio_MMX_S16(char *, char *, unsigned int, int); -void SDL_MixAudio_MMX_S8(char *, char *, unsigned int, int); -#endif -#endif /* SDL_BUGGY_MMX_MIXERS */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.c b/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.c deleted file mode 100644 index 75dac46d8..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.c +++ /dev/null @@ -1,190 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include "SDL_mixer_MMX_VC.h" - -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) -// MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples -// Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) -// Converted to Intel ASM notation by Cth -// This code is licensed under the LGPL (see COPYING for details) -// -// Assumes buffer size in bytes is a multiple of 16 -// Assumes SDL_MIX_MAXVOLUME = 128 - - -//////////////////////////////////////////////// -// Mixing for 16 bit signed buffers -//////////////////////////////////////////////// - -void -SDL_MixAudio_MMX_S16_VC(char *dst, char *src, unsigned int nSize, int volume) -{ - /* *INDENT-OFF* */ - __asm - { - - push edi - push esi - push ebx - - mov edi, dst // edi = dst - mov esi, src // esi = src - mov eax, volume // eax = volume - mov ebx, nSize // ebx = size - shr ebx, 4 // process 16 bytes per iteration = 8 samples - jz endS16 - - pxor mm0, mm0 - movd mm0, eax //%%eax,%%mm0 - movq mm1, mm0 //%%mm0,%%mm1 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 // mm0 = vol|vol|vol|vol - - #ifndef __WATCOMC__ - align 16 - #endif -mixloopS16: - movq mm1, [esi] //(%%esi),%%mm1\n" // mm1 = a|b|c|d - movq mm2, mm1 //%%mm1,%%mm2\n" // mm2 = a|b|c|d - movq mm4, [esi + 8] //8(%%esi),%%mm4\n" // mm4 = e|f|g|h - // pre charger le buffer dst dans mm7 - movq mm7, [edi] //(%%edi),%%mm7\n" // mm7 = dst[0]" - // multiplier par le volume - pmullw mm1, mm0 //%%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) - pmulhw mm2, mm0 //%%mm0,%%mm2\n" // mm2 = h(a*v)|h(b*v)|h(c*v)|h(d*v) - movq mm5, mm4 //%%mm4,%%mm5\n" // mm5 = e|f|g|h - pmullw mm4, mm0 //%%mm0,%%mm4\n" // mm4 = l(e*v)|l(f*v)|l(g*v)|l(h*v) - pmulhw mm5, mm0 //%%mm0,%%mm5\n" // mm5 = h(e*v)|h(f*v)|h(g*v)|h(h*v) - movq mm3, mm1 //%%mm1,%%mm3\n" // mm3 = l(a*v)|l(b*v)|l(c*v)|l(d*v) - punpckhwd mm1, mm2 //%%mm2,%%mm1\n" // mm1 = a*v|b*v - movq mm6, mm4 //%%mm4,%%mm6\n" // mm6 = l(e*v)|l(f*v)|l(g*v)|l(h*v) - punpcklwd mm3, mm2 //%%mm2,%%mm3\n" // mm3 = c*v|d*v - punpckhwd mm4, mm5 //%%mm5,%%mm4\n" // mm4 = e*f|f*v - punpcklwd mm6, mm5 //%%mm5,%%mm6\n" // mm6 = g*v|h*v - // pre charger le buffer dst dans mm5 - movq mm5, [edi + 8] //8(%%edi),%%mm5\n" // mm5 = dst[1] - // diviser par 128 - psrad mm1, 7 //$7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME - add esi, 16 //$16,%%esi\n" - psrad mm3, 7 //$7,%%mm3\n" // mm3 = c*v/128|d*v/128 - psrad mm4, 7 //$7,%%mm4\n" // mm4 = e*v/128|f*v/128 - // mm1 = le sample avec le volume modifie - packssdw mm3, mm1 //%%mm1,%%mm3\n" // mm3 = s(a*v|b*v|c*v|d*v) - psrad mm6, 7 //$7,%%mm6\n" // mm6= g*v/128|h*v/128 - paddsw mm3, mm7 //%%mm7,%%mm3\n" // mm3 = adjust_volume(src)+dst - // mm4 = le sample avec le volume modifie - packssdw mm6, mm4 //%%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v) - movq [edi], mm3 //%%mm3,(%%edi)\n" - paddsw mm6, mm5 //%%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst - movq [edi + 8], mm6 //%%mm6,8(%%edi)\n" - add edi, 16 //$16,%%edi\n" - dec ebx //%%ebx\n" - jnz mixloopS16 - -endS16: - emms - - pop ebx - pop esi - pop edi - } - /* *INDENT-ON* */ -} - -//////////////////////////////////////////////// -// Mixing for 8 bit signed buffers -//////////////////////////////////////////////// - -void -SDL_MixAudio_MMX_S8_VC(char *dst, char *src, unsigned int nSize, int volume) -{ - /* *INDENT-OFF* */ - _asm - { - - push edi - push esi - push ebx - - mov edi, dst //movl %0,%%edi // edi = dst - mov esi, src //%1,%%esi // esi = src - mov eax, volume //%3,%%eax // eax = volume - - movd mm0, eax //%%eax,%%mm0 - movq mm1, mm0 //%%mm0,%%mm1 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 - psllq mm0, 16 //$16,%%mm0 - por mm0, mm1 //%%mm1,%%mm0 - - mov ebx, nSize //%2,%%ebx // ebx = size - shr ebx, 3 //$3,%%ebx // process 8 bytes per iteration = 8 samples - cmp ebx, 0 //$0,%%ebx - je endS8 - - #ifndef __WATCOMC__ - align 16 - #endif -mixloopS8: - pxor mm2, mm2 //%%mm2,%%mm2 // mm2 = 0 - movq mm1, [esi] //(%%esi),%%mm1 // mm1 = a|b|c|d|e|f|g|h - movq mm3, mm1 //%%mm1,%%mm3 // mm3 = a|b|c|d|e|f|g|h - // on va faire le "sign extension" en faisant un cmp avec 0 qui retourne 1 si <0, 0 si >0 - pcmpgtb mm2, mm1 //%%mm1,%%mm2 // mm2 = 11111111|00000000|00000000.... - punpckhbw mm1, mm2 //%%mm2,%%mm1 // mm1 = 0|a|0|b|0|c|0|d - punpcklbw mm3, mm2 //%%mm2,%%mm3 // mm3 = 0|e|0|f|0|g|0|h - movq mm2, [edi] //(%%edi),%%mm2 // mm2 = destination - pmullw mm1, mm0 //%%mm0,%%mm1 // mm1 = v*a|v*b|v*c|v*d - add esi, 8 //$8,%%esi - pmullw mm3, mm0 //%%mm0,%%mm3 // mm3 = v*e|v*f|v*g|v*h - psraw mm1, 7 //$7,%%mm1 // mm1 = v*a/128|v*b/128|v*c/128|v*d/128 - psraw mm3, 7 //$7,%%mm3 // mm3 = v*e/128|v*f/128|v*g/128|v*h/128 - packsswb mm3, mm1 //%%mm1,%%mm3 // mm1 = v*a/128|v*b/128|v*c/128|v*d/128|v*e/128|v*f/128|v*g/128|v*h/128 - paddsb mm3, mm2 //%%mm2,%%mm3 // add to destination buffer - movq [edi], mm3 //%%mm3,(%%edi) // store back to ram - add edi, 8 //$8,%%edi - dec ebx //%%ebx - jnz mixloopS8 - -endS8: - emms - - pop ebx - pop esi - pop edi - } - /* *INDENT-ON* */ -} - -#endif /* SDL_ASSEMBLY_ROUTINES */ -#endif /* SDL_BUGGY_MMX_MIXERS */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.h b/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.h deleted file mode 100644 index adace2b31..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_MMX_VC.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ -#if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) -/* headers for MMX assembler version of SDL_MixAudio - Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) - Converted to Intel ASM notation by Cth - This code is licensed under the LGPL (see COPYING for details) - - Assumes buffer size in bytes is a multiple of 16 - Assumes SDL_MIX_MAXVOLUME = 128 -*/ -void SDL_MixAudio_MMX_S16_VC(char *, char *, unsigned int, int); -void SDL_MixAudio_MMX_S8_VC(char *, char *, unsigned int, int); -#endif -#endif /* SDL_BUGGY_MMX_MIXERS */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.c b/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.c deleted file mode 100644 index dff1f7eea..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.c +++ /dev/null @@ -1,140 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - m68k assembly mix routines - - Patrice Mandin -*/ - -#if defined(__M68000__) && !defined(__mcoldfire__) && defined(__GNUC__) -void -SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, char *mix8) -{ - __asm__ __volatile__("tstl %2\n" " beqs stoploop_u8\n" "mixloop_u8:\n" - /* Mix a sample */ - " moveq #0,%%d0\n" " moveq #0,%%d1\n" " moveb %1@+,%%d0\n" /* d0 = *src++ */ - " sub #128,%%d0\n" /* d0 -= 128 */ - " muls %3,%%d0\n" /* d0 *= volume (0<=volume<=128) */ - " moveb %0@,%%d1\n" /* d1 = *dst */ - " asr #7,%%d0\n" /* d0 /= 128 (SDL_MIX_MAXVOLUME) */ - " add #128,%%d0\n" /* d0 += 128 */ - " add %%d1,%%d0\n" - " moveb %4@(%%d0:w),%0@+\n" - /* Loop till done */ - " subql #1,%2\n" " bhis mixloop_u8\n" "stoploop_u8:\n": /* no return value */ - : /* input */ - "a"(dst), "a"(src), "d"(len), "d"(volume), "a"(mix8): /* clobbered registers */ - "d0", "d1", "cc", "memory"); -} - -void -SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume) -{ - __asm__ __volatile__("tstl %2\n" - " beqs stoploop_s8\n" - " moveq #-128,%%d2\n" - " moveq #127,%%d3\n" "mixloop_s8:\n" - /* Mix a sample */ - " moveq #0,%%d0\n" " moveq #0,%%d1\n" " moveb %1@+,%%d0\n" /* d0 = *src++ */ - " muls %3,%%d0\n" /* d0 *= volume (0<=volume<=128) */ - " moveb %0@,%%d1\n" /* d1 = *dst */ - " asr #7,%%d0\n" /* d0 /= 128 (SDL_MIX_MAXVOLUME) */ - " add %%d1,%%d0\n" - " cmp %%d2,%%d0\n" - " bges lower_limit_s8\n" - " move %%d2,%%d0\n" - "lower_limit_s8:\n" - " cmp %%d3,%%d0\n" - " bles upper_limit_s8\n" - " move %%d3,%%d0\n" - "upper_limit_s8:\n" " moveb %%d0,%0@+\n" - /* Loop till done */ - " subql #1,%2\n" " bhis mixloop_s8\n" "stoploop_s8:\n": /* no return value */ - : /* input */ - "a"(dst), "a"(src), "d"(len), "d"(volume): /* clobbered registers */ - "d0", "d1", "d2", "d3", "cc", "memory"); -} - -void -SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume) -{ - __asm__ __volatile__("tstl %2\n" - " beqs stoploop_s16msb\n" - " movel #-32768,%%d2\n" - " movel #32767,%%d3\n" - " lsrl #1,%2\n" "mixloop_s16msb:\n" - /* Mix a sample */ - " move %1@+,%%d0\n" /* d0 = *src++ */ - " muls %3,%%d0\n" /* d0 *= volume (0<=volume<=128) */ - " move %0@,%%d1\n" /* d1 = *dst */ - " extl %%d1\n" /* extend d1 to 32 bits */ - " asrl #7,%%d0\n" /* d0 /= 128 (SDL_MIX_MAXVOLUME) */ - " addl %%d1,%%d0\n" - " cmpl %%d2,%%d0\n" - " bges lower_limit_s16msb\n" - " move %%d2,%%d0\n" - "lower_limit_s16msb:\n" - " cmpl %%d3,%%d0\n" - " bles upper_limit_s16msb\n" - " move %%d3,%%d0\n" - "upper_limit_s16msb:\n" " move %%d0,%0@+\n" - /* Loop till done */ - " subql #1,%2\n" " bhis mixloop_s16msb\n" "stoploop_s16msb:\n": /* no return value */ - : /* input */ - "a"(dst), "a"(src), "d"(len), "d"(volume): /* clobbered registers */ - "d0", "d1", "d2", "d3", "cc", "memory"); -} - -void -SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume) -{ - __asm__ __volatile__("tstl %2\n" - " beqs stoploop_s16lsb\n" - " movel #-32768,%%d2\n" - " movel #32767,%%d3\n" - " lsrl #1,%2\n" "mixloop_s16lsb:\n" - /* Mix a sample */ - " move %1@+,%%d0\n" /* d0 = *src++ */ - " rorw #8,%%d0\n" " muls %3,%%d0\n" /* d0 *= volume (0<=volume<=128) */ - " move %0@,%%d1\n" /* d1 = *dst */ - " rorw #8,%%d1\n" " extl %%d1\n" /* extend d1 to 32 bits */ - " asrl #7,%%d0\n" /* d0 /= 128 (SDL_MIX_MAXVOLUME) */ - " addl %%d1,%%d0\n" - " cmpl %%d2,%%d0\n" - " bges lower_limit_s16lsb\n" - " move %%d2,%%d0\n" - "lower_limit_s16lsb:\n" - " cmpl %%d3,%%d0\n" - " bles upper_limit_s16lsb\n" - " move %%d3,%%d0\n" - "upper_limit_s16lsb:\n" - " rorw #8,%%d0\n" " move %%d0,%0@+\n" - /* Loop till done */ - " subql #1,%2\n" " bhis mixloop_s16lsb\n" "stoploop_s16lsb:\n": /* no return value */ - : /* input */ - "a"(dst), "a"(src), "d"(len), "d"(volume): /* clobbered registers */ - "d0", "d1", "d2", "d3", "cc", "memory"); -} -#endif -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.h b/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.h deleted file mode 100644 index ee6365fea..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_mixer_m68k.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - m68k assembly mix routines - - Patrice Mandin -*/ - -#if defined(__M68000__) && defined(__GNUC__) -void SDL_MixAudio_m68k_U8(char *dst, char *src, long len, long volume, - char *mix8); -void SDL_MixAudio_m68k_S8(char *dst, char *src, long len, long volume); - -void SDL_MixAudio_m68k_S16MSB(short *dst, short *src, long len, long volume); -void SDL_MixAudio_m68k_S16LSB(short *dst, short *src, long len, long volume); -#endif -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_sysaudio.h b/src/helper/android/SDL1.3/src/audio/SDL_sysaudio.h deleted file mode 100644 index 55bd3cc57..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_sysaudio.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - This library is SDL_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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_sysaudio_h -#define _SDL_sysaudio_h - -#include "SDL_mutex.h" -#include "SDL_thread.h" - -/* The SDL audio driver */ -typedef struct SDL_AudioDevice SDL_AudioDevice; -#define _THIS SDL_AudioDevice *_this - -typedef struct SDL_AudioDriverImpl -{ - int (*DetectDevices) (int iscapture); - const char *(*GetDeviceName) (int index, int iscapture); - int (*OpenDevice) (_THIS, const char *devname, int iscapture); - void (*ThreadInit) (_THIS); /* Called by audio thread at start */ - void (*WaitDevice) (_THIS); - void (*PlayDevice) (_THIS); - Uint8 *(*GetDeviceBuf) (_THIS); - void (*WaitDone) (_THIS); - void (*CloseDevice) (_THIS); - void (*LockDevice) (_THIS); - void (*UnlockDevice) (_THIS); - void (*Deinitialize) (void); - - /* Some flags to push duplicate code into the core and reduce #ifdefs. */ - int ProvidesOwnCallbackThread:1; - int SkipMixerLock:1; - int HasCaptureSupport:1; - int OnlyHasDefaultOutputDevice:1; - int OnlyHasDefaultInputDevice:1; -} SDL_AudioDriverImpl; - - -typedef struct SDL_AudioDriver -{ - /* * * */ - /* The name of this audio driver */ - const char *name; - - /* * * */ - /* The description of this audio driver */ - const char *desc; - - SDL_AudioDriverImpl impl; -} SDL_AudioDriver; - - -/* Streamer */ -typedef struct -{ - Uint8 *buffer; - int max_len; /* the maximum length in bytes */ - int read_pos, write_pos; /* the position of the write and read heads in bytes */ -} SDL_AudioStreamer; - - -/* Define the SDL audio driver structure */ -struct SDL_AudioDevice -{ - /* * * */ - /* Data common to all devices */ - - /* The current audio specification (shared with audio thread) */ - SDL_AudioSpec spec; - - /* An audio conversion block for audio format emulation */ - SDL_AudioCVT convert; - - /* The streamer, if sample rate conversion necessitates it */ - int use_streamer; - SDL_AudioStreamer streamer; - - /* Current state flags */ - int iscapture; - int enabled; - int paused; - int opened; - - /* Fake audio buffer for when the audio hardware is busy */ - Uint8 *fake_stream; - - /* A semaphore for locking the mixing buffers */ - SDL_mutex *mixer_lock; - - /* A thread to feed the audio device */ - SDL_Thread *thread; - SDL_threadID threadid; - - /* * * */ - /* Data private to this driver */ - struct SDL_PrivateAudioData *hidden; -}; -#undef _THIS - -typedef struct AudioBootStrap -{ - const char *name; - const char *desc; - int (*init) (SDL_AudioDriverImpl * impl); - int demand_only:1; /* 1==request explicitly, or it won't be available. */ -} AudioBootStrap; - -#endif /* _SDL_sysaudio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_wave.c b/src/helper/android/SDL1.3/src/audio/SDL_wave.c deleted file mode 100644 index 546cb5c51..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_wave.c +++ /dev/null @@ -1,636 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Microsoft WAVE file loading routines */ - -#include "SDL_audio.h" -#include "SDL_wave.h" - - -static int ReadChunk(SDL_RWops * src, Chunk * chunk); - -struct MS_ADPCM_decodestate -{ - Uint8 hPredictor; - Uint16 iDelta; - Sint16 iSamp1; - Sint16 iSamp2; -}; -static struct MS_ADPCM_decoder -{ - WaveFMT wavefmt; - Uint16 wSamplesPerBlock; - Uint16 wNumCoef; - Sint16 aCoeff[7][2]; - /* * * */ - struct MS_ADPCM_decodestate state[2]; -} MS_ADPCM_state; - -static int -InitMS_ADPCM(WaveFMT * format) -{ - Uint8 *rogue_feel; - Uint16 extra_info; - int i; - - /* Set the rogue pointer to the MS_ADPCM specific data */ - MS_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding); - MS_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels); - MS_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency); - MS_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate); - MS_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign); - MS_ADPCM_state.wavefmt.bitspersample = - SDL_SwapLE16(format->bitspersample); - rogue_feel = (Uint8 *) format + sizeof(*format); - if (sizeof(*format) == 16) { - extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - } - MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - MS_ADPCM_state.wNumCoef = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - if (MS_ADPCM_state.wNumCoef != 7) { - SDL_SetError("Unknown set of MS_ADPCM coefficients"); - return (-1); - } - for (i = 0; i < MS_ADPCM_state.wNumCoef; ++i) { - MS_ADPCM_state.aCoeff[i][0] = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - MS_ADPCM_state.aCoeff[i][1] = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - } - return (0); -} - -static Sint32 -MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state, - Uint8 nybble, Sint16 * coeff) -{ - const Sint32 max_audioval = ((1 << (16 - 1)) - 1); - const Sint32 min_audioval = -(1 << (16 - 1)); - const Sint32 adaptive[] = { - 230, 230, 230, 230, 307, 409, 512, 614, - 768, 614, 512, 409, 307, 230, 230, 230 - }; - Sint32 new_sample, delta; - - new_sample = ((state->iSamp1 * coeff[0]) + - (state->iSamp2 * coeff[1])) / 256; - if (nybble & 0x08) { - new_sample += state->iDelta * (nybble - 0x10); - } else { - new_sample += state->iDelta * nybble; - } - if (new_sample < min_audioval) { - new_sample = min_audioval; - } else if (new_sample > max_audioval) { - new_sample = max_audioval; - } - delta = ((Sint32) state->iDelta * adaptive[nybble]) / 256; - if (delta < 16) { - delta = 16; - } - state->iDelta = (Uint16) delta; - state->iSamp2 = state->iSamp1; - state->iSamp1 = (Sint16) new_sample; - return (new_sample); -} - -static int -MS_ADPCM_decode(Uint8 ** audio_buf, Uint32 * audio_len) -{ - struct MS_ADPCM_decodestate *state[2]; - Uint8 *freeable, *encoded, *decoded; - Sint32 encoded_len, samplesleft; - Sint8 nybble, stereo; - Sint16 *coeff[2]; - Sint32 new_sample; - - /* Allocate the proper sized output buffer */ - encoded_len = *audio_len; - encoded = *audio_buf; - freeable = *audio_buf; - *audio_len = (encoded_len / MS_ADPCM_state.wavefmt.blockalign) * - MS_ADPCM_state.wSamplesPerBlock * - MS_ADPCM_state.wavefmt.channels * sizeof(Sint16); - *audio_buf = (Uint8 *) SDL_malloc(*audio_len); - if (*audio_buf == NULL) { - SDL_Error(SDL_ENOMEM); - return (-1); - } - decoded = *audio_buf; - - /* Get ready... Go! */ - stereo = (MS_ADPCM_state.wavefmt.channels == 2); - state[0] = &MS_ADPCM_state.state[0]; - state[1] = &MS_ADPCM_state.state[stereo]; - while (encoded_len >= MS_ADPCM_state.wavefmt.blockalign) { - /* Grab the initial information for this block */ - state[0]->hPredictor = *encoded++; - if (stereo) { - state[1]->hPredictor = *encoded++; - } - state[0]->iDelta = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - if (stereo) { - state[1]->iDelta = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - } - state[0]->iSamp1 = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - if (stereo) { - state[1]->iSamp1 = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - } - state[0]->iSamp2 = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - if (stereo) { - state[1]->iSamp2 = ((encoded[1] << 8) | encoded[0]); - encoded += sizeof(Sint16); - } - coeff[0] = MS_ADPCM_state.aCoeff[state[0]->hPredictor]; - coeff[1] = MS_ADPCM_state.aCoeff[state[1]->hPredictor]; - - /* Store the two initial samples we start with */ - decoded[0] = state[0]->iSamp2 & 0xFF; - decoded[1] = state[0]->iSamp2 >> 8; - decoded += 2; - if (stereo) { - decoded[0] = state[1]->iSamp2 & 0xFF; - decoded[1] = state[1]->iSamp2 >> 8; - decoded += 2; - } - decoded[0] = state[0]->iSamp1 & 0xFF; - decoded[1] = state[0]->iSamp1 >> 8; - decoded += 2; - if (stereo) { - decoded[0] = state[1]->iSamp1 & 0xFF; - decoded[1] = state[1]->iSamp1 >> 8; - decoded += 2; - } - - /* Decode and store the other samples in this block */ - samplesleft = (MS_ADPCM_state.wSamplesPerBlock - 2) * - MS_ADPCM_state.wavefmt.channels; - while (samplesleft > 0) { - nybble = (*encoded) >> 4; - new_sample = MS_ADPCM_nibble(state[0], nybble, coeff[0]); - decoded[0] = new_sample & 0xFF; - new_sample >>= 8; - decoded[1] = new_sample & 0xFF; - decoded += 2; - - nybble = (*encoded) & 0x0F; - new_sample = MS_ADPCM_nibble(state[1], nybble, coeff[1]); - decoded[0] = new_sample & 0xFF; - new_sample >>= 8; - decoded[1] = new_sample & 0xFF; - decoded += 2; - - ++encoded; - samplesleft -= 2; - } - encoded_len -= MS_ADPCM_state.wavefmt.blockalign; - } - SDL_free(freeable); - return (0); -} - -struct IMA_ADPCM_decodestate -{ - Sint32 sample; - Sint8 index; -}; -static struct IMA_ADPCM_decoder -{ - WaveFMT wavefmt; - Uint16 wSamplesPerBlock; - /* * * */ - struct IMA_ADPCM_decodestate state[2]; -} IMA_ADPCM_state; - -static int -InitIMA_ADPCM(WaveFMT * format) -{ - Uint8 *rogue_feel; - Uint16 extra_info; - - /* Set the rogue pointer to the IMA_ADPCM specific data */ - IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding); - IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels); - IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency); - IMA_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate); - IMA_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign); - IMA_ADPCM_state.wavefmt.bitspersample = - SDL_SwapLE16(format->bitspersample); - rogue_feel = (Uint8 *) format + sizeof(*format); - if (sizeof(*format) == 16) { - extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); - rogue_feel += sizeof(Uint16); - } - IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]); - return (0); -} - -static Sint32 -IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state, Uint8 nybble) -{ - const Sint32 max_audioval = ((1 << (16 - 1)) - 1); - const Sint32 min_audioval = -(1 << (16 - 1)); - const int index_table[16] = { - -1, -1, -1, -1, - 2, 4, 6, 8, - -1, -1, -1, -1, - 2, 4, 6, 8 - }; - const Sint32 step_table[89] = { - 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, 25, 28, 31, - 34, 37, 41, 45, 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, 130, - 143, 157, 173, 190, 209, 230, 253, 279, 307, 337, 371, 408, - 449, 494, 544, 598, 658, 724, 796, 876, 963, 1060, 1166, 1282, - 1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, 3327, - 3660, 4026, 4428, 4871, 5358, 5894, 6484, 7132, 7845, 8630, - 9493, 10442, 11487, 12635, 13899, 15289, 16818, 18500, 20350, - 22385, 24623, 27086, 29794, 32767 - }; - Sint32 delta, step; - - /* Compute difference and new sample value */ - step = step_table[state->index]; - delta = step >> 3; - if (nybble & 0x04) - delta += step; - if (nybble & 0x02) - delta += (step >> 1); - if (nybble & 0x01) - delta += (step >> 2); - if (nybble & 0x08) - delta = -delta; - state->sample += delta; - - /* Update index value */ - state->index += index_table[nybble]; - if (state->index > 88) { - state->index = 88; - } else if (state->index < 0) { - state->index = 0; - } - - /* Clamp output sample */ - if (state->sample > max_audioval) { - state->sample = max_audioval; - } else if (state->sample < min_audioval) { - state->sample = min_audioval; - } - return (state->sample); -} - -/* Fill the decode buffer with a channel block of data (8 samples) */ -static void -Fill_IMA_ADPCM_block(Uint8 * decoded, Uint8 * encoded, - int channel, int numchannels, - struct IMA_ADPCM_decodestate *state) -{ - int i; - Sint8 nybble; - Sint32 new_sample; - - decoded += (channel * 2); - for (i = 0; i < 4; ++i) { - nybble = (*encoded) & 0x0F; - new_sample = IMA_ADPCM_nibble(state, nybble); - decoded[0] = new_sample & 0xFF; - new_sample >>= 8; - decoded[1] = new_sample & 0xFF; - decoded += 2 * numchannels; - - nybble = (*encoded) >> 4; - new_sample = IMA_ADPCM_nibble(state, nybble); - decoded[0] = new_sample & 0xFF; - new_sample >>= 8; - decoded[1] = new_sample & 0xFF; - decoded += 2 * numchannels; - - ++encoded; - } -} - -static int -IMA_ADPCM_decode(Uint8 ** audio_buf, Uint32 * audio_len) -{ - struct IMA_ADPCM_decodestate *state; - Uint8 *freeable, *encoded, *decoded; - Sint32 encoded_len, samplesleft; - unsigned int c, channels; - - /* Check to make sure we have enough variables in the state array */ - channels = IMA_ADPCM_state.wavefmt.channels; - if (channels > SDL_arraysize(IMA_ADPCM_state.state)) { - SDL_SetError("IMA ADPCM decoder can only handle %d channels", - SDL_arraysize(IMA_ADPCM_state.state)); - return (-1); - } - state = IMA_ADPCM_state.state; - - /* Allocate the proper sized output buffer */ - encoded_len = *audio_len; - encoded = *audio_buf; - freeable = *audio_buf; - *audio_len = (encoded_len / IMA_ADPCM_state.wavefmt.blockalign) * - IMA_ADPCM_state.wSamplesPerBlock * - IMA_ADPCM_state.wavefmt.channels * sizeof(Sint16); - *audio_buf = (Uint8 *) SDL_malloc(*audio_len); - if (*audio_buf == NULL) { - SDL_Error(SDL_ENOMEM); - return (-1); - } - decoded = *audio_buf; - - /* Get ready... Go! */ - while (encoded_len >= IMA_ADPCM_state.wavefmt.blockalign) { - /* Grab the initial information for this block */ - for (c = 0; c < channels; ++c) { - /* Fill the state information for this block */ - state[c].sample = ((encoded[1] << 8) | encoded[0]); - encoded += 2; - if (state[c].sample & 0x8000) { - state[c].sample -= 0x10000; - } - state[c].index = *encoded++; - /* Reserved byte in buffer header, should be 0 */ - if (*encoded++ != 0) { - /* Uh oh, corrupt data? Buggy code? */ ; - } - - /* Store the initial sample we start with */ - decoded[0] = (Uint8) (state[c].sample & 0xFF); - decoded[1] = (Uint8) (state[c].sample >> 8); - decoded += 2; - } - - /* Decode and store the other samples in this block */ - samplesleft = (IMA_ADPCM_state.wSamplesPerBlock - 1) * channels; - while (samplesleft > 0) { - for (c = 0; c < channels; ++c) { - Fill_IMA_ADPCM_block(decoded, encoded, - c, channels, &state[c]); - encoded += 4; - samplesleft -= 8; - } - decoded += (channels * 8 * 2); - } - encoded_len -= IMA_ADPCM_state.wavefmt.blockalign; - } - SDL_free(freeable); - return (0); -} - -SDL_AudioSpec * -SDL_LoadWAV_RW(SDL_RWops * src, int freesrc, - SDL_AudioSpec * spec, Uint8 ** audio_buf, Uint32 * audio_len) -{ - int was_error; - Chunk chunk; - int lenread; - int IEEE_float_encoded, MS_ADPCM_encoded, IMA_ADPCM_encoded; - int samplesize; - - /* WAV magic header */ - Uint32 RIFFchunk; - Uint32 wavelen = 0; - Uint32 WAVEmagic; - Uint32 headerDiff = 0; - - /* FMT chunk */ - WaveFMT *format = NULL; - - /* Make sure we are passed a valid data source */ - was_error = 0; - if (src == NULL) { - was_error = 1; - goto done; - } - - /* Check the magic header */ - RIFFchunk = SDL_ReadLE32(src); - wavelen = SDL_ReadLE32(src); - if (wavelen == WAVE) { /* The RIFFchunk has already been read */ - WAVEmagic = wavelen; - wavelen = RIFFchunk; - RIFFchunk = RIFF; - } else { - WAVEmagic = SDL_ReadLE32(src); - } - if ((RIFFchunk != RIFF) || (WAVEmagic != WAVE)) { - SDL_SetError("Unrecognized file type (not WAVE)"); - was_error = 1; - goto done; - } - headerDiff += sizeof(Uint32); /* for WAVE */ - - /* Read the audio data format chunk */ - chunk.data = NULL; - do { - if (chunk.data != NULL) { - SDL_free(chunk.data); - chunk.data = NULL; - } - lenread = ReadChunk(src, &chunk); - if (lenread < 0) { - was_error = 1; - goto done; - } - /* 2 Uint32's for chunk header+len, plus the lenread */ - headerDiff += lenread + 2 * sizeof(Uint32); - } while ((chunk.magic == FACT) || (chunk.magic == LIST)); - - /* Decode the audio data format */ - format = (WaveFMT *) chunk.data; - if (chunk.magic != FMT) { - SDL_SetError("Complex WAVE files not supported"); - was_error = 1; - goto done; - } - IEEE_float_encoded = MS_ADPCM_encoded = IMA_ADPCM_encoded = 0; - switch (SDL_SwapLE16(format->encoding)) { - case PCM_CODE: - /* We can understand this */ - break; - case IEEE_FLOAT_CODE: - IEEE_float_encoded = 1; - /* We can understand this */ - break; - case MS_ADPCM_CODE: - /* Try to understand this */ - if (InitMS_ADPCM(format) < 0) { - was_error = 1; - goto done; - } - MS_ADPCM_encoded = 1; - break; - case IMA_ADPCM_CODE: - /* Try to understand this */ - if (InitIMA_ADPCM(format) < 0) { - was_error = 1; - goto done; - } - IMA_ADPCM_encoded = 1; - break; - case MP3_CODE: - SDL_SetError("MPEG Layer 3 data not supported", - SDL_SwapLE16(format->encoding)); - was_error = 1; - goto done; - default: - SDL_SetError("Unknown WAVE data format: 0x%.4x", - SDL_SwapLE16(format->encoding)); - was_error = 1; - goto done; - } - SDL_memset(spec, 0, (sizeof *spec)); - spec->freq = SDL_SwapLE32(format->frequency); - - if (IEEE_float_encoded) { - if ((SDL_SwapLE16(format->bitspersample)) != 32) { - was_error = 1; - } else { - spec->format = AUDIO_F32; - } - } else { - switch (SDL_SwapLE16(format->bitspersample)) { - case 4: - if (MS_ADPCM_encoded || IMA_ADPCM_encoded) { - spec->format = AUDIO_S16; - } else { - was_error = 1; - } - break; - case 8: - spec->format = AUDIO_U8; - break; - case 16: - spec->format = AUDIO_S16; - break; - case 32: - spec->format = AUDIO_S32; - break; - default: - was_error = 1; - break; - } - } - - if (was_error) { - SDL_SetError("Unknown %d-bit PCM data format", - SDL_SwapLE16(format->bitspersample)); - goto done; - } - spec->channels = (Uint8) SDL_SwapLE16(format->channels); - spec->samples = 4096; /* Good default buffer size */ - - /* Read the audio data chunk */ - *audio_buf = NULL; - do { - if (*audio_buf != NULL) { - SDL_free(*audio_buf); - *audio_buf = NULL; - } - lenread = ReadChunk(src, &chunk); - if (lenread < 0) { - was_error = 1; - goto done; - } - *audio_len = lenread; - *audio_buf = chunk.data; - if (chunk.magic != DATA) - headerDiff += lenread + 2 * sizeof(Uint32); - } while (chunk.magic != DATA); - headerDiff += 2 * sizeof(Uint32); /* for the data chunk and len */ - - if (MS_ADPCM_encoded) { - if (MS_ADPCM_decode(audio_buf, audio_len) < 0) { - was_error = 1; - goto done; - } - } - if (IMA_ADPCM_encoded) { - if (IMA_ADPCM_decode(audio_buf, audio_len) < 0) { - was_error = 1; - goto done; - } - } - - /* Don't return a buffer that isn't a multiple of samplesize */ - samplesize = ((SDL_AUDIO_BITSIZE(spec->format)) / 8) * spec->channels; - *audio_len &= ~(samplesize - 1); - - done: - if (format != NULL) { - SDL_free(format); - } - if (src) { - if (freesrc) { - SDL_RWclose(src); - } else { - /* seek to the end of the file (given by the RIFF chunk) */ - SDL_RWseek(src, wavelen - chunk.length - headerDiff, RW_SEEK_CUR); - } - } - if (was_error) { - spec = NULL; - } - return (spec); -} - -/* Since the WAV memory is allocated in the shared library, it must also - be freed here. (Necessary under Win32, VC++) - */ -void -SDL_FreeWAV(Uint8 * audio_buf) -{ - if (audio_buf != NULL) { - SDL_free(audio_buf); - } -} - -static int -ReadChunk(SDL_RWops * src, Chunk * chunk) -{ - chunk->magic = SDL_ReadLE32(src); - chunk->length = SDL_ReadLE32(src); - chunk->data = (Uint8 *) SDL_malloc(chunk->length); - if (chunk->data == NULL) { - SDL_Error(SDL_ENOMEM); - return (-1); - } - if (SDL_RWread(src, chunk->data, chunk->length, 1) != 1) { - SDL_Error(SDL_EFREAD); - SDL_free(chunk->data); - chunk->data = NULL; - return (-1); - } - return (chunk->length); -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/SDL_wave.h b/src/helper/android/SDL1.3/src/audio/SDL_wave.h deleted file mode 100644 index 3cb4a8d43..000000000 --- a/src/helper/android/SDL1.3/src/audio/SDL_wave.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - This library is SDL_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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* WAVE files are little-endian */ - -/*******************************************/ -/* Define values for Microsoft WAVE format */ -/*******************************************/ -#define RIFF 0x46464952 /* "RIFF" */ -#define WAVE 0x45564157 /* "WAVE" */ -#define FACT 0x74636166 /* "fact" */ -#define LIST 0x5453494c /* "LIST" */ -#define FMT 0x20746D66 /* "fmt " */ -#define DATA 0x61746164 /* "data" */ -#define PCM_CODE 0x0001 -#define MS_ADPCM_CODE 0x0002 -#define IEEE_FLOAT_CODE 0x0003 -#define IMA_ADPCM_CODE 0x0011 -#define MP3_CODE 0x0055 -#define WAVE_MONO 1 -#define WAVE_STEREO 2 - -/* Normally, these three chunks come consecutively in a WAVE file */ -typedef struct WaveFMT -{ -/* Not saved in the chunk we read: - Uint32 FMTchunk; - Uint32 fmtlen; -*/ - Uint16 encoding; - Uint16 channels; /* 1 = mono, 2 = stereo */ - Uint32 frequency; /* One of 11025, 22050, or 44100 Hz */ - Uint32 byterate; /* Average bytes per second */ - Uint16 blockalign; /* Bytes per sample block */ - Uint16 bitspersample; /* One of 8, 12, 16, or 4 for ADPCM */ -} WaveFMT; - -/* The general chunk found in the WAVE file */ -typedef struct Chunk -{ - Uint32 magic; - Uint32 length; - Uint8 *data; -} Chunk; -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.c b/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.c deleted file mode 100644 index f89e1b397..000000000 --- a/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.c +++ /dev/null @@ -1,691 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include -#include /* For kill() */ -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_alsa_audio.h" - -#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -#include "SDL_loadso.h" -#endif - -/* The tag name used by ALSA audio */ -#define DRIVER_NAME "alsa" - -static int (*ALSA_snd_pcm_open) - (snd_pcm_t **, const char *, snd_pcm_stream_t, int); -static int (*ALSA_snd_pcm_close) (snd_pcm_t * pcm); -static snd_pcm_sframes_t(*ALSA_snd_pcm_writei) - (snd_pcm_t *, const void *, snd_pcm_uframes_t); -static int (*ALSA_snd_pcm_recover) (snd_pcm_t *, int, int); -static int (*ALSA_snd_pcm_prepare) (snd_pcm_t *); -static int (*ALSA_snd_pcm_drain) (snd_pcm_t *); -static const char *(*ALSA_snd_strerror) (int); -static size_t(*ALSA_snd_pcm_hw_params_sizeof) (void); -static size_t(*ALSA_snd_pcm_sw_params_sizeof) (void); -static void (*ALSA_snd_pcm_hw_params_copy) - (snd_pcm_hw_params_t *, const snd_pcm_hw_params_t *); -static int (*ALSA_snd_pcm_hw_params_any) (snd_pcm_t *, snd_pcm_hw_params_t *); -static int (*ALSA_snd_pcm_hw_params_set_access) - (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_access_t); -static int (*ALSA_snd_pcm_hw_params_set_format) - (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_format_t); -static int (*ALSA_snd_pcm_hw_params_set_channels) - (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int); -static int (*ALSA_snd_pcm_hw_params_get_channels) - (const snd_pcm_hw_params_t *, unsigned int *); -static int (*ALSA_snd_pcm_hw_params_set_rate_near) - (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *); -static int (*ALSA_snd_pcm_hw_params_set_period_size_near) - (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *); -static int (*ALSA_snd_pcm_hw_params_get_period_size) - (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *); -static int (*ALSA_snd_pcm_hw_params_set_periods_near) - (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *); -static int (*ALSA_snd_pcm_hw_params_get_periods) - (const snd_pcm_hw_params_t *, unsigned int *, int *); -static int (*ALSA_snd_pcm_hw_params_set_buffer_size_near) - (snd_pcm_t *pcm, snd_pcm_hw_params_t *, snd_pcm_uframes_t *); -static int (*ALSA_snd_pcm_hw_params_get_buffer_size) - (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *); -static int (*ALSA_snd_pcm_hw_params) (snd_pcm_t *, snd_pcm_hw_params_t *); -static int (*ALSA_snd_pcm_sw_params_current) (snd_pcm_t *, - snd_pcm_sw_params_t *); -static int (*ALSA_snd_pcm_sw_params_set_start_threshold) - (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t); -static int (*ALSA_snd_pcm_sw_params) (snd_pcm_t *, snd_pcm_sw_params_t *); -static int (*ALSA_snd_pcm_nonblock) (snd_pcm_t *, int); -static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int); - - -#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -#define snd_pcm_hw_params_sizeof ALSA_snd_pcm_hw_params_sizeof -#define snd_pcm_sw_params_sizeof ALSA_snd_pcm_sw_params_sizeof - -static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC; -static void *alsa_handle = NULL; - -static int -load_alsa_sym(const char *fn, void **addr) -{ - *addr = SDL_LoadFunction(alsa_handle, fn); - if (*addr == NULL) { - /* Don't call SDL_SetError(): SDL_LoadFunction already did. */ - return 0; - } - - return 1; -} - -/* cast funcs to char* first, to please GCC's strict aliasing rules. */ -#define SDL_ALSA_SYM(x) \ - if (!load_alsa_sym(#x, (void **) (char *) &ALSA_##x)) return -1 -#else -#define SDL_ALSA_SYM(x) ALSA_##x = x -#endif - -static int -load_alsa_syms(void) -{ - SDL_ALSA_SYM(snd_pcm_open); - SDL_ALSA_SYM(snd_pcm_close); - SDL_ALSA_SYM(snd_pcm_writei); - SDL_ALSA_SYM(snd_pcm_recover); - SDL_ALSA_SYM(snd_pcm_prepare); - SDL_ALSA_SYM(snd_pcm_drain); - SDL_ALSA_SYM(snd_strerror); - SDL_ALSA_SYM(snd_pcm_hw_params_sizeof); - SDL_ALSA_SYM(snd_pcm_sw_params_sizeof); - SDL_ALSA_SYM(snd_pcm_hw_params_copy); - SDL_ALSA_SYM(snd_pcm_hw_params_any); - SDL_ALSA_SYM(snd_pcm_hw_params_set_access); - SDL_ALSA_SYM(snd_pcm_hw_params_set_format); - SDL_ALSA_SYM(snd_pcm_hw_params_set_channels); - SDL_ALSA_SYM(snd_pcm_hw_params_get_channels); - SDL_ALSA_SYM(snd_pcm_hw_params_set_rate_near); - SDL_ALSA_SYM(snd_pcm_hw_params_set_period_size_near); - SDL_ALSA_SYM(snd_pcm_hw_params_get_period_size); - SDL_ALSA_SYM(snd_pcm_hw_params_set_periods_near); - SDL_ALSA_SYM(snd_pcm_hw_params_get_periods); - SDL_ALSA_SYM(snd_pcm_hw_params_set_buffer_size_near); - SDL_ALSA_SYM(snd_pcm_hw_params_get_buffer_size); - SDL_ALSA_SYM(snd_pcm_hw_params); - SDL_ALSA_SYM(snd_pcm_sw_params_current); - SDL_ALSA_SYM(snd_pcm_sw_params_set_start_threshold); - SDL_ALSA_SYM(snd_pcm_sw_params); - SDL_ALSA_SYM(snd_pcm_nonblock); - SDL_ALSA_SYM(snd_pcm_wait); - return 0; -} - -#undef SDL_ALSA_SYM - -#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC - -static void -UnloadALSALibrary(void) -{ - if (alsa_handle != NULL) { - SDL_UnloadObject(alsa_handle); - alsa_handle = NULL; - } -} - -static int -LoadALSALibrary(void) -{ - int retval = 0; - if (alsa_handle == NULL) { - alsa_handle = SDL_LoadObject(alsa_library); - if (alsa_handle == NULL) { - retval = -1; - /* Don't call SDL_SetError(): SDL_LoadObject already did. */ - } else { - retval = load_alsa_syms(); - if (retval < 0) { - UnloadALSALibrary(); - } - } - } - return retval; -} - -#else - -static void -UnloadALSALibrary(void) -{ -} - -static int -LoadALSALibrary(void) -{ - load_alsa_syms(); - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */ - -static const char * -get_audio_device(int channels) -{ - const char *device; - - device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */ - if (device == NULL) { - switch (channels) { - case 6: - device = "plug:surround51"; - break; - case 4: - device = "plug:surround40"; - break; - default: - device = "default"; - break; - } - } - return device; -} - - -/* This function waits until it is possible to write a full sound buffer */ -static void -ALSA_WaitDevice(_THIS) -{ - /* We're in blocking mode, so there's nothing to do here */ -} - - -/* !!! FIXME: is there a channel swizzler in alsalib instead? */ -/* - * http://bugzilla.libsdl.org/show_bug.cgi?id=110 - * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE - * and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR" - */ -#define SWIZ6(T) \ - T *ptr = (T *) this->hidden->mixbuf; \ - Uint32 i; \ - for (i = 0; i < this->spec.samples; i++, ptr += 6) { \ - T tmp; \ - tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \ - tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \ - } - -static __inline__ void -swizzle_alsa_channels_6_64bit(_THIS) -{ - SWIZ6(Uint64); -} - -static __inline__ void -swizzle_alsa_channels_6_32bit(_THIS) -{ - SWIZ6(Uint32); -} - -static __inline__ void -swizzle_alsa_channels_6_16bit(_THIS) -{ - SWIZ6(Uint16); -} - -static __inline__ void -swizzle_alsa_channels_6_8bit(_THIS) -{ - SWIZ6(Uint8); -} - -#undef SWIZ6 - - -/* - * Called right before feeding this->hidden->mixbuf to the hardware. Swizzle - * channels from Windows/Mac order to the format alsalib will want. - */ -static __inline__ void -swizzle_alsa_channels(_THIS) -{ - if (this->spec.channels == 6) { - const Uint16 fmtsize = (this->spec.format & 0xFF); /* bits/channel. */ - if (fmtsize == 16) - swizzle_alsa_channels_6_16bit(this); - else if (fmtsize == 8) - swizzle_alsa_channels_6_8bit(this); - else if (fmtsize == 32) - swizzle_alsa_channels_6_32bit(this); - else if (fmtsize == 64) - swizzle_alsa_channels_6_64bit(this); - } - - /* !!! FIXME: update this for 7.1 if needed, later. */ -} - - -static void -ALSA_PlayDevice(_THIS) -{ - int status; - const Uint8 *sample_buf = (const Uint8 *) this->hidden->mixbuf; - const int frame_size = (((int) (this->spec.format & 0xFF)) / 8) * - this->spec.channels; - snd_pcm_uframes_t frames_left = ((snd_pcm_uframes_t) this->spec.samples); - - swizzle_alsa_channels(this); - - while ( frames_left > 0 && this->enabled ) { - /* !!! FIXME: This works, but needs more testing before going live */ - /*ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1);*/ - status = ALSA_snd_pcm_writei(this->hidden->pcm_handle, - sample_buf, frames_left); - - if (status < 0) { - if (status == -EAGAIN) { - /* Apparently snd_pcm_recover() doesn't handle this case - - does it assume snd_pcm_wait() above? */ - SDL_Delay(1); - continue; - } - status = ALSA_snd_pcm_recover(this->hidden->pcm_handle, status, 0); - if (status < 0) { - /* Hmm, not much we can do - abort */ - fprintf(stderr, "ALSA write failed (unrecoverable): %s\n", - ALSA_snd_strerror(status)); - this->enabled = 0; - return; - } - continue; - } - sample_buf += status * frame_size; - frames_left -= status; - } -} - -static Uint8 * -ALSA_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static void -ALSA_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->pcm_handle) { - ALSA_snd_pcm_drain(this->hidden->pcm_handle); - ALSA_snd_pcm_close(this->hidden->pcm_handle); - this->hidden->pcm_handle = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - -static int -ALSA_finalize_hardware(_THIS, snd_pcm_hw_params_t *hwparams, int override) -{ - int status; - snd_pcm_uframes_t bufsize; - - /* "set" the hardware with the desired parameters */ - status = ALSA_snd_pcm_hw_params(this->hidden->pcm_handle, hwparams); - if ( status < 0 ) { - return(-1); - } - - /* Get samples for the actual buffer size */ - status = ALSA_snd_pcm_hw_params_get_buffer_size(hwparams, &bufsize); - if ( status < 0 ) { - return(-1); - } - if ( !override && bufsize != this->spec.samples * 2 ) { - return(-1); - } - - /* !!! FIXME: Is this safe to do? */ - this->spec.samples = bufsize / 2; - - /* This is useful for debugging */ - if ( SDL_getenv("SDL_AUDIO_ALSA_DEBUG") ) { - snd_pcm_uframes_t persize = 0; - unsigned int periods = 0; - - ALSA_snd_pcm_hw_params_get_period_size(hwparams, &persize, NULL); - ALSA_snd_pcm_hw_params_get_periods(hwparams, &periods, NULL); - - fprintf(stderr, - "ALSA: period size = %ld, periods = %u, buffer size = %lu\n", - persize, periods, bufsize); - } - - return(0); -} - -static int -ALSA_set_period_size(_THIS, snd_pcm_hw_params_t *params, int override) -{ - const char *env; - int status; - snd_pcm_hw_params_t *hwparams; - snd_pcm_uframes_t frames; - unsigned int periods; - - /* Copy the hardware parameters for this setup */ - snd_pcm_hw_params_alloca(&hwparams); - ALSA_snd_pcm_hw_params_copy(hwparams, params); - - if ( !override ) { - env = SDL_getenv("SDL_AUDIO_ALSA_SET_PERIOD_SIZE"); - if ( env ) { - override = SDL_atoi(env); - if ( override == 0 ) { - return(-1); - } - } - } - - frames = this->spec.samples; - status = ALSA_snd_pcm_hw_params_set_period_size_near( - this->hidden->pcm_handle, hwparams, &frames, NULL); - if ( status < 0 ) { - return(-1); - } - - periods = 2; - status = ALSA_snd_pcm_hw_params_set_periods_near( - this->hidden->pcm_handle, hwparams, &periods, NULL); - if ( status < 0 ) { - return(-1); - } - - return ALSA_finalize_hardware(this, hwparams, override); -} - -static int -ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params, int override) -{ - const char *env; - int status; - snd_pcm_hw_params_t *hwparams; - snd_pcm_uframes_t frames; - - /* Copy the hardware parameters for this setup */ - snd_pcm_hw_params_alloca(&hwparams); - ALSA_snd_pcm_hw_params_copy(hwparams, params); - - if ( !override ) { - env = SDL_getenv("SDL_AUDIO_ALSA_SET_BUFFER_SIZE"); - if ( env ) { - override = SDL_atoi(env); - if ( override == 0 ) { - return(-1); - } - } - } - - frames = this->spec.samples * 2; - status = ALSA_snd_pcm_hw_params_set_buffer_size_near( - this->hidden->pcm_handle, hwparams, &frames); - if ( status < 0 ) { - return(-1); - } - - return ALSA_finalize_hardware(this, hwparams, override); -} - -static int -ALSA_OpenDevice(_THIS, const char *devname, int iscapture) -{ - int status = 0; - snd_pcm_t *pcm_handle = NULL; - snd_pcm_hw_params_t *hwparams = NULL; - snd_pcm_sw_params_t *swparams = NULL; - snd_pcm_format_t format = 0; - SDL_AudioFormat test_format = 0; - unsigned int rate = 0; - unsigned int channels = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Open the audio device */ - /* Name of device should depend on # channels in spec */ - status = ALSA_snd_pcm_open(&pcm_handle, - get_audio_device(this->spec.channels), - SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't open audio device: %s", - ALSA_snd_strerror(status)); - return 0; - } - - this->hidden->pcm_handle = pcm_handle; - - /* Figure out what the hardware is capable of */ - snd_pcm_hw_params_alloca(&hwparams); - status = ALSA_snd_pcm_hw_params_any(pcm_handle, hwparams); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't get hardware config: %s", - ALSA_snd_strerror(status)); - return 0; - } - - /* SDL only uses interleaved sample output */ - status = ALSA_snd_pcm_hw_params_set_access(pcm_handle, hwparams, - SND_PCM_ACCESS_RW_INTERLEAVED); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't set interleaved access: %s", - ALSA_snd_strerror(status)); - return 0; - } - - /* Try for a closest match on audio format */ - status = -1; - for (test_format = SDL_FirstAudioFormat(this->spec.format); - test_format && (status < 0);) { - status = 0; /* if we can't support a format, it'll become -1. */ - switch (test_format) { - case AUDIO_U8: - format = SND_PCM_FORMAT_U8; - break; - case AUDIO_S8: - format = SND_PCM_FORMAT_S8; - break; - case AUDIO_S16LSB: - format = SND_PCM_FORMAT_S16_LE; - break; - case AUDIO_S16MSB: - format = SND_PCM_FORMAT_S16_BE; - break; - case AUDIO_U16LSB: - format = SND_PCM_FORMAT_U16_LE; - break; - case AUDIO_U16MSB: - format = SND_PCM_FORMAT_U16_BE; - break; - case AUDIO_S32LSB: - format = SND_PCM_FORMAT_S32_LE; - break; - case AUDIO_S32MSB: - format = SND_PCM_FORMAT_S32_BE; - break; - case AUDIO_F32LSB: - format = SND_PCM_FORMAT_FLOAT_LE; - break; - case AUDIO_F32MSB: - format = SND_PCM_FORMAT_FLOAT_BE; - break; - default: - status = -1; - break; - } - if (status >= 0) { - status = ALSA_snd_pcm_hw_params_set_format(pcm_handle, - hwparams, format); - } - if (status < 0) { - test_format = SDL_NextAudioFormat(); - } - } - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - /* Set the number of channels */ - status = ALSA_snd_pcm_hw_params_set_channels(pcm_handle, hwparams, - this->spec.channels); - channels = this->spec.channels; - if (status < 0) { - status = ALSA_snd_pcm_hw_params_get_channels(hwparams, &channels); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't set audio channels"); - return 0; - } - this->spec.channels = channels; - } - - /* Set the audio rate */ - rate = this->spec.freq; - status = ALSA_snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, - &rate, NULL); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't set audio frequency: %s", - ALSA_snd_strerror(status)); - return 0; - } - this->spec.freq = rate; - - /* Set the buffer size, in samples */ - if ( ALSA_set_period_size(this, hwparams, 0) < 0 && - ALSA_set_buffer_size(this, hwparams, 0) < 0 ) { - /* Failed to set desired buffer size, do the best you can... */ - if ( ALSA_set_period_size(this, hwparams, 1) < 0 ) { - ALSA_CloseDevice(this); - SDL_SetError("Couldn't set hardware audio parameters: %s", ALSA_snd_strerror(status)); - return(-1); - } - } - /* Set the software parameters */ - snd_pcm_sw_params_alloca(&swparams); - status = ALSA_snd_pcm_sw_params_current(pcm_handle, swparams); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't get software config: %s", - ALSA_snd_strerror(status)); - return 0; - } - status = - ALSA_snd_pcm_sw_params_set_start_threshold(pcm_handle, swparams, 1); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("ALSA: Couldn't set start threshold: %s", - ALSA_snd_strerror(status)); - return 0; - } - status = ALSA_snd_pcm_sw_params(pcm_handle, swparams); - if (status < 0) { - ALSA_CloseDevice(this); - SDL_SetError("Couldn't set software audio parameters: %s", - ALSA_snd_strerror(status)); - return 0; - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - ALSA_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* Switch to blocking mode for playback */ - ALSA_snd_pcm_nonblock(pcm_handle, 0); - - /* We're ready to rock and roll. :-) */ - return 1; -} - -static void -ALSA_Deinitialize(void) -{ - UnloadALSALibrary(); -} - -static int -ALSA_Init(SDL_AudioDriverImpl * impl) -{ - if (LoadALSALibrary() < 0) { - return 0; - } - - /* Set the function pointers */ - impl->OpenDevice = ALSA_OpenDevice; - impl->WaitDevice = ALSA_WaitDevice; - impl->GetDeviceBuf = ALSA_GetDeviceBuf; - impl->PlayDevice = ALSA_PlayDevice; - impl->CloseDevice = ALSA_CloseDevice; - impl->Deinitialize = ALSA_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; /* !!! FIXME: Add device enum! */ - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap ALSA_bootstrap = { - DRIVER_NAME, "ALSA PCM audio", ALSA_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.h b/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.h deleted file mode 100644 index ec8fd9935..000000000 --- a/src/helper/android/SDL1.3/src/audio/alsa/SDL_alsa_audio.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _ALSA_PCM_audio_h -#define _ALSA_PCM_audio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The audio device handle */ - snd_pcm_t *pcm_handle; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; -}; - -#endif /* _ALSA_PCM_audio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.c b/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.c deleted file mode 100644 index 88750ee72..000000000 --- a/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.c +++ /dev/null @@ -1,158 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Output audio to Android */ - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "SDL_androidaudio.h" - -#include "../../core/android/SDL_android.h" - -#include - -static void * audioDevice; - -static int -AndroidAUD_OpenDevice(_THIS, const char *devname, int iscapture) -{ - SDL_AudioFormat test_format; - int valid_datatype = 0; - - if (iscapture) { - //TODO: implement capture - SDL_SetError("Capture not supported on Android"); - return 0; - } - - if (audioDevice != NULL) { - SDL_SetError("Only one audio device at a time please!"); - return 0; - } - - audioDevice = this; - - this->hidden = SDL_malloc(sizeof(*(this->hidden))); - if (!this->hidden) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - test_format = SDL_FirstAudioFormat(this->spec.format); - while (test_format != 0) { // no "UNKNOWN" constant - if ((test_format == AUDIO_U8) || (test_format == AUDIO_S16LSB)) { - this->spec.format = test_format; - break; - } - test_format = SDL_NextAudioFormat(); - } - - if (test_format == 0) { - // Didn't find a compatible format :( - SDL_SetError("No compatible audio format!"); - return 0; - } - - if (this->spec.channels > 1) { - this->spec.channels = 2; - } else { - this->spec.channels = 1; - } - - if (this->spec.freq < 8000) { - this->spec.freq = 8000; - } - if (this->spec.freq > 48000) { - this->spec.freq = 48000; - } - - // TODO: pass in/return a (Java) device ID, also whether we're opening for input or output - this->spec.samples = Android_JNI_OpenAudioDevice(this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples); - SDL_CalculateAudioSpec(&this->spec); - - if (this->spec.samples == 0) { - // Init failed? - SDL_SetError("Java-side initialization failed!"); - return 0; - } - - return 1; -} - -static void -AndroidAUD_PlayDevice(_THIS) -{ - Android_JNI_WriteAudioBuffer(); -} - -static Uint8 * -AndroidAUD_GetDeviceBuf(_THIS) -{ - return Android_JNI_GetAudioBuffer(); -} - -static void -AndroidAUD_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - SDL_free(this->hidden); - this->hidden = NULL; - } - Android_JNI_CloseAudioDevice(); - - if (audioDevice == this) { - audioDevice = NULL; - } -} - -static int -AndroidAUD_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->OpenDevice = AndroidAUD_OpenDevice; - impl->PlayDevice = AndroidAUD_PlayDevice; - impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf; - impl->CloseDevice = AndroidAUD_CloseDevice; - - /* and the capabilities */ - impl->ProvidesOwnCallbackThread = 1; - impl->HasCaptureSupport = 0; //TODO - impl->OnlyHasDefaultOutputDevice = 1; - impl->OnlyHasDefaultInputDevice = 1; - - return 1; /* this audio target is available. */ -} - -AudioBootStrap ANDROIDAUD_bootstrap = { - "android", "SDL Android audio driver", AndroidAUD_Init, 0 /*1? */ -}; - -/* Called by the Java code to start the audio processing on a thread */ -void -Android_RunAudioThread() -{ - SDL_RunAudio(audioDevice); -} - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.h b/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.h deleted file mode 100644 index 35967d495..000000000 --- a/src/helper/android/SDL1.3/src/audio/android/SDL_androidaudio.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_androidaudio_h -#define _SDL_androidaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ -}; - -#endif /* _SDL_androidaudio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.c b/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.c deleted file mode 100644 index aa8afe442..000000000 --- a/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.c +++ /dev/null @@ -1,379 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#ifdef HAVE_SIGNAL_H -#include -#endif -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_artsaudio.h" - -#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - -/* The tag name used by artsc audio */ -#define ARTS_DRIVER_NAME "arts" - -#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC - -static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC; -static void *arts_handle = NULL; - -/* !!! FIXME: I hate this SDL_NAME clutter...it makes everything so messy! */ -static int (*SDL_NAME(arts_init)) (void); -static void (*SDL_NAME(arts_free)) (void); -static arts_stream_t(*SDL_NAME(arts_play_stream)) (int rate, int bits, - int channels, - const char *name); -static int (*SDL_NAME(arts_stream_set)) (arts_stream_t s, - arts_parameter_t param, int value); -static int (*SDL_NAME(arts_stream_get)) (arts_stream_t s, - arts_parameter_t param); -static int (*SDL_NAME(arts_write)) (arts_stream_t s, const void *buffer, - int count); -static void (*SDL_NAME(arts_close_stream)) (arts_stream_t s); -static int (*SDL_NAME(arts_suspended)) (void); -static const char *(*SDL_NAME(arts_error_text)) (int errorcode); - -#define SDL_ARTS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) } -static struct -{ - const char *name; - void **func; -} arts_functions[] = { -/* *INDENT-OFF* */ - SDL_ARTS_SYM(arts_init), - SDL_ARTS_SYM(arts_free), - SDL_ARTS_SYM(arts_play_stream), - SDL_ARTS_SYM(arts_stream_set), - SDL_ARTS_SYM(arts_stream_get), - SDL_ARTS_SYM(arts_write), - SDL_ARTS_SYM(arts_close_stream), - SDL_ARTS_SYM(arts_suspended), - SDL_ARTS_SYM(arts_error_text), -/* *INDENT-ON* */ -}; - -#undef SDL_ARTS_SYM - -static void -UnloadARTSLibrary() -{ - if (arts_handle != NULL) { - SDL_UnloadObject(arts_handle); - arts_handle = NULL; - } -} - -static int -LoadARTSLibrary(void) -{ - int i, retval = -1; - - if (arts_handle == NULL) { - arts_handle = SDL_LoadObject(arts_library); - if (arts_handle != NULL) { - retval = 0; - for (i = 0; i < SDL_arraysize(arts_functions); ++i) { - *arts_functions[i].func = - SDL_LoadFunction(arts_handle, arts_functions[i].name); - if (!*arts_functions[i].func) { - retval = -1; - UnloadARTSLibrary(); - break; - } - } - } - } - - return retval; -} - -#else - -static void -UnloadARTSLibrary() -{ - return; -} - -static int -LoadARTSLibrary(void) -{ - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ - -/* This function waits until it is possible to write a full sound buffer */ -static void -ARTS_WaitDevice(_THIS) -{ - Sint32 ticks; - - /* Check to see if the thread-parent process is still alive */ - { - static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - /* Check every 10 loops */ - if (this->hidden->parent && (((++cnt) % 10) == 0)) { - if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) { - this->enabled = 0; - } - } - } - - /* Use timer for general audio synchronization */ - ticks = - ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS; - if (ticks > 0) { - SDL_Delay(ticks); - } -} - -static void -ARTS_PlayDevice(_THIS) -{ - /* Write the audio data */ - int written = SDL_NAME(arts_write) (this->hidden->stream, - this->hidden->mixbuf, - this->hidden->mixlen); - - /* If timer synchronization is enabled, set the next write frame */ - if (this->hidden->frame_ticks) { - this->hidden->next_frame += this->hidden->frame_ticks; - } - - /* If we couldn't write, assume fatal error for now */ - if (written < 0) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static void -ARTS_WaitDone(_THIS) -{ - /* !!! FIXME: camp here until buffer drains... SDL_Delay(???); */ -} - - -static Uint8 * -ARTS_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - - -static void -ARTS_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->stream) { - SDL_NAME(arts_close_stream) (this->hidden->stream); - this->hidden->stream = 0; - } - SDL_NAME(arts_free) (); - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -static int -ARTS_OpenDevice(_THIS, const char *devname, int iscapture) -{ - int rc = 0; - int bits = 0, frag_spec = 0; - SDL_AudioFormat test_format = 0, format = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Try for a closest match on audio format */ - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !format && test_format;) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch (test_format) { - case AUDIO_U8: - bits = 8; - format = 1; - break; - case AUDIO_S16LSB: - bits = 16; - format = 1; - break; - default: - format = 0; - break; - } - if (!format) { - test_format = SDL_NextAudioFormat(); - } - } - if (format == 0) { - ARTS_CloseDevice(this); - SDL_SetError("Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - if ((rc = SDL_NAME(arts_init) ()) != 0) { - ARTS_CloseDevice(this); - SDL_SetError("Unable to initialize ARTS: %s", - SDL_NAME(arts_error_text) (rc)); - return 0; - } - - if (!SDL_NAME(arts_suspended) ()) { - ARTS_CloseDevice(this); - SDL_SetError("ARTS can not open audio device"); - return 0; - } - - this->hidden->stream = SDL_NAME(arts_play_stream) (this->spec.freq, - bits, - this->spec.channels, - "SDL"); - - /* Play nothing so we have at least one write (server bug workaround). */ - SDL_NAME(arts_write) (this->hidden->stream, "", 0); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Determine the power of two of the fragment size */ - for (frag_spec = 0; (0x01 << frag_spec) < this->spec.size; ++frag_spec); - if ((0x01 << frag_spec) != this->spec.size) { - ARTS_CloseDevice(this); - SDL_SetError("Fragment size must be a power of two"); - return 0; - } - frag_spec |= 0x00020000; /* two fragments, for low latency */ - -#ifdef ARTS_P_PACKET_SETTINGS - SDL_NAME(arts_stream_set) (this->hidden->stream, - ARTS_P_PACKET_SETTINGS, frag_spec); -#else - SDL_NAME(arts_stream_set) (this->hidden->stream, ARTS_P_PACKET_SIZE, - frag_spec & 0xffff); - SDL_NAME(arts_stream_set) (this->hidden->stream, ARTS_P_PACKET_COUNT, - frag_spec >> 16); -#endif - this->spec.size = SDL_NAME(arts_stream_get) (this->hidden->stream, - ARTS_P_PACKET_SIZE); - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - ARTS_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* Get the parent process id (we're the parent of the audio thread) */ - this->hidden->parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return 1; -} - - -static void -ARTS_Deinitialize(void) -{ - UnloadARTSLibrary(); -} - - -static int -ARTS_Init(SDL_AudioDriverImpl * impl) -{ - if (LoadARTSLibrary() < 0) { - return 0; - } else { - if (SDL_NAME(arts_init) () != 0) { - UnloadARTSLibrary(); - SDL_SetError("ARTS: arts_init failed (no audio server?)"); - return 0; - } - - /* Play a stream so aRts doesn't crash */ - if (SDL_NAME(arts_suspended) ()) { - arts_stream_t stream; - stream = SDL_NAME(arts_play_stream) (44100, 16, 2, "SDL"); - SDL_NAME(arts_write) (stream, "", 0); - SDL_NAME(arts_close_stream) (stream); - } - - SDL_NAME(arts_free) (); - } - - /* Set the function pointers */ - impl->OpenDevice = ARTS_OpenDevice; - impl->PlayDevice = ARTS_PlayDevice; - impl->WaitDevice = ARTS_WaitDevice; - impl->GetDeviceBuf = ARTS_GetDeviceBuf; - impl->CloseDevice = ARTS_CloseDevice; - impl->WaitDone = ARTS_WaitDone; - impl->Deinitialize = ARTS_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap ARTS_bootstrap = { - ARTS_DRIVER_NAME, "Analog RealTime Synthesizer", ARTS_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.h b/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.h deleted file mode 100644 index 4ffadb502..000000000 --- a/src/helper/android/SDL1.3/src/audio/arts/SDL_artsaudio.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_artscaudio_h -#define _SDL_artscaudio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The stream descriptor for the audio device */ - arts_stream_t stream; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -#endif /* _SDL_artscaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.cc b/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.cc deleted file mode 100644 index c2e159e69..000000000 --- a/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.cc +++ /dev/null @@ -1,218 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to the audio stream on BeOS */ - -#include - -#include "../../main/beos/SDL_BeApp.h" - -extern "C" -{ - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "../../thread/beos/SDL_systhread_c.h" -#include "SDL_beaudio.h" - -} - - -/* !!! FIXME: have the callback call the higher level to avoid code dupe. */ -/* The BeOS callback for handling the audio buffer */ -static void -FillSound(void *device, void *stream, size_t len, - const media_raw_audio_format & format) -{ - SDL_AudioDevice *audio = (SDL_AudioDevice *) device; - - /* Silence the buffer, since it's ours */ - SDL_memset(stream, audio->spec.silence, len); - - /* Only do soemthing if audio is enabled */ - if (!audio->enabled) - return; - - if (!audio->paused) { - if (audio->convert.needed) { - SDL_mutexP(audio->mixer_lock); - (*audio->spec.callback) (audio->spec.userdata, - (Uint8 *) audio->convert.buf, - audio->convert.len); - SDL_mutexV(audio->mixer_lock); - SDL_ConvertAudio(&audio->convert); - SDL_memcpy(stream, audio->convert.buf, audio->convert.len_cvt); - } else { - SDL_mutexP(audio->mixer_lock); - (*audio->spec.callback) (audio->spec.userdata, - (Uint8 *) stream, len); - SDL_mutexV(audio->mixer_lock); - } - } -} - -static void -BEOSAUDIO_CloseDevice(_THIS) -{ - if (_this->hidden != NULL) { - if (_this->hidden->audio_obj) { - _this->hidden->audio_obj->Stop(); - delete _this->hidden->audio_obj; - _this->hidden->audio_obj = NULL; - } - - delete _this->hidden; - _this->hidden = NULL; - } -} - -static int -BEOSAUDIO_OpenDevice(_THIS, const char *devname, int iscapture) -{ - int valid_datatype = 0; - media_raw_audio_format format; - SDL_AudioFormat test_format = SDL_FirstAudioFormat(_this->spec.format); - - /* Initialize all variables that we clean on shutdown */ - _this->hidden = new SDL_PrivateAudioData; - if (_this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(_this->hidden, 0, (sizeof *_this->hidden)); - - /* Parse the audio format and fill the Be raw audio format */ - SDL_memset(&format, '\0', sizeof(media_raw_audio_format)); - format.byte_order = B_MEDIA_LITTLE_ENDIAN; - format.frame_rate = (float) _this->spec.freq; - format.channel_count = _this->spec.channels; /* !!! FIXME: support > 2? */ - while ((!valid_datatype) && (test_format)) { - valid_datatype = 1; - _this->spec.format = test_format; - switch (test_format) { - case AUDIO_S8: - format.format = media_raw_audio_format::B_AUDIO_CHAR; - break; - - case AUDIO_U8: - format.format = media_raw_audio_format::B_AUDIO_UCHAR; - break; - - case AUDIO_S16LSB: - format.format = media_raw_audio_format::B_AUDIO_SHORT; - break; - - case AUDIO_S16MSB: - format.format = media_raw_audio_format::B_AUDIO_SHORT; - format.byte_order = B_MEDIA_BIG_ENDIAN; - break; - - case AUDIO_S32LSB: - format.format = media_raw_audio_format::B_AUDIO_INT; - break; - - case AUDIO_S32MSB: - format.format = media_raw_audio_format::B_AUDIO_INT; - format.byte_order = B_MEDIA_BIG_ENDIAN; - break; - - case AUDIO_F32LSB: - format.format = media_raw_audio_format::B_AUDIO_FLOAT; - break; - - case AUDIO_F32MSB: - format.format = media_raw_audio_format::B_AUDIO_FLOAT; - format.byte_order = B_MEDIA_BIG_ENDIAN; - break; - - default: - valid_datatype = 0; - test_format = SDL_NextAudioFormat(); - break; - } - } - - format.buffer_size = _this->spec.samples; - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - BEOSAUDIO_CloseDevice(_this); - SDL_SetError("Unsupported audio format"); - return 0; - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&_this->spec); - - /* Subscribe to the audio stream (creates a new thread) */ - sigset_t omask; - SDL_MaskSignals(&omask); - _this->hidden->audio_obj = new BSoundPlayer(&format, "SDL Audio", - FillSound, NULL, _this); - SDL_UnmaskSignals(&omask); - - if (_this->hidden->audio_obj->Start() == B_NO_ERROR) { - _this->hidden->audio_obj->SetHasData(true); - } else { - BEOSAUDIO_CloseDevice(_this); - SDL_SetError("Unable to start Be audio"); - return 0; - } - - /* We're running! */ - return 1; -} - -static void -BEOSAUDIO_Deinitialize(void) -{ - SDL_QuitBeApp(); -} - -static int -BEOSAUDIO_Init(SDL_AudioDriverImpl * impl) -{ - /* Initialize the Be Application, if it's not already started */ - if (SDL_InitBeApp() < 0) { - return 0; - } - - /* Set the function pointers */ - impl->OpenDevice = BEOSAUDIO_OpenDevice; - impl->CloseDevice = BEOSAUDIO_CloseDevice; - impl->Deinitialize = BEOSAUDIO_Deinitialize; - impl->ProvidesOwnCallbackThread = 1; - impl->OnlyHasDefaultOutputDevice = 1; - - return 1; /* this audio target is available. */ -} - -extern "C" -{ - extern AudioBootStrap BEOSAUDIO_bootstrap; -} -AudioBootStrap BEOSAUDIO_bootstrap = { - "baudio", "BeOS BSoundPlayer", BEOSAUDIO_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.h b/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.h deleted file mode 100644 index bca6616b0..000000000 --- a/src/helper/android/SDL1.3/src/audio/baudio/SDL_beaudio.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_beaudio_h -#define _SDL_beaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *_this - -struct SDL_PrivateAudioData -{ - BSoundPlayer *audio_obj; -}; - -#endif /* _SDL_beaudio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.c b/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.c deleted file mode 100644 index a90dbc746..000000000 --- a/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.c +++ /dev/null @@ -1,456 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* - * Driver for native OpenBSD/NetBSD audio(4). - * vedge@vedge.com.ar. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_bsdaudio.h" - -/* The tag name used by NetBSD/OpenBSD audio */ -#ifdef __NetBSD__ -#define BSD_AUDIO_DRIVER_NAME "netbsd" -#define BSD_AUDIO_DRIVER_DESC "Native NetBSD audio" -#else -#define BSD_AUDIO_DRIVER_NAME "openbsd" -#define BSD_AUDIO_DRIVER_DESC "Native OpenBSD audio" -#endif - -/* Open the audio device for playback, and don't block if busy */ -/* #define USE_BLOCKING_WRITES */ - -/* Use timer for synchronization */ -/* #define USE_TIMER_SYNC */ - -/* #define DEBUG_AUDIO */ -/* #define DEBUG_AUDIO_STREAM */ - -#ifdef USE_BLOCKING_WRITES -#define OPEN_FLAGS_OUTPUT O_WRONLY -#define OPEN_FLAGS_INPUT O_RDONLY -#else -#define OPEN_FLAGS_OUTPUT (O_WRONLY|O_NONBLOCK) -#define OPEN_FLAGS_INPUT (O_RDONLY|O_NONBLOCK) -#endif - -/* !!! FIXME: so much cut and paste with dsp/dma drivers... */ -static char **outputDevices = NULL; -static int outputDeviceCount = 0; -static char **inputDevices = NULL; -static int inputDeviceCount = 0; - -static inline void -free_device_list(char ***devs, int *count) -{ - SDL_FreeUnixAudioDevices(devs, count); -} - -static inline void -build_device_list(int iscapture, char ***devs, int *count) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - free_device_list(devs, count); - SDL_EnumUnixAudioDevices(flags, 0, NULL, devs, count); -} - -static inline void -build_device_lists(void) -{ - build_device_list(0, &outputDevices, &outputDeviceCount); - build_device_list(1, &inputDevices, &inputDeviceCount); -} - - -static inline void -free_device_lists(void) -{ - free_device_list(&outputDevices, &outputDeviceCount); - free_device_list(&inputDevices, &inputDeviceCount); -} - - -static void -BSDAUDIO_Deinitialize(void) -{ - free_device_lists(); -} - - -static int -BSDAUDIO_DetectDevices(int iscapture) -{ - if (iscapture) { - build_device_list(1, &inputDevices, &inputDeviceCount); - return inputDeviceCount; - } else { - build_device_list(0, &outputDevices, &outputDeviceCount); - return outputDeviceCount; - } - - return 0; /* shouldn't ever hit this. */ -} - -static const char * -BSDAUDIO_GetDeviceName(int index, int iscapture) -{ - if ((iscapture) && (index < inputDeviceCount)) { - return inputDevices[index]; - } else if ((!iscapture) && (index < outputDeviceCount)) { - return outputDevices[index]; - } - - SDL_SetError("No such device"); - return NULL; -} - - -static void -BSDAUDIO_Status(_THIS) -{ -#ifdef DEBUG_AUDIO - /* *INDENT-OFF* */ - audio_info_t info; - - if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) { - fprintf(stderr, "AUDIO_GETINFO failed.\n"); - return; - } - fprintf(stderr, "\n" - "[play/record info]\n" - "buffer size : %d bytes\n" - "sample rate : %i Hz\n" - "channels : %i\n" - "precision : %i-bit\n" - "encoding : 0x%x\n" - "seek : %i\n" - "sample count : %i\n" - "EOF count : %i\n" - "paused : %s\n" - "error occured : %s\n" - "waiting : %s\n" - "active : %s\n" - "", - info.play.buffer_size, - info.play.sample_rate, - info.play.channels, - info.play.precision, - info.play.encoding, - info.play.seek, - info.play.samples, - info.play.eof, - info.play.pause ? "yes" : "no", - info.play.error ? "yes" : "no", - info.play.waiting ? "yes" : "no", - info.play.active ? "yes" : "no"); - - fprintf(stderr, "\n" - "[audio info]\n" - "monitor_gain : %i\n" - "hw block size : %d bytes\n" - "hi watermark : %i\n" - "lo watermark : %i\n" - "audio mode : %s\n" - "", - info.monitor_gain, - info.blocksize, - info.hiwat, info.lowat, - (info.mode == AUMODE_PLAY) ? "PLAY" - : (info.mode = AUMODE_RECORD) ? "RECORD" - : (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL" : "?")); - /* *INDENT-ON* */ -#endif /* DEBUG_AUDIO */ -} - - -/* This function waits until it is possible to write a full sound buffer */ -static void -BSDAUDIO_WaitDevice(_THIS) -{ -#ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */ - /* See if we need to use timed audio synchronization */ - if (this->hidden->frame_ticks) { - /* Use timer for general audio synchronization */ - Sint32 ticks; - - ticks = - ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - - FUDGE_TICKS; - if (ticks > 0) { - SDL_Delay(ticks); - } - } else { - /* Use select() for audio synchronization */ - fd_set fdset; - struct timeval timeout; - - FD_ZERO(&fdset); - FD_SET(this->hidden->audio_fd, &fdset); - timeout.tv_sec = 10; - timeout.tv_usec = 0; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Waiting for audio to get ready\n"); -#endif - if (select(this->hidden->audio_fd + 1, NULL, &fdset, NULL, &timeout) - <= 0) { - const char *message = - "Audio timeout - buggy audio driver? (disabled)"; - /* In general we should never print to the screen, - but in this case we have no other way of letting - the user know what happened. - */ - fprintf(stderr, "SDL: %s\n", message); - this->enabled = 0; - /* Don't try to close - may hang */ - this->hidden->audio_fd = -1; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Done disabling audio\n"); -#endif - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Ready!\n"); -#endif - } -#endif /* !USE_BLOCKING_WRITES */ -} - -static void -BSDAUDIO_PlayDevice(_THIS) -{ - int written, p = 0; - - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - do { - written = write(this->hidden->audio_fd, - &this->hidden->mixbuf[p], this->hidden->mixlen - p); - - if (written > 0) - p += written; - if (written == -1 && errno != 0 && errno != EAGAIN && errno != EINTR) { - /* Non recoverable error has occurred. It should be reported!!! */ - perror("audio"); - break; - } - - if (p < written - || ((written < 0) && ((errno == 0) || (errno == EAGAIN)))) { - SDL_Delay(1); /* Let a little CPU time go by */ - } - } while (p < written); - - /* If timer synchronization is enabled, set the next write frame */ - if (this->hidden->frame_ticks) { - this->hidden->next_frame += this->hidden->frame_ticks; - } - - /* If we couldn't write, assume fatal error for now */ - if (written < 0) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static Uint8 * -BSDAUDIO_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static void -BSDAUDIO_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - -static int -BSDAUDIO_OpenDevice(_THIS, const char *devname, int iscapture) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - SDL_AudioFormat format = 0; - audio_info_t info; - - /* We don't care what the devname is...we'll try to open anything. */ - /* ...but default to first name in the list... */ - if (devname == NULL) { - if (((iscapture) && (inputDeviceCount == 0)) || - ((!iscapture) && (outputDeviceCount == 0))) { - SDL_SetError("No such audio device"); - return 0; - } - devname = ((iscapture) ? inputDevices[0] : outputDevices[0]); - } - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Open the audio device */ - this->hidden->audio_fd = open(devname, flags, 0); - if (this->hidden->audio_fd < 0) { - SDL_SetError("Couldn't open %s: %s", devname, strerror(errno)); - return 0; - } - - AUDIO_INITINFO(&info); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Set to play mode */ - info.mode = AUMODE_PLAY; - if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) < 0) { - BSDAUDIO_CloseDevice(this); - SDL_SetError("Couldn't put device into play mode"); - return 0; - } - - AUDIO_INITINFO(&info); - for (format = SDL_FirstAudioFormat(this->spec.format); - format; format = SDL_NextAudioFormat()) { - switch (format) { - case AUDIO_U8: - info.play.encoding = AUDIO_ENCODING_ULINEAR; - info.play.precision = 8; - break; - case AUDIO_S8: - info.play.encoding = AUDIO_ENCODING_SLINEAR; - info.play.precision = 8; - break; - case AUDIO_S16LSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_LE; - info.play.precision = 16; - break; - case AUDIO_S16MSB: - info.play.encoding = AUDIO_ENCODING_SLINEAR_BE; - info.play.precision = 16; - break; - case AUDIO_U16LSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_LE; - info.play.precision = 16; - break; - case AUDIO_U16MSB: - info.play.encoding = AUDIO_ENCODING_ULINEAR_BE; - info.play.precision = 16; - break; - default: - continue; - } - - if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == 0) { - break; - } - } - - if (!format) { - BSDAUDIO_CloseDevice(this); - SDL_SetError("No supported encoding for 0x%x", this->spec.format); - return 0; - } - - this->spec.format = format; - - AUDIO_INITINFO(&info); - info.play.channels = this->spec.channels; - if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == -1) { - this->spec.channels = 1; - } - AUDIO_INITINFO(&info); - info.play.sample_rate = this->spec.freq; - info.blocksize = this->spec.size; - info.hiwat = 5; - info.lowat = 3; - (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info); - (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info); - this->spec.freq = info.play.sample_rate; - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - BSDAUDIO_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - BSDAUDIO_Status(this); - - /* We're ready to rock and roll. :-) */ - return (0); -} - -static int -BSDAUDIO_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->DetectDevices = BSDAUDIO_DetectDevices; - impl->GetDeviceName = BSDAUDIO_GetDeviceName; - impl->OpenDevice = BSDAUDIO_OpenDevice; - impl->PlayDevice = BSDAUDIO_PlayDevice; - impl->WaitDevice = BSDAUDIO_WaitDevice; - impl->GetDeviceBuf = BSDAUDIO_GetDeviceBuf; - impl->CloseDevice = BSDAUDIO_CloseDevice; - impl->Deinitialize = BSDAUDIO_Deinitialize; - - build_device_lists(); - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap BSD_AUDIO_bootstrap = { - BSD_AUDIO_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC, BSDAUDIO_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.h b/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.h deleted file mode 100644 index 2dea419f6..000000000 --- a/src/helper/android/SDL1.3/src/audio/bsd/SDL_bsdaudio.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_bsdaudio_h -#define _SDL_bsdaudio_h - -#include "../SDL_sysaudio.h" - -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; - -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -#endif /* _SDL_bsdaudio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.c b/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.c deleted file mode 100644 index f054fc4c2..000000000 --- a/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This file written by Ryan C. Gordon (icculus@icculus.org) -*/ -#include "SDL_config.h" - -/* Output raw audio data to a file. */ - -#if HAVE_STDIO_H -#include -#endif - -#include "SDL_rwops.h" -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_diskaudio.h" - -/* The tag name used by DISK audio */ -#define DISKAUD_DRIVER_NAME "disk" - -/* environment variables and defaults. */ -#define DISKENVR_OUTFILE "SDL_DISKAUDIOFILE" -#define DISKDEFAULT_OUTFILE "sdlaudio.raw" -#define DISKENVR_WRITEDELAY "SDL_DISKAUDIODELAY" -#define DISKDEFAULT_WRITEDELAY 150 - -static const char * -DISKAUD_GetOutputFilename(const char *devname) -{ - if (devname == NULL) { - devname = SDL_getenv(DISKENVR_OUTFILE); - if (devname == NULL) { - devname = DISKDEFAULT_OUTFILE; - } - } - return devname; -} - -/* This function waits until it is possible to write a full sound buffer */ -static void -DISKAUD_WaitDevice(_THIS) -{ - SDL_Delay(this->hidden->write_delay); -} - -static void -DISKAUD_PlayDevice(_THIS) -{ - size_t written; - - /* Write the audio data */ - written = SDL_RWwrite(this->hidden->output, - this->hidden->mixbuf, 1, this->hidden->mixlen); - - /* If we couldn't write, assume fatal error for now */ - if (written != this->hidden->mixlen) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", written); -#endif -} - -static Uint8 * -DISKAUD_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static void -DISKAUD_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->output != NULL) { - SDL_RWclose(this->hidden->output); - this->hidden->output = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - -static int -DISKAUD_OpenDevice(_THIS, const char *devname, int iscapture) -{ - const char *envr = SDL_getenv(DISKENVR_WRITEDELAY); - const char *fname = DISKAUD_GetOutputFilename(devname); - - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc(sizeof(*this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, sizeof(*this->hidden)); - - /* Open the audio device */ - this->hidden->output = SDL_RWFromFile(fname, "wb"); - if (this->hidden->output == NULL) { - DISKAUD_CloseDevice(this); - return 0; - } - - /* Allocate mixing buffer */ - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - DISKAUD_CloseDevice(this); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - this->hidden->mixlen = this->spec.size; - this->hidden->write_delay = - (envr) ? SDL_atoi(envr) : DISKDEFAULT_WRITEDELAY; - -#if HAVE_STDIO_H - fprintf(stderr, - "WARNING: You are using the SDL disk writer audio driver!\n" - " Writing to file [%s].\n", fname); -#endif - - /* We're ready to rock and roll. :-) */ - return 1; -} - -static int -DISKAUD_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->OpenDevice = DISKAUD_OpenDevice; - impl->WaitDevice = DISKAUD_WaitDevice; - impl->PlayDevice = DISKAUD_PlayDevice; - impl->GetDeviceBuf = DISKAUD_GetDeviceBuf; - impl->CloseDevice = DISKAUD_CloseDevice; - - return 1; /* this audio target is available. */ -} - -AudioBootStrap DISKAUD_bootstrap = { - DISKAUD_DRIVER_NAME, "direct-to-disk audio", DISKAUD_Init, 1 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.h b/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.h deleted file mode 100644 index 501c709fe..000000000 --- a/src/helper/android/SDL1.3/src/audio/disk/SDL_diskaudio.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_diskaudio_h -#define _SDL_diskaudio_h - -#include "SDL_rwops.h" -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - SDL_RWops *output; - Uint8 *mixbuf; - Uint32 mixlen; - Uint32 write_delay; -}; - -#endif /* _SDL_diskaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.c b/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.c deleted file mode 100644 index 4e867bf6c..000000000 --- a/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.c +++ /dev/null @@ -1,535 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* !!! FIXME: merge this driver with "dsp". */ - -/* Allow access to a raw mixing buffer */ - -#include -#include /* For strerror() */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H -/* This is installed on some systems */ -#include -#else -/* This is recommended by OSS */ -#include -#endif - -#ifndef MAP_FAILED -#define MAP_FAILED ((Uint8 *)-1) -#endif - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_dmaaudio.h" - -/* The tag name used by DMA audio */ -#define DMA_DRIVER_NAME "dma" - -/* Open the audio device for playback, and don't block if busy */ -#define OPEN_FLAGS_INPUT (O_RDWR|O_NONBLOCK) -#define OPEN_FLAGS_OUTPUT (O_RDWR|O_NONBLOCK) - -static char **outputDevices = NULL; -static int outputDeviceCount = 0; -static char **inputDevices = NULL; -static int inputDeviceCount = 0; - -static int -test_for_mmap(int fd) -{ - int caps = 0; - struct audio_buf_info info; - if ((ioctl(fd, SNDCTL_DSP_GETCAPS, &caps) == 0) && - (caps & DSP_CAP_TRIGGER) && (caps & DSP_CAP_MMAP) && - (ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) == 0)) { - size_t len = info.fragstotal * info.fragsize; - Uint8 *buf = (Uint8 *) mmap(NULL, len, PROT_WRITE, MAP_SHARED, fd, 0); - if (buf != MAP_FAILED) { - munmap(buf, len); - return 1; - } - } - return 0; -} - - -static inline void -free_device_list(char ***devs, int *count) -{ - SDL_FreeUnixAudioDevices(devs, count); -} - -static inline void -build_device_list(int iscapture, char ***devs, int *count) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - free_device_list(devs, count); - SDL_EnumUnixAudioDevices(flags, 0, test_for_mmap, devs, count); -} - -static inline void -build_device_lists(void) -{ - build_device_list(0, &outputDevices, &outputDeviceCount); - build_device_list(1, &inputDevices, &inputDeviceCount); -} - - -static inline void -free_device_lists(void) -{ - free_device_list(&outputDevices, &outputDeviceCount); - free_device_list(&inputDevices, &inputDeviceCount); -} - - -static void -DMA_Deinitialize(void) -{ - free_device_lists(); -} - -static int -DMA_DetectDevices(int iscapture) -{ - if (iscapture) { - build_device_list(1, &inputDevices, &inputDeviceCount); - return inputDeviceCount; - } else { - build_device_list(0, &outputDevices, &outputDeviceCount); - return outputDeviceCount; - } - - return 0; /* shouldn't ever hit this. */ -} - - -static const char * -DMA_GetDeviceName(int index, int iscapture) -{ - if ((iscapture) && (index < inputDeviceCount)) { - return inputDevices[index]; - } else if ((!iscapture) && (index < outputDeviceCount)) { - return outputDevices[index]; - } - - SDL_SetError("No such device"); - return NULL; -} - - -static int -DMA_ReopenAudio(_THIS, const char *audiodev, int format, int stereo) -{ - int frag_spec; - int value; - - /* Close and then reopen the audio device */ - close(audio_fd); - audio_fd = open(audiodev, O_RDWR, 0); - if (audio_fd < 0) { - SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno)); - return (-1); - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Determine the power of two of the fragment size */ - for (frag_spec = 0; (0x01 << frag_spec) < this->spec.size; ++frag_spec); - if ((0x01 << frag_spec) != this->spec.size) { - SDL_SetError("Fragment size must be a power of two"); - return (-1); - } - - /* Set the audio buffering parameters */ - if (ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0) { - SDL_SetError("Couldn't set audio fragment spec"); - return (-1); - } - - /* Set the audio format */ - value = format; - if ((ioctl(audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || (value != format)) { - SDL_SetError("Couldn't set audio format"); - return (-1); - } - - /* Set mono or stereo audio */ - value = (this->spec.channels > 1); - if ((ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo) < 0) || - (value != stereo)) { - SDL_SetError("Couldn't set audio channels"); - return (-1); - } - - /* Set the DSP frequency */ - value = this->spec.freq; - if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0) { - SDL_SetError("Couldn't set audio frequency"); - return (-1); - } - this->spec.freq = value; - - /* We successfully re-opened the audio */ - return (0); -} - - -static void -DMA_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (dma_buf != NULL) { - munmap(dma_buf, dma_len); - dma_buf = NULL; - } - if (audio_fd >= 0) { - close(audio_fd); - audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -static int -DMA_OpenDevice(_THIS, const char *devname, int iscapture) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - int format; - int stereo; - int value; - SDL_AudioFormat test_format; - struct audio_buf_info info; - - /* We don't care what the devname is...we'll try to open anything. */ - /* ...but default to first name in the list... */ - if (devname == NULL) { - if (((iscapture) && (inputDeviceCount == 0)) || - ((!iscapture) && (outputDeviceCount == 0))) { - SDL_SetError("No such audio device"); - return 0; - } - devname = ((iscapture) ? inputDevices[0] : outputDevices[0]); - } - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Open the audio device */ - audio_fd = open(devname, flags, 0); - if (audio_fd < 0) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't open %s: %s", devname, strerror(errno)); - return 0; - } - dma_buf = NULL; - ioctl(audio_fd, SNDCTL_DSP_RESET, 0); - - /* Get a list of supported hardware formats */ - if (ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't get audio format list"); - return 0; - } - - /* Try for a closest match on audio format */ - format = 0; - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !format && test_format;) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch (test_format) { - case AUDIO_U8: - if (value & AFMT_U8) { - format = AFMT_U8; - } - break; - case AUDIO_S8: - if (value & AFMT_S8) { - format = AFMT_S8; - } - break; - case AUDIO_S16LSB: - if (value & AFMT_S16_LE) { - format = AFMT_S16_LE; - } - break; - case AUDIO_S16MSB: - if (value & AFMT_S16_BE) { - format = AFMT_S16_BE; - } - break; - case AUDIO_U16LSB: - if (value & AFMT_U16_LE) { - format = AFMT_U16_LE; - } - break; - case AUDIO_U16MSB: - if (value & AFMT_U16_BE) { - format = AFMT_U16_BE; - } - break; - default: - format = 0; - break; - } - if (!format) { - test_format = SDL_NextAudioFormat(); - } - } - if (format == 0) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - /* Set the audio format */ - value = format; - if ((ioctl(audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || (value != format)) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't set audio format"); - return 0; - } - - /* Set mono or stereo audio (currently only two channels supported) */ - stereo = (this->spec.channels > 1); - ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo); - if (stereo) { - this->spec.channels = 2; - } else { - this->spec.channels = 1; - } - - /* Because some drivers don't allow setting the buffer size - after setting the format, we must re-open the audio device - once we know what format and channels are supported - */ - if (DMA_ReopenAudio(this, devname, format, stereo) < 0) { - DMA_CloseDevice(this); - /* Error is set by DMA_ReopenAudio() */ - return 0; - } - - /* Memory map the audio buffer */ - if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) < 0) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't get OSPACE parameters"); - return 0; - } - this->spec.size = info.fragsize; - this->spec.samples = this->spec.size / ((this->spec.format & 0xFF) / 8); - this->spec.samples /= this->spec.channels; - num_buffers = info.fragstotal; - dma_len = num_buffers * this->spec.size; - dma_buf = (Uint8 *) mmap(NULL, dma_len, PROT_WRITE, MAP_SHARED, - audio_fd, 0); - if (dma_buf == MAP_FAILED) { - DMA_CloseDevice(this); - SDL_SetError("DMA memory map failed"); - dma_buf = NULL; - return 0; - } - SDL_memset(dma_buf, this->spec.silence, dma_len); - - /* Check to see if we need to use select() workaround */ - { - char *workaround; - workaround = SDL_getenv("SDL_DSP_NOSELECT"); - if (workaround) { - frame_ticks = - (float) (this->spec.samples * 1000) / this->spec.freq; - next_frame = SDL_GetTicks() + frame_ticks; - } - } - - /* Trigger audio playback */ - value = 0; - ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &value); - value = PCM_ENABLE_OUTPUT; - if (ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &value) < 0) { - DMA_CloseDevice(this); - SDL_SetError("Couldn't trigger audio output"); - return 0; - } - - /* Get the parent process id (we're the parent of the audio thread) */ - parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return 1; -} - - -/* This function waits until it is possible to write a full sound buffer */ -static void -DMA_WaitDevice(_THIS) -{ - fd_set fdset; - - /* Check to see if the thread-parent process is still alive */ - { - static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - if (parent && (((++cnt) % 10) == 0)) { /* Check every 10 loops */ - if (kill(parent, 0) < 0 && errno == ESRCH) { - this->enabled = 0; - } - } - } - - /* See if we need to use timed audio synchronization */ - if (frame_ticks) { - /* Use timer for general audio synchronization */ - Sint32 ticks; - - ticks = ((Sint32) (next_frame - SDL_GetTicks())) - FUDGE_TICKS; - if (ticks > 0) { - SDL_Delay(ticks); - } - } else { - /* Use select() for audio synchronization */ - struct timeval timeout; - FD_ZERO(&fdset); - FD_SET(audio_fd, &fdset); - timeout.tv_sec = 10; - timeout.tv_usec = 0; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Waiting for audio to get ready\n"); -#endif - if (select(audio_fd + 1, NULL, &fdset, NULL, &timeout) <= 0) { - const char *message = -#ifdef AUDIO_OSPACE_HACK - "Audio timeout - buggy audio driver? (trying ospace)"; -#else - "Audio timeout - buggy audio driver? (disabled)"; -#endif - /* In general we should never print to the screen, - but in this case we have no other way of letting - the user know what happened. - */ - fprintf(stderr, "SDL: %s\n", message); -#ifdef AUDIO_OSPACE_HACK - /* We may be able to use GET_OSPACE trick */ - frame_ticks = (float) (this->spec.samples * 1000) / - this->spec.freq; - next_frame = SDL_GetTicks() + frame_ticks; -#else - this->enabled = 0; - /* Don't try to close - may hang */ - audio_fd = -1; -#ifdef DEBUG_AUDIO - fprintf(stderr, "Done disabling audio\n"); -#endif -#endif /* AUDIO_OSPACE_HACK */ - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Ready!\n"); -#endif - } -} - -static void -DMA_PlayDevice(_THIS) -{ - /* If timer synchronization is enabled, set the next write frame */ - if (frame_ticks) { - next_frame += frame_ticks; - } - return; -} - -static Uint8 * -DMA_GetDeviceBuf(_THIS) -{ - count_info info; - int playing; - int filling; - - /* Get number of blocks, looping if we're not using select() */ - do { - if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &info) < 0) { - /* Uh oh... */ - this->enabled = 0; - return (NULL); - } - } while (frame_ticks && (info.blocks < 1)); -#ifdef DEBUG_AUDIO - if (info.blocks > 1) { - printf("Warning: audio underflow (%d frags)\n", info.blocks - 1); - } -#endif - playing = info.ptr / this->spec.size; - filling = (playing + 1) % num_buffers; - return (dma_buf + (filling * this->spec.size)); -} - - -static int -DMA_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->DetectDevices = DMA_DetectDevices; - impl->GetDeviceName = DMA_GetDeviceName; - impl->OpenDevice = DMA_OpenDevice; - impl->WaitDevice = DMA_WaitDevice; - impl->PlayDevice = DMA_PlayDevice; - impl->GetDeviceBuf = DMA_GetDeviceBuf; - impl->CloseDevice = DMA_CloseDevice; - impl->Deinitialize = DMA_Deinitialize; - - build_device_lists(); - - return 1; /* this audio target is available. */ -} - -AudioBootStrap DMA_bootstrap = { - DMA_DRIVER_NAME, "OSS /dev/dsp DMA audio", DMA_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.h b/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.h deleted file mode 100644 index 022ff8530..000000000 --- a/src/helper/android/SDL1.3/src/audio/dma/SDL_dmaaudio.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dmaaudio_h -#define _SDL_dmaaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *dma_buf; - int dma_len; - int num_buffers; - - /* Support for audio timing using a timer, in addition to select() */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -/* Old variable names */ -/* !!! FIXME: remove these. */ -#define audio_fd (this->hidden->audio_fd) -#define parent (this->hidden->parent) -#define dma_buf (this->hidden->dma_buf) -#define dma_len (this->hidden->dma_len) -#define num_buffers (this->hidden->num_buffers) -#define frame_ticks (this->hidden->frame_ticks) -#define next_frame (this->hidden->next_frame) - -#endif /* _SDL_dmaaudio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.c b/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.c deleted file mode 100644 index 2321f9507..000000000 --- a/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.c +++ /dev/null @@ -1,393 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - Modified in Oct 2004 by Hannu Savolainen - hannu@opensound.com -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include /* For perror() */ -#include /* For strerror() */ -#include -#include -#include -#include -#include -#include -#include - -#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H -/* This is installed on some systems */ -#include -#else -/* This is recommended by OSS */ -#include -#endif - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "../SDL_audiodev_c.h" -#include "SDL_dspaudio.h" - -/* The tag name used by DSP audio */ -#define DSP_DRIVER_NAME "dsp" - -/* Open the audio device for playback, and don't block if busy */ -#define OPEN_FLAGS_OUTPUT (O_WRONLY|O_NONBLOCK) -#define OPEN_FLAGS_INPUT (O_RDONLY|O_NONBLOCK) - -static char **outputDevices = NULL; -static int outputDeviceCount = 0; -static char **inputDevices = NULL; -static int inputDeviceCount = 0; - -static inline void -free_device_list(char ***devs, int *count) -{ - SDL_FreeUnixAudioDevices(devs, count); -} - -static inline void -build_device_list(int iscapture, char ***devs, int *count) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - free_device_list(devs, count); - SDL_EnumUnixAudioDevices(flags, 0, NULL, devs, count); -} - -static inline void -build_device_lists(void) -{ - build_device_list(0, &outputDevices, &outputDeviceCount); - build_device_list(1, &inputDevices, &inputDeviceCount); -} - - -static inline void -free_device_lists(void) -{ - free_device_list(&outputDevices, &outputDeviceCount); - free_device_list(&inputDevices, &inputDeviceCount); -} - - -static void -DSP_Deinitialize(void) -{ - free_device_lists(); -} - - -static int -DSP_DetectDevices(int iscapture) -{ - if (iscapture) { - build_device_list(1, &inputDevices, &inputDeviceCount); - return inputDeviceCount; - } else { - build_device_list(0, &outputDevices, &outputDeviceCount); - return outputDeviceCount; - } - - return 0; /* shouldn't ever hit this. */ -} - -static const char * -DSP_GetDeviceName(int index, int iscapture) -{ - if ((iscapture) && (index < inputDeviceCount)) { - return inputDevices[index]; - } else if ((!iscapture) && (index < outputDeviceCount)) { - return outputDevices[index]; - } - - SDL_SetError("No such device"); - return NULL; -} - - -static void -DSP_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->audio_fd >= 0) { - close(this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -static int -DSP_OpenDevice(_THIS, const char *devname, int iscapture) -{ - const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); - int format; - int value; - int frag_spec; - SDL_AudioFormat test_format; - - /* We don't care what the devname is...we'll try to open anything. */ - /* ...but default to first name in the list... */ - if (devname == NULL) { - if (((iscapture) && (inputDeviceCount == 0)) || - ((!iscapture) && (outputDeviceCount == 0))) { - SDL_SetError("No such audio device"); - return 0; - } - devname = ((iscapture) ? inputDevices[0] : outputDevices[0]); - } - - /* Make sure fragment size stays a power of 2, or OSS fails. */ - /* I don't know which of these are actually legal values, though... */ - if (this->spec.channels > 8) - this->spec.channels = 8; - else if (this->spec.channels > 4) - this->spec.channels = 4; - else if (this->spec.channels > 2) - this->spec.channels = 2; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Open the audio device */ - this->hidden->audio_fd = open(devname, flags, 0); - if (this->hidden->audio_fd < 0) { - DSP_CloseDevice(this); - SDL_SetError("Couldn't open %s: %s", devname, strerror(errno)); - return 0; - } - this->hidden->mixbuf = NULL; - - /* Make the file descriptor use blocking writes with fcntl() */ - { - long ctlflags; - ctlflags = fcntl(this->hidden->audio_fd, F_GETFL); - ctlflags &= ~O_NONBLOCK; - if (fcntl(this->hidden->audio_fd, F_SETFL, ctlflags) < 0) { - DSP_CloseDevice(this); - SDL_SetError("Couldn't set audio blocking mode"); - return 0; - } - } - - /* Get a list of supported hardware formats */ - if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0) { - perror("SNDCTL_DSP_GETFMTS"); - DSP_CloseDevice(this); - SDL_SetError("Couldn't get audio format list"); - return 0; - } - - /* Try for a closest match on audio format */ - format = 0; - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !format && test_format;) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch (test_format) { - case AUDIO_U8: - if (value & AFMT_U8) { - format = AFMT_U8; - } - break; - case AUDIO_S16LSB: - if (value & AFMT_S16_LE) { - format = AFMT_S16_LE; - } - break; - case AUDIO_S16MSB: - if (value & AFMT_S16_BE) { - format = AFMT_S16_BE; - } - break; -#if 0 -/* - * These formats are not used by any real life systems so they are not - * needed here. - */ - case AUDIO_S8: - if (value & AFMT_S8) { - format = AFMT_S8; - } - break; - case AUDIO_U16LSB: - if (value & AFMT_U16_LE) { - format = AFMT_U16_LE; - } - break; - case AUDIO_U16MSB: - if (value & AFMT_U16_BE) { - format = AFMT_U16_BE; - } - break; -#endif - default: - format = 0; - break; - } - if (!format) { - test_format = SDL_NextAudioFormat(); - } - } - if (format == 0) { - DSP_CloseDevice(this); - SDL_SetError("Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - /* Set the audio format */ - value = format; - if ((ioctl(this->hidden->audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) || - (value != format)) { - perror("SNDCTL_DSP_SETFMT"); - DSP_CloseDevice(this); - SDL_SetError("Couldn't set audio format"); - return 0; - } - - /* Set the number of channels of output */ - value = this->spec.channels; - if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_CHANNELS, &value) < 0) { - perror("SNDCTL_DSP_CHANNELS"); - DSP_CloseDevice(this); - SDL_SetError("Cannot set the number of channels"); - return 0; - } - this->spec.channels = value; - - /* Set the DSP frequency */ - value = this->spec.freq; - if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_SPEED, &value) < 0) { - perror("SNDCTL_DSP_SPEED"); - DSP_CloseDevice(this); - SDL_SetError("Couldn't set audio frequency"); - return 0; - } - this->spec.freq = value; - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Determine the power of two of the fragment size */ - for (frag_spec = 0; (0x01U << frag_spec) < this->spec.size; ++frag_spec); - if ((0x01U << frag_spec) != this->spec.size) { - DSP_CloseDevice(this); - SDL_SetError("Fragment size must be a power of two"); - return 0; - } - frag_spec |= 0x00020000; /* two fragments, for low latency */ - - /* Set the audio buffering parameters */ -#ifdef DEBUG_AUDIO - fprintf(stderr, "Requesting %d fragments of size %d\n", - (frag_spec >> 16), 1 << (frag_spec & 0xFFFF)); -#endif - if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0) { - perror("SNDCTL_DSP_SETFRAGMENT"); - } -#ifdef DEBUG_AUDIO - { - audio_buf_info info; - ioctl(this->hidden->audio_fd, SNDCTL_DSP_GETOSPACE, &info); - fprintf(stderr, "fragments = %d\n", info.fragments); - fprintf(stderr, "fragstotal = %d\n", info.fragstotal); - fprintf(stderr, "fragsize = %d\n", info.fragsize); - fprintf(stderr, "bytes = %d\n", info.bytes); - } -#endif - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - DSP_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* We're ready to rock and roll. :-) */ - return 1; -} - - -static void -DSP_PlayDevice(_THIS) -{ - const Uint8 *mixbuf = this->hidden->mixbuf; - const int mixlen = this->hidden->mixlen; - if (write(this->hidden->audio_fd, mixbuf, mixlen) == -1) { - perror("Audio write"); - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", mixlen); -#endif -} - -static Uint8 * -DSP_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static int -DSP_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->DetectDevices = DSP_DetectDevices; - impl->GetDeviceName = DSP_GetDeviceName; - impl->OpenDevice = DSP_OpenDevice; - impl->PlayDevice = DSP_PlayDevice; - impl->GetDeviceBuf = DSP_GetDeviceBuf; - impl->CloseDevice = DSP_CloseDevice; - impl->Deinitialize = DSP_Deinitialize; - - build_device_lists(); - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap DSP_bootstrap = { - DSP_DRIVER_NAME, "OSS /dev/dsp standard audio", DSP_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.h b/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.h deleted file mode 100644 index 7c1757b0d..000000000 --- a/src/helper/android/SDL1.3/src/audio/dsp/SDL_dspaudio.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dspaudio_h -#define _SDL_dspaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - int audio_fd; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -#endif /* _SDL_dspaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.c b/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.c deleted file mode 100644 index 943cfde3f..000000000 --- a/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This file written by Ryan C. Gordon (icculus@icculus.org) -*/ -#include "SDL_config.h" - -/* Output audio to nowhere... */ - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "SDL_dummyaudio.h" - -static int -DUMMYAUD_OpenDevice(_THIS, const char *devname, int iscapture) -{ - return 1; /* always succeeds. */ -} - -static int -DUMMYAUD_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->OpenDevice = DUMMYAUD_OpenDevice; - impl->OnlyHasDefaultOutputDevice = 1; - return 1; /* this audio target is available. */ -} - -AudioBootStrap DUMMYAUD_bootstrap = { - "dummy", "SDL dummy audio driver", DUMMYAUD_Init, 1 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.h b/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.h deleted file mode 100644 index 9bff4ed91..000000000 --- a/src/helper/android/SDL1.3/src/audio/dummy/SDL_dummyaudio.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_dummyaudio_h -#define _SDL_dummyaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - Uint8 *mixbuf; - Uint32 mixlen; - Uint32 write_delay; - Uint32 initial_calls; -}; - -#endif /* _SDL_dummyaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.c b/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.c deleted file mode 100644 index b7bd2ba51..000000000 --- a/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.c +++ /dev/null @@ -1,352 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to an ESD network stream mixing buffer */ - -#include -#include -#include -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_esdaudio.h" - -#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - -/* The tag name used by ESD audio */ -#define ESD_DRIVER_NAME "esd" - -#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC - -static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC; -static void *esd_handle = NULL; - -static int (*SDL_NAME(esd_open_sound)) (const char *host); -static int (*SDL_NAME(esd_close)) (int esd); -static int (*SDL_NAME(esd_play_stream)) (esd_format_t format, int rate, - const char *host, const char *name); - -#define SDL_ESD_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) } -static struct -{ - const char *name; - void **func; -} const esd_functions[] = { - SDL_ESD_SYM(esd_open_sound), - SDL_ESD_SYM(esd_close), SDL_ESD_SYM(esd_play_stream), -}; - -#undef SDL_ESD_SYM - -static void -UnloadESDLibrary() -{ - if (esd_handle != NULL) { - SDL_UnloadObject(esd_handle); - esd_handle = NULL; - } -} - -static int -LoadESDLibrary(void) -{ - int i, retval = -1; - - if (esd_handle == NULL) { - esd_handle = SDL_LoadObject(esd_library); - if (esd_handle) { - retval = 0; - for (i = 0; i < SDL_arraysize(esd_functions); ++i) { - *esd_functions[i].func = - SDL_LoadFunction(esd_handle, esd_functions[i].name); - if (!*esd_functions[i].func) { - retval = -1; - UnloadESDLibrary(); - break; - } - } - } - } - return retval; -} - -#else - -static void -UnloadESDLibrary() -{ - return; -} - -static int -LoadESDLibrary(void) -{ - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_ESD_DYNAMIC */ - - -/* This function waits until it is possible to write a full sound buffer */ -static void -ESD_WaitDevice(_THIS) -{ - Sint32 ticks; - - /* Check to see if the thread-parent process is still alive */ - { - static int cnt = 0; - /* Note that this only works with thread implementations - that use a different process id for each thread. - */ - /* Check every 10 loops */ - if (this->hidden->parent && (((++cnt) % 10) == 0)) { - if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) { - this->enabled = 0; - } - } - } - - /* Use timer for general audio synchronization */ - ticks = - ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS; - if (ticks > 0) { - SDL_Delay(ticks); - } -} - -static void -ESD_PlayDevice(_THIS) -{ - int written = 0; - - /* Write the audio data, checking for EAGAIN on broken audio drivers */ - do { - written = write(this->hidden->audio_fd, - this->hidden->mixbuf, this->hidden->mixlen); - if ((written < 0) && ((errno == 0) || (errno == EAGAIN))) { - SDL_Delay(1); /* Let a little CPU time go by */ - } - } while ((written < 0) && - ((errno == 0) || (errno == EAGAIN) || (errno == EINTR))); - - /* Set the next write frame */ - this->hidden->next_frame += this->hidden->frame_ticks; - - /* If we couldn't write, assume fatal error for now */ - if (written < 0) { - this->enabled = 0; - } -} - -static Uint8 * -ESD_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static void -ESD_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->audio_fd >= 0) { - SDL_NAME(esd_close) (this->hidden->audio_fd); - this->hidden->audio_fd = -1; - } - - SDL_free(this->hidden); - this->hidden = NULL; - } -} - -/* Try to get the name of the program */ -static char * -get_progname(void) -{ - char *progname = NULL; -#ifdef __LINUX__ - FILE *fp; - static char temp[BUFSIZ]; - - SDL_snprintf(temp, SDL_arraysize(temp), "/proc/%d/cmdline", getpid()); - fp = fopen(temp, "r"); - if (fp != NULL) { - if (fgets(temp, sizeof(temp) - 1, fp)) { - progname = SDL_strrchr(temp, '/'); - if (progname == NULL) { - progname = temp; - } else { - progname = progname + 1; - } - } - fclose(fp); - } -#endif - return (progname); -} - - -static int -ESD_OpenDevice(_THIS, const char *devname, int iscapture) -{ - esd_format_t format = (ESD_STREAM | ESD_PLAY); - SDL_AudioFormat test_format = 0; - int found = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - this->hidden->audio_fd = -1; - - /* Convert audio spec to the ESD audio format */ - /* Try for a closest match on audio format */ - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !found && test_format; test_format = SDL_NextAudioFormat()) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - found = 1; - switch (test_format) { - case AUDIO_U8: - format |= ESD_BITS8; - break; - case AUDIO_S16SYS: - format |= ESD_BITS16; - break; - default: - found = 0; - break; - } - } - - if (!found) { - ESD_CloseDevice(this); - SDL_SetError("Couldn't find any hardware audio formats"); - return 0; - } - - if (this->spec.channels == 1) { - format |= ESD_MONO; - } else { - format |= ESD_STEREO; - } -#if 0 - this->spec.samples = ESD_BUF_SIZE; /* Darn, no way to change this yet */ -#endif - - /* Open a connection to the ESD audio server */ - this->hidden->audio_fd = - SDL_NAME(esd_play_stream) (format, this->spec.freq, NULL, - get_progname()); - - if (this->hidden->audio_fd < 0) { - ESD_CloseDevice(this); - SDL_SetError("Couldn't open ESD connection"); - return 0; - } - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - this->hidden->frame_ticks = - (float) (this->spec.samples * 1000) / this->spec.freq; - this->hidden->next_frame = SDL_GetTicks() + this->hidden->frame_ticks; - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - ESD_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* Get the parent process id (we're the parent of the audio thread) */ - this->hidden->parent = getpid(); - - /* We're ready to rock and roll. :-) */ - return 1; -} - -static void -ESD_Deinitialize(void) -{ - UnloadESDLibrary(); -} - -static int -ESD_Init(SDL_AudioDriverImpl * impl) -{ - if (LoadESDLibrary() < 0) { - return 0; - } else { - int connection = 0; - - /* Don't start ESD if it's not running */ - SDL_setenv("ESD_NO_SPAWN", "1", 0); - - connection = SDL_NAME(esd_open_sound) (NULL); - if (connection < 0) { - UnloadESDLibrary(); - SDL_SetError("ESD: esd_open_sound failed (no audio server?)"); - return 0; - } - SDL_NAME(esd_close) (connection); - } - - /* Set the function pointers */ - impl->OpenDevice = ESD_OpenDevice; - impl->PlayDevice = ESD_PlayDevice; - impl->WaitDevice = ESD_WaitDevice; - impl->GetDeviceBuf = ESD_GetDeviceBuf; - impl->CloseDevice = ESD_CloseDevice; - impl->Deinitialize = ESD_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap ESD_bootstrap = { - ESD_DRIVER_NAME, "Enlightened Sound Daemon", ESD_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.h b/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.h deleted file mode 100644 index e1f430d4e..000000000 --- a/src/helper/android/SDL1.3/src/audio/esd/SDL_esdaudio.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_esdaudio_h -#define _SDL_esdaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* The file descriptor for the audio device */ - int audio_fd; - - /* The parent process id, to detect when application quits */ - pid_t parent; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - - /* Support for audio timing using a timer */ - float frame_ticks; - float next_frame; -}; -#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ - -#endif /* _SDL_esdaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.c b/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.c deleted file mode 100644 index 4c0247955..000000000 --- a/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.c +++ /dev/null @@ -1,351 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#ifdef HAVE_SIGNAL_H -#include -#endif -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_fsaudio.h" - -#include - -//#define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so" - -#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC -#include "SDL_name.h" -#include "SDL_loadso.h" -#else -#define SDL_NAME(X) X -#endif - -#if (FUSIONSOUND_MAJOR_VERSION == 1) && (FUSIONSOUND_MINOR_VERSION < 1) -typedef DFBResult DirectResult; -#endif - -/* The tag name used by fusionsoundc audio */ -#define SDL_FS_DRIVER_NAME "fusionsound" -/* Buffers to use - more than 2 gives a lot of latency */ -#define FUSION_BUFFERS (2) - -#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC - -static const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC; -static void *fs_handle = NULL; - -static DirectResult (*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[])); -static DirectResult (*SDL_NAME(FusionSoundCreate)) (IFusionSound ** - ret_interface); - -#define SDL_FS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) } -static struct -{ - const char *name; - void **func; -} fs_functions[] = { -/* *INDENT-OFF* */ - SDL_FS_SYM(FusionSoundInit), - SDL_FS_SYM(FusionSoundCreate), -/* *INDENT-ON* */ -}; - -#undef SDL_FS_SYM - -static void -UnloadFusionSoundLibrary() -{ - if (fs_handle != NULL) { - SDL_UnloadObject(fs_handle); - fs_handle = NULL; - } -} - -static int -LoadFusionSoundLibrary(void) -{ - int i, retval = -1; - - if (fs_handle == NULL) { - fs_handle = SDL_LoadObject(fs_library); - if (fs_handle != NULL) { - retval = 0; - for (i = 0; i < SDL_arraysize(fs_functions); ++i) { - *fs_functions[i].func = - SDL_LoadFunction(fs_handle, fs_functions[i].name); - if (!*fs_functions[i].func) { - retval = -1; - UnloadFusionSoundLibrary(); - break; - } - } - } - } - - return retval; -} - -#else - -static void -UnloadFusionSoundLibrary() -{ - return; -} - -static int -LoadFusionSoundLibrary(void) -{ - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */ - -/* This function waits until it is possible to write a full sound buffer */ -static void -SDL_FS_WaitDevice(_THIS) -{ - this->hidden->stream->Wait(this->hidden->stream, - this->hidden->mixsamples); -} - -static void -SDL_FS_PlayDevice(_THIS) -{ - DirectResult ret; - - ret = this->hidden->stream->Write(this->hidden->stream, - this->hidden->mixbuf, - this->hidden->mixsamples); - /* If we couldn't write, assume fatal error for now */ - if (ret) { - this->enabled = 0; - } -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen); -#endif -} - -static void -SDL_FS_WaitDone(_THIS) -{ - this->hidden->stream->Wait(this->hidden->stream, - this->hidden->mixsamples * FUSION_BUFFERS); -} - - -static Uint8 * -SDL_FS_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - - -static void -SDL_FS_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->stream) { - this->hidden->stream->Release(this->hidden->stream); - this->hidden->stream = NULL; - } - if (this->hidden->fs) { - this->hidden->fs->Release(this->hidden->fs); - this->hidden->fs = NULL; - } - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -static int -SDL_FS_OpenDevice(_THIS, const char *devname, int iscapture) -{ - int bytes; - SDL_AudioFormat test_format = 0, format = 0; - FSSampleFormat fs_format; - FSStreamDescription desc; - DirectResult ret; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Try for a closest match on audio format */ - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !format && test_format;) { -#ifdef DEBUG_AUDIO - fprintf(stderr, "Trying format 0x%4.4x\n", test_format); -#endif - switch (test_format) { - case AUDIO_U8: - fs_format = FSSF_U8; - bytes = 1; - format = 1; - break; - case AUDIO_S16SYS: - fs_format = FSSF_S16; - bytes = 2; - format = 1; - break; - case AUDIO_S32SYS: - fs_format = FSSF_S32; - bytes = 4; - format = 1; - break; - case AUDIO_F32SYS: - fs_format = FSSF_FLOAT; - bytes = 4; - format = 1; - break; - default: - format = 0; - break; - } - if (!format) { - test_format = SDL_NextAudioFormat(); - } - } - - if (format == 0) { - SDL_FS_CloseDevice(this); - SDL_SetError("Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - /* Retrieve the main sound interface. */ - ret = SDL_NAME(FusionSoundCreate) (&this->hidden->fs); - if (ret) { - SDL_FS_CloseDevice(this); - SDL_SetError("Unable to initialize FusionSound: %d", ret); - return 0; - } - - this->hidden->mixsamples = this->spec.size / bytes / this->spec.channels; - - /* Fill stream description. */ - desc.flags = FSSDF_SAMPLERATE | FSSDF_BUFFERSIZE | - FSSDF_CHANNELS | FSSDF_SAMPLEFORMAT | FSSDF_PREBUFFER; - desc.samplerate = this->spec.freq; - desc.buffersize = this->spec.size * FUSION_BUFFERS; - desc.channels = this->spec.channels; - desc.prebuffer = 10; - desc.sampleformat = fs_format; - - ret = - this->hidden->fs->CreateStream(this->hidden->fs, &desc, - &this->hidden->stream); - if (ret) { - SDL_FS_CloseDevice(this); - SDL_SetError("Unable to create FusionSoundStream: %d", ret); - return 0; - } - - /* See what we got */ - desc.flags = FSSDF_SAMPLERATE | FSSDF_BUFFERSIZE | - FSSDF_CHANNELS | FSSDF_SAMPLEFORMAT; - ret = this->hidden->stream->GetDescription(this->hidden->stream, &desc); - - this->spec.freq = desc.samplerate; - this->spec.size = - desc.buffersize / FUSION_BUFFERS * bytes * desc.channels; - this->spec.channels = desc.channels; - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - SDL_FS_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* We're ready to rock and roll. :-) */ - return 1; -} - - -static void -SDL_FS_Deinitialize(void) -{ - UnloadFusionSoundLibrary(); -} - - -static int -SDL_FS_Init(SDL_AudioDriverImpl * impl) -{ - if (LoadFusionSoundLibrary() < 0) { - return 0; - } else { - DirectResult ret; - - ret = SDL_NAME(FusionSoundInit) (NULL, NULL); - if (ret) { - UnloadFusionSoundLibrary(); - SDL_SetError - ("FusionSound: SDL_FS_init failed (FusionSoundInit: %d)", - ret); - return 0; - } - } - - /* Set the function pointers */ - impl->OpenDevice = SDL_FS_OpenDevice; - impl->PlayDevice = SDL_FS_PlayDevice; - impl->WaitDevice = SDL_FS_WaitDevice; - impl->GetDeviceBuf = SDL_FS_GetDeviceBuf; - impl->CloseDevice = SDL_FS_CloseDevice; - impl->WaitDone = SDL_FS_WaitDone; - impl->Deinitialize = SDL_FS_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; - - return 1; /* this audio target is available. */ -} - - -AudioBootStrap FUSIONSOUND_bootstrap = { - SDL_FS_DRIVER_NAME, "FusionSound", SDL_FS_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.h b/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.h deleted file mode 100644 index 40208b800..000000000 --- a/src/helper/android/SDL1.3/src/audio/fusionsound/SDL_fsaudio.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_fsaudio_h -#define _SDL_fsaudio_h - -#include - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - /* Interface */ - IFusionSound *fs; - - /* The stream interface for the audio device */ - IFusionSoundStream *stream; - - /* Raw mixing buffer */ - Uint8 *mixbuf; - int mixlen; - int mixsamples; - -}; - -#endif /* _SDL_fsaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c b/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c deleted file mode 100644 index ab30e5f16..000000000 --- a/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.c +++ /dev/null @@ -1,340 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "SDL_coreaudio_iphone.h" - -#define DEBUG_COREAUDIO 0 - -static void -COREAUDIO_Deinitialize(void) -{ -} - -/* The CoreAudio callback */ -static OSStatus -outputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioDataList) -{ - SDL_AudioDevice *this = (SDL_AudioDevice *) inRefCon; - AudioBuffer *ioData = &ioDataList->mBuffers[0]; - UInt32 remaining, len; - void *ptr; - - /* Is there ever more than one buffer, and what do you do with it? */ - if (ioDataList->mNumberBuffers != 1) { - return noErr; - } - - /* Only do anything if audio is enabled and not paused */ - if (!this->enabled || this->paused) { - SDL_memset(ioData->mData, this->spec.silence, ioData->mDataByteSize); - return 0; - } - - /* No SDL conversion should be needed here, ever, since we accept - any input format in OpenAudio, and leave the conversion to CoreAudio. - */ - /* - assert(!this->convert.needed); - assert(this->spec.channels == ioData->mNumberChannels); - */ - - remaining = ioData->mDataByteSize; - ptr = ioData->mData; - while (remaining > 0) { - if (this->hidden->bufferOffset >= this->hidden->bufferSize) { - /* Generate the data */ - SDL_memset(this->hidden->buffer, this->spec.silence, - this->hidden->bufferSize); - SDL_mutexP(this->mixer_lock); - (*this->spec.callback) (this->spec.userdata, this->hidden->buffer, - this->hidden->bufferSize); - SDL_mutexV(this->mixer_lock); - this->hidden->bufferOffset = 0; - } - - len = this->hidden->bufferSize - this->hidden->bufferOffset; - if (len > remaining) - len = remaining; - SDL_memcpy(ptr, - (char *) this->hidden->buffer + this->hidden->bufferOffset, - len); - ptr = (char *) ptr + len; - remaining -= len; - this->hidden->bufferOffset += len; - } - - return 0; -} - -static OSStatus -inputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioData) -{ - //err = AudioUnitRender(afr->fAudioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, afr->fAudioBuffer); - // !!! FIXME: write me! - return noErr; -} - - -static void -COREAUDIO_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->audioUnitOpened) { - OSStatus result = noErr; - AURenderCallbackStruct callback; - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const int iscapture = this->iscapture; - const AudioUnitElement bus = - ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = - ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); - - /* stop processing the audio unit */ - result = AudioOutputUnitStop(this->hidden->audioUnit); - - /* Remove the input callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, - sizeof(callback)); - - //CloseComponent(this->hidden->audioUnit); - this->hidden->audioUnitOpened = 0; - } - SDL_free(this->hidden->buffer); - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -#define CHECK_RESULT(msg) \ - if (result != noErr) { \ - COREAUDIO_CloseDevice(this); \ - SDL_SetError("CoreAudio error (%s): %d", msg, result); \ - return 0; \ - } - -static int -prepare_audiounit(_THIS, const char *devname, int iscapture, - const AudioStreamBasicDescription * strdesc) -{ - OSStatus result = noErr; - AURenderCallbackStruct callback; - AudioComponentDescription desc; - AudioComponent comp = NULL; - - UInt32 enableIO = 0; - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const AudioUnitElement bus = ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); - - SDL_memset(&desc, '\0', sizeof(AudioComponentDescription)); - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_RemoteIO; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - - comp = AudioComponentFindNext(NULL, &desc); - if (comp == NULL) { - SDL_SetError("Couldn't find requested CoreAudio component"); - return 0; - } - - /* Open & initialize the audio unit */ - /* - AudioComponentInstanceNew only available on iPhone OS 2.0 and Mac OS X 10.6 - We can't use OpenAComponent on iPhone because it is not present - */ - result = AudioComponentInstanceNew(comp, &this->hidden->audioUnit); - CHECK_RESULT("AudioComponentInstanceNew"); - - this->hidden->audioUnitOpened = 1; - - // !!! FIXME: this is wrong? - enableIO = ((iscapture) ? 1 : 0); - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Input, input_bus, - &enableIO, sizeof(enableIO)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_EnableIO input)"); - - // !!! FIXME: this is wrong? - enableIO = ((iscapture) ? 0 : 1); - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Output, output_bus, - &enableIO, sizeof(enableIO)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_EnableIO output)"); - - /*result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioOutputUnitProperty_CurrentDevice, - kAudioUnitScope_Global, 0, - &this->hidden->deviceID, - sizeof(AudioDeviceID)); - - CHECK_RESULT("AudioUnitSetProperty (kAudioOutputUnitProperty_CurrentDevice)"); */ - - /* Set the data format of the audio unit. */ - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_StreamFormat, - scope, bus, strdesc, sizeof(*strdesc)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)"); - - /* Set the audio callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); - callback.inputProc = ((iscapture) ? inputCallback : outputCallback); - callback.inputProcRefCon = this; - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, sizeof(callback)); - CHECK_RESULT - ("AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback)"); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Allocate a sample buffer */ - this->hidden->bufferOffset = this->hidden->bufferSize = this->spec.size; - this->hidden->buffer = SDL_malloc(this->hidden->bufferSize); - - result = AudioUnitInitialize(this->hidden->audioUnit); - CHECK_RESULT("AudioUnitInitialize"); - - /* Finally, start processing of the audio unit */ - result = AudioOutputUnitStart(this->hidden->audioUnit); - CHECK_RESULT("AudioOutputUnitStart"); - /* We're running! */ - return 1; -} - -static int -COREAUDIO_OpenDevice(_THIS, const char *devname, int iscapture) -{ - AudioStreamBasicDescription strdesc; - SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); - int valid_datatype = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return (0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Setup a AudioStreamBasicDescription with the requested format */ - SDL_memset(&strdesc, '\0', sizeof(AudioStreamBasicDescription)); - strdesc.mFormatID = kAudioFormatLinearPCM; - strdesc.mFormatFlags = kLinearPCMFormatFlagIsPacked; - strdesc.mChannelsPerFrame = this->spec.channels; - strdesc.mSampleRate = this->spec.freq; - strdesc.mFramesPerPacket = 1; - - while ((!valid_datatype) && (test_format)) { - this->spec.format = test_format; - /* Just a list of valid SDL formats, so people don't pass junk here. */ - switch (test_format) { - case AUDIO_U8: - case AUDIO_S8: - case AUDIO_U16LSB: - case AUDIO_S16LSB: - case AUDIO_U16MSB: - case AUDIO_S16MSB: - case AUDIO_S32LSB: - case AUDIO_S32MSB: - case AUDIO_F32LSB: - case AUDIO_F32MSB: - valid_datatype = 1; - strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(this->spec.format); - if (SDL_AUDIO_ISBIGENDIAN(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; - - if (SDL_AUDIO_ISFLOAT(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat; - else if (SDL_AUDIO_ISSIGNED(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; - break; - } - } - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - COREAUDIO_CloseDevice(this); - SDL_SetError("Unsupported audio format"); - return 0; - } - - strdesc.mBytesPerFrame = - strdesc.mBitsPerChannel * strdesc.mChannelsPerFrame / 8; - strdesc.mBytesPerPacket = - strdesc.mBytesPerFrame * strdesc.mFramesPerPacket; - - if (!prepare_audiounit(this, devname, iscapture, &strdesc)) { - COREAUDIO_CloseDevice(this); - return 0; /* prepare_audiounit() will call SDL_SetError()... */ - } - - return 1; /* good to go. */ -} - -static int -COREAUDIO_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->OpenDevice = COREAUDIO_OpenDevice; - impl->CloseDevice = COREAUDIO_CloseDevice; - impl->Deinitialize = COREAUDIO_Deinitialize; - impl->ProvidesOwnCallbackThread = 1; - - /* added for iPhone */ - impl->OnlyHasDefaultInputDevice = 1; - impl->OnlyHasDefaultOutputDevice = 1; - impl->HasCaptureSupport = 0; /* still needs to be written */ - - return 1; /* this audio target is available. */ -} - -AudioBootStrap COREAUDIOIPHONE_bootstrap = { - "coreaudio-iphoneos", "SDL CoreAudio (iPhone OS) audio driver", - COREAUDIO_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h b/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h deleted file mode 100644 index 4efa1dd32..000000000 --- a/src/helper/android/SDL1.3/src/audio/iphoneos/SDL_coreaudio_iphone.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_coreaudio_h -#define _SDL_coreaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - AudioUnit audioUnit; - int audioUnitOpened; - void *buffer; - UInt32 bufferOffset; - UInt32 bufferSize; - // AudioDeviceID deviceID; -}; - -#endif /* _SDL_coreaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.c b/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.c deleted file mode 100644 index d83dbee25..000000000 --- a/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.c +++ /dev/null @@ -1,584 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#include -#include -#include -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 -#include -#endif - -#include "SDL_audio.h" -#include "../SDL_audio_c.h" -#include "../SDL_sysaudio.h" -#include "SDL_coreaudio.h" - -#define DEBUG_COREAUDIO 0 - -typedef struct COREAUDIO_DeviceList -{ - AudioDeviceID id; - const char *name; -} COREAUDIO_DeviceList; - -static COREAUDIO_DeviceList *inputDevices = NULL; -static int inputDeviceCount = 0; -static COREAUDIO_DeviceList *outputDevices = NULL; -static int outputDeviceCount = 0; - -static void -free_device_list(COREAUDIO_DeviceList ** devices, int *devCount) -{ - if (*devices) { - int i = *devCount; - while (i--) - SDL_free((void *) (*devices)[i].name); - SDL_free(*devices); - *devices = NULL; - } - *devCount = 0; -} - - -static void -build_device_list(int iscapture, COREAUDIO_DeviceList ** devices, - int *devCount) -{ - Boolean outWritable = 0; - OSStatus result = noErr; - UInt32 size = 0; - AudioDeviceID *devs = NULL; - UInt32 i = 0; - UInt32 max = 0; - - free_device_list(devices, devCount); - - result = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, - &size, &outWritable); - - if (result != kAudioHardwareNoError) - return; - - devs = (AudioDeviceID *) alloca(size); - if (devs == NULL) - return; - - max = size / sizeof(AudioDeviceID); - *devices = (COREAUDIO_DeviceList *) SDL_malloc(max * sizeof(**devices)); - if (*devices == NULL) - return; - - result = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, - &size, devs); - if (result != kAudioHardwareNoError) - return; - - for (i = 0; i < max; i++) { - CFStringRef cfstr = NULL; - char *ptr = NULL; - AudioDeviceID dev = devs[i]; - AudioBufferList *buflist = NULL; - int usable = 0; - CFIndex len = 0; - - result = AudioDeviceGetPropertyInfo(dev, 0, iscapture, - kAudioDevicePropertyStreamConfiguration, - &size, &outWritable); - if (result != noErr) - continue; - - buflist = (AudioBufferList *) SDL_malloc(size); - if (buflist == NULL) - continue; - - result = AudioDeviceGetProperty(dev, 0, iscapture, - kAudioDevicePropertyStreamConfiguration, - &size, buflist); - - if (result == noErr) { - UInt32 j; - for (j = 0; j < buflist->mNumberBuffers; j++) { - if (buflist->mBuffers[j].mNumberChannels > 0) { - usable = 1; - break; - } - } - } - - SDL_free(buflist); - - if (!usable) - continue; - - size = sizeof(CFStringRef); - result = AudioDeviceGetProperty(dev, 0, iscapture, - kAudioDevicePropertyDeviceNameCFString, - &size, &cfstr); - - if (result != kAudioHardwareNoError) - continue; - - len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr), - kCFStringEncodingUTF8); - - ptr = (char *) SDL_malloc(len + 1); - usable = ((ptr != NULL) && - (CFStringGetCString - (cfstr, ptr, len + 1, kCFStringEncodingUTF8))); - - CFRelease(cfstr); - - if (usable) { - len = strlen(ptr); - /* Some devices have whitespace at the end...trim it. */ - while ((len > 0) && (ptr[len - 1] == ' ')) { - len--; - } - usable = (len > 0); - } - - if (!usable) { - SDL_free(ptr); - } else { - ptr[len] = '\0'; - -#if DEBUG_COREAUDIO - printf("COREAUDIO: Found %s device #%d: '%s' (devid %d)\n", - ((iscapture) ? "capture" : "output"), - (int) *devCount, ptr, (int) dev); -#endif - - (*devices)[*devCount].id = dev; - (*devices)[*devCount].name = ptr; - (*devCount)++; - } - } -} - -static inline void -build_device_lists(void) -{ - build_device_list(0, &outputDevices, &outputDeviceCount); - build_device_list(1, &inputDevices, &inputDeviceCount); -} - - -static inline void -free_device_lists(void) -{ - free_device_list(&outputDevices, &outputDeviceCount); - free_device_list(&inputDevices, &inputDeviceCount); -} - - -static int -find_device_id(const char *devname, int iscapture, AudioDeviceID * id) -{ - int i = ((iscapture) ? inputDeviceCount : outputDeviceCount); - COREAUDIO_DeviceList *devs = ((iscapture) ? inputDevices : outputDevices); - while (i--) { - if (SDL_strcmp(devname, devs->name) == 0) { - *id = devs->id; - return 1; - } - devs++; - } - - return 0; -} - - -static int -COREAUDIO_DetectDevices(int iscapture) -{ - if (iscapture) { - build_device_list(1, &inputDevices, &inputDeviceCount); - return inputDeviceCount; - } else { - build_device_list(0, &outputDevices, &outputDeviceCount); - return outputDeviceCount; - } - - return 0; /* shouldn't ever hit this. */ -} - - -static const char * -COREAUDIO_GetDeviceName(int index, int iscapture) -{ - if ((iscapture) && (index < inputDeviceCount)) { - return inputDevices[index].name; - } else if ((!iscapture) && (index < outputDeviceCount)) { - return outputDevices[index].name; - } - - SDL_SetError("No such device"); - return NULL; -} - - -static void -COREAUDIO_Deinitialize(void) -{ - free_device_lists(); -} - - -/* The CoreAudio callback */ -static OSStatus -outputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioData) -{ - SDL_AudioDevice *this = (SDL_AudioDevice *) inRefCon; - AudioBuffer *abuf; - UInt32 remaining, len; - void *ptr; - UInt32 i; - - /* Only do anything if audio is enabled and not paused */ - if (!this->enabled || this->paused) { - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - SDL_memset(abuf->mData, this->spec.silence, abuf->mDataByteSize); - } - return 0; - } - - /* No SDL conversion should be needed here, ever, since we accept - any input format in OpenAudio, and leave the conversion to CoreAudio. - */ - /* - assert(!this->convert.needed); - assert(this->spec.channels == ioData->mNumberChannels); - */ - - for (i = 0; i < ioData->mNumberBuffers; i++) { - abuf = &ioData->mBuffers[i]; - remaining = abuf->mDataByteSize; - ptr = abuf->mData; - while (remaining > 0) { - if (this->hidden->bufferOffset >= this->hidden->bufferSize) { - /* Generate the data */ - SDL_memset(this->hidden->buffer, this->spec.silence, - this->hidden->bufferSize); - SDL_mutexP(this->mixer_lock); - (*this->spec.callback)(this->spec.userdata, - this->hidden->buffer, this->hidden->bufferSize); - SDL_mutexV(this->mixer_lock); - this->hidden->bufferOffset = 0; - } - - len = this->hidden->bufferSize - this->hidden->bufferOffset; - if (len > remaining) - len = remaining; - SDL_memcpy(ptr, (char *)this->hidden->buffer + - this->hidden->bufferOffset, len); - ptr = (char *)ptr + len; - remaining -= len; - this->hidden->bufferOffset += len; - } - } - - return 0; -} - -static OSStatus -inputCallback(void *inRefCon, - AudioUnitRenderActionFlags * ioActionFlags, - const AudioTimeStamp * inTimeStamp, - UInt32 inBusNumber, UInt32 inNumberFrames, - AudioBufferList * ioData) -{ - //err = AudioUnitRender(afr->fAudioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, afr->fAudioBuffer); - // !!! FIXME: write me! - return noErr; -} - - -static void -COREAUDIO_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->audioUnitOpened) { - OSStatus result = noErr; - AURenderCallbackStruct callback; - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const int iscapture = this->iscapture; - const AudioUnitElement bus = - ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = - ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); - - /* stop processing the audio unit */ - result = AudioOutputUnitStop(this->hidden->audioUnit); - - /* Remove the input callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, - sizeof(callback)); - - CloseComponent(this->hidden->audioUnit); - this->hidden->audioUnitOpened = 0; - } - SDL_free(this->hidden->buffer); - SDL_free(this->hidden); - this->hidden = NULL; - } -} - - -#define CHECK_RESULT(msg) \ - if (result != noErr) { \ - COREAUDIO_CloseDevice(this); \ - SDL_SetError("CoreAudio error (%s): %d", msg, (int) result); \ - return 0; \ - } - -static int -find_device_by_name(_THIS, const char *devname, int iscapture) -{ - AudioDeviceID devid = 0; - OSStatus result = noErr; - UInt32 size = 0; - UInt32 alive = 0; - pid_t pid = 0; - - if (devname == NULL) { - size = sizeof(AudioDeviceID); - const AudioHardwarePropertyID propid = - ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice : - kAudioHardwarePropertyDefaultOutputDevice); - - result = AudioHardwareGetProperty(propid, &size, &devid); - CHECK_RESULT("AudioHardwareGetProperty (default device)"); - } else { - if (!find_device_id(devname, iscapture, &devid)) { - SDL_SetError("CoreAudio: No such audio device."); - return 0; - } - } - - size = sizeof(alive); - result = AudioDeviceGetProperty(devid, 0, iscapture, - kAudioDevicePropertyDeviceIsAlive, - &size, &alive); - CHECK_RESULT - ("AudioDeviceGetProperty (kAudioDevicePropertyDeviceIsAlive)"); - - if (!alive) { - SDL_SetError("CoreAudio: requested device exists, but isn't alive."); - return 0; - } - - size = sizeof(pid); - result = AudioDeviceGetProperty(devid, 0, iscapture, - kAudioDevicePropertyHogMode, &size, &pid); - - /* some devices don't support this property, so errors are fine here. */ - if ((result == noErr) && (pid != -1)) { - SDL_SetError("CoreAudio: requested device is being hogged."); - return 0; - } - - this->hidden->deviceID = devid; - return 1; -} - - -static int -prepare_audiounit(_THIS, const char *devname, int iscapture, - const AudioStreamBasicDescription * strdesc) -{ - OSStatus result = noErr; - AURenderCallbackStruct callback; - ComponentDescription desc; - Component comp = NULL; - const AudioUnitElement output_bus = 0; - const AudioUnitElement input_bus = 1; - const AudioUnitElement bus = ((iscapture) ? input_bus : output_bus); - const AudioUnitScope scope = ((iscapture) ? kAudioUnitScope_Output : - kAudioUnitScope_Input); - - if (!find_device_by_name(this, devname, iscapture)) { - SDL_SetError("Couldn't find requested CoreAudio device"); - return 0; - } - - SDL_memset(&desc, '\0', sizeof(ComponentDescription)); - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_DefaultOutput; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - - comp = FindNextComponent(NULL, &desc); - if (comp == NULL) { - SDL_SetError("Couldn't find requested CoreAudio component"); - return 0; - } - - /* Open & initialize the audio unit */ - result = OpenAComponent(comp, &this->hidden->audioUnit); - CHECK_RESULT("OpenAComponent"); - - this->hidden->audioUnitOpened = 1; - - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioOutputUnitProperty_CurrentDevice, - kAudioUnitScope_Global, 0, - &this->hidden->deviceID, - sizeof(AudioDeviceID)); - CHECK_RESULT - ("AudioUnitSetProperty (kAudioOutputUnitProperty_CurrentDevice)"); - - /* Set the data format of the audio unit. */ - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_StreamFormat, - scope, bus, strdesc, sizeof(*strdesc)); - CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)"); - - /* Set the audio callback */ - SDL_memset(&callback, '\0', sizeof(AURenderCallbackStruct)); - callback.inputProc = ((iscapture) ? inputCallback : outputCallback); - callback.inputProcRefCon = this; - result = AudioUnitSetProperty(this->hidden->audioUnit, - kAudioUnitProperty_SetRenderCallback, - scope, bus, &callback, sizeof(callback)); - CHECK_RESULT - ("AudioUnitSetProperty (kAudioUnitProperty_SetRenderCallback)"); - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - /* Allocate a sample buffer */ - this->hidden->bufferOffset = this->hidden->bufferSize = this->spec.size; - this->hidden->buffer = SDL_malloc(this->hidden->bufferSize); - - result = AudioUnitInitialize(this->hidden->audioUnit); - CHECK_RESULT("AudioUnitInitialize"); - - /* Finally, start processing of the audio unit */ - result = AudioOutputUnitStart(this->hidden->audioUnit); - CHECK_RESULT("AudioOutputUnitStart"); - - /* We're running! */ - return 1; -} - - -static int -COREAUDIO_OpenDevice(_THIS, const char *devname, int iscapture) -{ - AudioStreamBasicDescription strdesc; - SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format); - int valid_datatype = 0; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return (0); - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Setup a AudioStreamBasicDescription with the requested format */ - SDL_memset(&strdesc, '\0', sizeof(AudioStreamBasicDescription)); - strdesc.mFormatID = kAudioFormatLinearPCM; - strdesc.mFormatFlags = kLinearPCMFormatFlagIsPacked; - strdesc.mChannelsPerFrame = this->spec.channels; - strdesc.mSampleRate = this->spec.freq; - strdesc.mFramesPerPacket = 1; - - while ((!valid_datatype) && (test_format)) { - this->spec.format = test_format; - /* Just a list of valid SDL formats, so people don't pass junk here. */ - switch (test_format) { - case AUDIO_U8: - case AUDIO_S8: - case AUDIO_U16LSB: - case AUDIO_S16LSB: - case AUDIO_U16MSB: - case AUDIO_S16MSB: - case AUDIO_S32LSB: - case AUDIO_S32MSB: - case AUDIO_F32LSB: - case AUDIO_F32MSB: - valid_datatype = 1; - strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(this->spec.format); - if (SDL_AUDIO_ISBIGENDIAN(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; - - if (SDL_AUDIO_ISFLOAT(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat; - else if (SDL_AUDIO_ISSIGNED(this->spec.format)) - strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; - break; - } - } - - if (!valid_datatype) { /* shouldn't happen, but just in case... */ - COREAUDIO_CloseDevice(this); - SDL_SetError("Unsupported audio format"); - return 0; - } - - strdesc.mBytesPerFrame = - strdesc.mBitsPerChannel * strdesc.mChannelsPerFrame / 8; - strdesc.mBytesPerPacket = - strdesc.mBytesPerFrame * strdesc.mFramesPerPacket; - - if (!prepare_audiounit(this, devname, iscapture, &strdesc)) { - COREAUDIO_CloseDevice(this); - return 0; /* prepare_audiounit() will call SDL_SetError()... */ - } - - return 1; /* good to go. */ -} - -static int -COREAUDIO_Init(SDL_AudioDriverImpl * impl) -{ - /* Set the function pointers */ - impl->DetectDevices = COREAUDIO_DetectDevices; - impl->GetDeviceName = COREAUDIO_GetDeviceName; - impl->OpenDevice = COREAUDIO_OpenDevice; - impl->CloseDevice = COREAUDIO_CloseDevice; - impl->Deinitialize = COREAUDIO_Deinitialize; - impl->ProvidesOwnCallbackThread = 1; - - build_device_lists(); /* do an initial check for devices... */ - - return 1; /* this audio target is available. */ -} - -AudioBootStrap COREAUDIO_bootstrap = { - "coreaudio", "Mac OS X CoreAudio", COREAUDIO_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.h b/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.h deleted file mode 100644 index d8bdfa23b..000000000 --- a/src/helper/android/SDL1.3/src/audio/macosx/SDL_coreaudio.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org -*/ -#include "SDL_config.h" - -#ifndef _SDL_coreaudio_h -#define _SDL_coreaudio_h - -#include "../SDL_sysaudio.h" - -/* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this - -struct SDL_PrivateAudioData -{ - AudioUnit audioUnit; - int audioUnitOpened; - void *buffer; - UInt32 bufferOffset; - UInt32 bufferSize; - AudioDeviceID deviceID; -}; - -#endif /* _SDL_coreaudio_h */ -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.c b/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.c deleted file mode 100644 index bc1c411fd..000000000 --- a/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.c +++ /dev/null @@ -1,408 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This driver was written by: - Erik Inge Bolsø - knan@mo.himolde.no -*/ -#include "SDL_config.h" - -/* Allow access to a raw mixing buffer */ - -#include -#include - -#include "SDL_timer.h" -#include "SDL_audio.h" -#include "SDL_loadso.h" -#include "../SDL_audiomem.h" -#include "../SDL_audio_c.h" -#include "SDL_nasaudio.h" - -/* The tag name used by nas audio */ -#define NAS_DRIVER_NAME "nas" - -static struct SDL_PrivateAudioData *this2 = NULL; - - -static void (*NAS_AuCloseServer) (AuServer *); -static void (*NAS_AuNextEvent) (AuServer *, AuBool, AuEvent *); -static AuBool(*NAS_AuDispatchEvent) (AuServer *, AuEvent *); -static AuFlowID(*NAS_AuCreateFlow) (AuServer *, AuStatus *); -static void (*NAS_AuStartFlow) (AuServer *, AuFlowID, AuStatus *); -static void (*NAS_AuSetElements) - (AuServer *, AuFlowID, AuBool, int, AuElement *, AuStatus *); -static void (*NAS_AuWriteElement) - (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuBool, AuStatus *); -static AuServer *(*NAS_AuOpenServer) - (_AuConst char *, int, _AuConst char *, int, _AuConst char *, char **); -static AuEventHandlerRec *(*NAS_AuRegisterEventHandler) - (AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer); - - -#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC - -static const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC; -static void *nas_handle = NULL; - -static int -load_nas_sym(const char *fn, void **addr) -{ - *addr = SDL_LoadFunction(nas_handle, fn); - if (*addr == NULL) { - return 0; - } - return 1; -} - -/* cast funcs to char* first, to please GCC's strict aliasing rules. */ -#define SDL_NAS_SYM(x) \ - if (!load_nas_sym(#x, (void **) (char *) &NAS_##x)) return -1 -#else -#define SDL_NAS_SYM(x) NAS_##x = x -#endif - -static int -load_nas_syms(void) -{ - SDL_NAS_SYM(AuCloseServer); - SDL_NAS_SYM(AuNextEvent); - SDL_NAS_SYM(AuDispatchEvent); - SDL_NAS_SYM(AuCreateFlow); - SDL_NAS_SYM(AuStartFlow); - SDL_NAS_SYM(AuSetElements); - SDL_NAS_SYM(AuWriteElement); - SDL_NAS_SYM(AuOpenServer); - SDL_NAS_SYM(AuRegisterEventHandler); - return 0; -} - -#undef SDL_NAS_SYM - -#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC - -static void -UnloadNASLibrary(void) -{ - if (nas_handle != NULL) { - SDL_UnloadObject(nas_handle); - nas_handle = NULL; - } -} - -static int -LoadNASLibrary(void) -{ - int retval = 0; - if (nas_handle == NULL) { - nas_handle = SDL_LoadObject(nas_library); - if (nas_handle == NULL) { - /* Copy error string so we can use it in a new SDL_SetError(). */ - char *origerr = SDL_GetError(); - size_t len = SDL_strlen(origerr) + 1; - char *err = (char *) alloca(len); - SDL_strlcpy(err, origerr, len); - retval = -1; - SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s\n", - nas_library, err); - } else { - retval = load_nas_syms(); - if (retval < 0) { - UnloadNASLibrary(); - } - } - } - return retval; -} - -#else - -static void -UnloadNASLibrary(void) -{ -} - -static int -LoadNASLibrary(void) -{ - load_nas_syms(); - return 0; -} - -#endif /* SDL_AUDIO_DRIVER_NAS_DYNAMIC */ - -/* This function waits until it is possible to write a full sound buffer */ -static void -NAS_WaitDevice(_THIS) -{ - while (this->hidden->buf_free < this->hidden->mixlen) { - AuEvent ev; - NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); - NAS_AuDispatchEvent(this->hidden->aud, &ev); - } -} - -static void -NAS_PlayDevice(_THIS) -{ - while (this->hidden->mixlen > this->hidden->buf_free) { - /* - * We think the buffer is full? Yikes! Ask the server for events, - * in the hope that some of them is LowWater events telling us more - * of the buffer is free now than what we think. - */ - AuEvent ev; - NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev); - NAS_AuDispatchEvent(this->hidden->aud, &ev); - } - this->hidden->buf_free -= this->hidden->mixlen; - - /* Write the audio data */ - NAS_AuWriteElement(this->hidden->aud, this->hidden->flow, 0, - this->hidden->mixlen, this->hidden->mixbuf, AuFalse, - NULL); - - this->hidden->written += this->hidden->mixlen; - -#ifdef DEBUG_AUDIO - fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen); -#endif -} - -static Uint8 * -NAS_GetDeviceBuf(_THIS) -{ - return (this->hidden->mixbuf); -} - -static void -NAS_CloseDevice(_THIS) -{ - if (this->hidden != NULL) { - if (this->hidden->mixbuf != NULL) { - SDL_FreeAudioMem(this->hidden->mixbuf); - this->hidden->mixbuf = NULL; - } - if (this->hidden->aud) { - NAS_AuCloseServer(this->hidden->aud); - this->hidden->aud = 0; - } - SDL_free(this->hidden); - this2 = this->hidden = NULL; - } -} - -static unsigned char -sdlformat_to_auformat(unsigned int fmt) -{ - switch (fmt) { - case AUDIO_U8: - return AuFormatLinearUnsigned8; - case AUDIO_S8: - return AuFormatLinearSigned8; - case AUDIO_U16LSB: - return AuFormatLinearUnsigned16LSB; - case AUDIO_U16MSB: - return AuFormatLinearUnsigned16MSB; - case AUDIO_S16LSB: - return AuFormatLinearSigned16LSB; - case AUDIO_S16MSB: - return AuFormatLinearSigned16MSB; - } - return AuNone; -} - -static AuBool -event_handler(AuServer * aud, AuEvent * ev, AuEventHandlerRec * hnd) -{ - switch (ev->type) { - case AuEventTypeElementNotify: - { - AuElementNotifyEvent *event = (AuElementNotifyEvent *) ev; - - switch (event->kind) { - case AuElementNotifyKindLowWater: - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; - } else { - this2->buf_free = event->num_bytes; - } - break; - case AuElementNotifyKindState: - switch (event->cur_state) { - case AuStatePause: - if (event->reason != AuReasonUser) { - if (this2->buf_free >= 0) { - this2->really += event->num_bytes; - gettimeofday(&this2->last_tv, 0); - this2->buf_free += event->num_bytes; - } else { - this2->buf_free = event->num_bytes; - } - } - break; - } - } - } - } - return AuTrue; -} - -static AuDeviceID -find_device(_THIS, int nch) -{ - /* These "Au" things are all macros, not functions... */ - int i; - for (i = 0; i < AuServerNumDevices(this->hidden->aud); i++) { - if ((AuDeviceKind(AuServerDevice(this->hidden->aud, i)) == - AuComponentKindPhysicalOutput) && - AuDeviceNumTracks(AuServerDevice(this->hidden->aud, i)) == nch) { - return AuDeviceIdentifier(AuServerDevice(this->hidden->aud, i)); - } - } - return AuNone; -} - -static int -NAS_OpenDevice(_THIS, const char *devname, int iscapture) -{ - AuElement elms[3]; - int buffer_size; - SDL_AudioFormat test_format, format; - - /* Initialize all variables that we clean on shutdown */ - this->hidden = (struct SDL_PrivateAudioData *) - SDL_malloc((sizeof *this->hidden)); - if (this->hidden == NULL) { - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden, 0, (sizeof *this->hidden)); - - /* Try for a closest match on audio format */ - format = 0; - for (test_format = SDL_FirstAudioFormat(this->spec.format); - !format && test_format;) { - format = sdlformat_to_auformat(test_format); - if (format == AuNone) { - test_format = SDL_NextAudioFormat(); - } - } - if (format == 0) { - NAS_CloseDevice(this); - SDL_SetError("NAS: Couldn't find any hardware audio formats"); - return 0; - } - this->spec.format = test_format; - - this->hidden->aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); - if (this->hidden->aud == 0) { - NAS_CloseDevice(this); - SDL_SetError("NAS: Couldn't open connection to NAS server"); - return 0; - } - - this->hidden->dev = find_device(this, this->spec.channels); - if ((this->hidden->dev == AuNone) - || (!(this->hidden->flow = NAS_AuCreateFlow(this->hidden->aud, 0)))) { - NAS_CloseDevice(this); - SDL_SetError("NAS: Couldn't find a fitting device on NAS server"); - return 0; - } - - buffer_size = this->spec.freq; - if (buffer_size < 4096) - buffer_size = 4096; - - if (buffer_size > 32768) - buffer_size = 32768; /* So that the buffer won't get unmanageably big. */ - - /* Calculate the final parameters for this audio specification */ - SDL_CalculateAudioSpec(&this->spec); - - this2 = this->hidden; - - AuMakeElementImportClient(elms, this->spec.freq, format, - this->spec.channels, AuTrue, buffer_size, - buffer_size / 4, 0, NULL); - AuMakeElementExportDevice(elms + 1, 0, this->hidden->dev, this->spec.freq, - AuUnlimitedSamples, 0, NULL); - NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, 2, elms, - NULL); - NAS_AuRegisterEventHandler(this->hidden->aud, AuEventHandlerIDMask, 0, - this->hidden->flow, event_handler, - (AuPointer) NULL); - - NAS_AuStartFlow(this->hidden->aud, this->hidden->flow, NULL); - - /* Allocate mixing buffer */ - this->hidden->mixlen = this->spec.size; - this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); - if (this->hidden->mixbuf == NULL) { - NAS_CloseDevice(this); - SDL_OutOfMemory(); - return 0; - } - SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size); - - /* We're ready to rock and roll. :-) */ - return 1; -} - -static void -NAS_Deinitialize(void) -{ - UnloadNASLibrary(); -} - -static int -NAS_Init(SDL_AudioDriverImpl * impl) -{ - if (LoadNASLibrary() < 0) { - return 0; - } else { - AuServer *aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL); - if (aud == NULL) { - SDL_SetError("NAS: AuOpenServer() failed (no audio server?)"); - return 0; - } - NAS_AuCloseServer(aud); - } - - /* Set the function pointers */ - impl->OpenDevice = NAS_OpenDevice; - impl->PlayDevice = NAS_PlayDevice; - impl->WaitDevice = NAS_WaitDevice; - impl->GetDeviceBuf = NAS_GetDeviceBuf; - impl->CloseDevice = NAS_CloseDevice; - impl->Deinitialize = NAS_Deinitialize; - impl->OnlyHasDefaultOutputDevice = 1; /* !!! FIXME: is this true? */ - - return 1; /* this audio target is available. */ -} - -AudioBootStrap NAS_bootstrap = { - NAS_DRIVER_NAME, "Network Audio System", NAS_Init, 0 -}; - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.h b/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.h deleted file mode 100644 index 8d80bd5fc..000000000 --- a/src/helper/android/SDL1.3/src/audio/nas/SDL_nasaudio.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2011 Sam Lantinga - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Sam Lantinga - slouken@libsdl.org - - This driver was written by: - Erik Inge Bolsø - knan@mo.himolde.no -*/ -#include "SDL_config.h" - -#ifndef _SDL_nasaudio_h -#define _SDL_nasaudio_h - -#ifdef __sgi -#include -#else -#include