From baee1055afd67a940deddc3aa1af0ad8384c4d92 Mon Sep 17 00:00:00 2001
From: Alberto Fustinoni <alberto@aftnet.net>
Date: Mon, 19 Jun 2017 23:57:32 +0900
Subject: [PATCH] cleanup

---
 libretro-common/include/audio/audio_mix.h     |   93 -
 libretro-common/include/audio/audio_mixer.h   |   74 -
 .../include/audio/audio_resampler.h           |  184 -
 .../include/audio/conversion/float_to_s16.h   |   55 -
 .../include/audio/conversion/s16_to_float.h   |   55 -
 libretro-common/include/audio/dsp_filter.h    |   53 -
 libretro-common/include/clamping.h            |   65 -
 libretro-common/include/compat/apple_compat.h |   84 -
 libretro-common/include/compat/fnmatch.h      |   30 -
 libretro-common/include/compat/getopt.h       |   75 -
 libretro-common/include/compat/ifaddrs.h      |   53 -
 libretro-common/include/compat/intrinsics.h   |   85 -
 libretro-common/include/compat/msvc.h         |  104 -
 libretro-common/include/compat/msvc/stdint.h  |  254 --
 libretro-common/include/compat/posix_string.h |   61 -
 libretro-common/include/compat/strcasestr.h   |   49 -
 libretro-common/include/compat/strl.h         |   58 -
 libretro-common/include/compat/zconf.h        |  483 ---
 libretro-common/include/compat/zconf.h.in     |  483 ---
 libretro-common/include/compat/zlib.h         | 1780 ----------
 libretro-common/include/compat/zutil.h        |  253 --
 libretro-common/include/dynamic/dylib.h       |   71 -
 libretro-common/include/encodings/crc32.h     |   38 -
 libretro-common/include/encodings/utf.h       |   53 -
 libretro-common/include/encodings/win32.h     |   63 -
 libretro-common/include/fastcpy.h             |   94 -
 .../include/features/features_cpu.h           |   73 -
 libretro-common/include/file/archive_file.h   |  213 --
 libretro-common/include/file/config_file.h    |  166 -
 .../include/file/config_file_userdata.h       |   61 -
 libretro-common/include/file/file_path.h      |  478 ---
 libretro-common/include/file/nbio.h           |  102 -
 libretro-common/include/filters.h             |   93 -
 libretro-common/include/formats/image.h       |   95 -
 libretro-common/include/formats/jsonsax.h     |   71 -
 .../include/formats/jsonsax_full.h            | 1040 ------
 libretro-common/include/formats/rbmp.h        |   62 -
 libretro-common/include/formats/rjpeg.h       |   49 -
 libretro-common/include/formats/rpng.h        |   62 -
 libretro-common/include/formats/rtga.h        |   48 -
 libretro-common/include/formats/rwav.h        |   87 -
 libretro-common/include/formats/rxml.h        |   95 -
 libretro-common/include/gfx/gl_capabilities.h |   68 -
 libretro-common/include/gfx/math/matrix_3x3.h |  254 --
 libretro-common/include/gfx/math/matrix_4x4.h |  396 ---
 libretro-common/include/gfx/math/vector_2.h   |  139 -
 libretro-common/include/gfx/math/vector_3.h   |   69 -
 libretro-common/include/gfx/math/vector_4.h   |   62 -
 libretro-common/include/gfx/scaler/filter.h   |   38 -
 libretro-common/include/gfx/scaler/pixconv.h  |  100 -
 libretro-common/include/gfx/scaler/scaler.h   |  129 -
 .../include/gfx/scaler/scaler_int.h           |   47 -
 libretro-common/include/gfx/video_frame.h     |  218 --
 libretro-common/include/glsm/glsm.h           |  157 -
 libretro-common/include/glsm/glsmsym.h        |  414 ---
 libretro-common/include/glsym/glsym.h         |   39 -
 libretro-common/include/glsym/glsym_es2.h     |  639 ----
 libretro-common/include/glsym/glsym_es3.h     |  650 ----
 libretro-common/include/glsym/glsym_gl.h      | 3140 -----------------
 libretro-common/include/glsym/rglgen.h        |   47 -
 .../include/glsym/rglgen_headers.h            |   81 -
 libretro-common/include/libco.h               |   79 -
 libretro-common/include/libretro.h            | 2166 ------------
 libretro-common/include/libretro_dspfilter.h  |  187 -
 libretro-common/include/libretro_vulkan.h     |  398 ---
 libretro-common/include/lists/dir_list.h      |   70 -
 libretro-common/include/lists/file_list.h     |  122 -
 libretro-common/include/lists/string_list.h   |  160 -
 libretro-common/include/math/complex.h        |   77 -
 libretro-common/include/math/float_minmax.h   |   62 -
 libretro-common/include/math/fxp.h            |   62 -
 libretro-common/include/memalign.h            |   40 -
 libretro-common/include/memmap.h              |   49 -
 libretro-common/include/net/net_compat.h      |  247 --
 libretro-common/include/net/net_http.h        |   75 -
 libretro-common/include/net/net_http_parse.h  |   53 -
 libretro-common/include/net/net_ifinfo.h      |   57 -
 libretro-common/include/net/net_natt.h        |   83 -
 libretro-common/include/net/net_socket.h      |   94 -
 libretro-common/include/queues/fifo_queue.h   |   78 -
 .../include/queues/message_queue.h            |   88 -
 libretro-common/include/queues/task_queue.h   |  236 --
 libretro-common/include/retro_assert.h        |   36 -
 libretro-common/include/retro_common.h        |   37 -
 libretro-common/include/retro_dirent.h        |  107 -
 libretro-common/include/retro_endianness.h    |  246 --
 libretro-common/include/retro_environment.h   |   78 -
 libretro-common/include/rhash.h               |  132 -
 libretro-common/include/rthreads/rthreads.h   |  229 --
 libretro-common/include/string/stdstring.h    |   94 -
 libretro-common/include/utils/md5.h           |   52 -
 .../include/vulkan/vulkan_symbol_wrapper.h    |  356 --
 libretro/libretro.c                           |    4 -
 93 files changed, 20086 deletions(-)
 delete mode 100644 libretro-common/include/audio/audio_mix.h
 delete mode 100644 libretro-common/include/audio/audio_mixer.h
 delete mode 100644 libretro-common/include/audio/audio_resampler.h
 delete mode 100644 libretro-common/include/audio/conversion/float_to_s16.h
 delete mode 100644 libretro-common/include/audio/conversion/s16_to_float.h
 delete mode 100644 libretro-common/include/audio/dsp_filter.h
 delete mode 100644 libretro-common/include/clamping.h
 delete mode 100644 libretro-common/include/compat/apple_compat.h
 delete mode 100644 libretro-common/include/compat/fnmatch.h
 delete mode 100644 libretro-common/include/compat/getopt.h
 delete mode 100644 libretro-common/include/compat/ifaddrs.h
 delete mode 100644 libretro-common/include/compat/intrinsics.h
 delete mode 100644 libretro-common/include/compat/msvc.h
 delete mode 100644 libretro-common/include/compat/msvc/stdint.h
 delete mode 100644 libretro-common/include/compat/posix_string.h
 delete mode 100644 libretro-common/include/compat/strcasestr.h
 delete mode 100644 libretro-common/include/compat/strl.h
 delete mode 100644 libretro-common/include/compat/zconf.h
 delete mode 100644 libretro-common/include/compat/zconf.h.in
 delete mode 100644 libretro-common/include/compat/zlib.h
 delete mode 100644 libretro-common/include/compat/zutil.h
 delete mode 100644 libretro-common/include/dynamic/dylib.h
 delete mode 100644 libretro-common/include/encodings/crc32.h
 delete mode 100644 libretro-common/include/encodings/utf.h
 delete mode 100644 libretro-common/include/encodings/win32.h
 delete mode 100644 libretro-common/include/fastcpy.h
 delete mode 100644 libretro-common/include/features/features_cpu.h
 delete mode 100644 libretro-common/include/file/archive_file.h
 delete mode 100644 libretro-common/include/file/config_file.h
 delete mode 100644 libretro-common/include/file/config_file_userdata.h
 delete mode 100644 libretro-common/include/file/file_path.h
 delete mode 100644 libretro-common/include/file/nbio.h
 delete mode 100644 libretro-common/include/filters.h
 delete mode 100644 libretro-common/include/formats/image.h
 delete mode 100644 libretro-common/include/formats/jsonsax.h
 delete mode 100644 libretro-common/include/formats/jsonsax_full.h
 delete mode 100644 libretro-common/include/formats/rbmp.h
 delete mode 100644 libretro-common/include/formats/rjpeg.h
 delete mode 100644 libretro-common/include/formats/rpng.h
 delete mode 100644 libretro-common/include/formats/rtga.h
 delete mode 100644 libretro-common/include/formats/rwav.h
 delete mode 100644 libretro-common/include/formats/rxml.h
 delete mode 100644 libretro-common/include/gfx/gl_capabilities.h
 delete mode 100644 libretro-common/include/gfx/math/matrix_3x3.h
 delete mode 100644 libretro-common/include/gfx/math/matrix_4x4.h
 delete mode 100644 libretro-common/include/gfx/math/vector_2.h
 delete mode 100644 libretro-common/include/gfx/math/vector_3.h
 delete mode 100644 libretro-common/include/gfx/math/vector_4.h
 delete mode 100644 libretro-common/include/gfx/scaler/filter.h
 delete mode 100644 libretro-common/include/gfx/scaler/pixconv.h
 delete mode 100644 libretro-common/include/gfx/scaler/scaler.h
 delete mode 100644 libretro-common/include/gfx/scaler/scaler_int.h
 delete mode 100644 libretro-common/include/gfx/video_frame.h
 delete mode 100644 libretro-common/include/glsm/glsm.h
 delete mode 100644 libretro-common/include/glsm/glsmsym.h
 delete mode 100644 libretro-common/include/glsym/glsym.h
 delete mode 100644 libretro-common/include/glsym/glsym_es2.h
 delete mode 100644 libretro-common/include/glsym/glsym_es3.h
 delete mode 100644 libretro-common/include/glsym/glsym_gl.h
 delete mode 100644 libretro-common/include/glsym/rglgen.h
 delete mode 100644 libretro-common/include/glsym/rglgen_headers.h
 delete mode 100644 libretro-common/include/libco.h
 delete mode 100644 libretro-common/include/libretro.h
 delete mode 100644 libretro-common/include/libretro_dspfilter.h
 delete mode 100644 libretro-common/include/libretro_vulkan.h
 delete mode 100644 libretro-common/include/lists/dir_list.h
 delete mode 100644 libretro-common/include/lists/file_list.h
 delete mode 100644 libretro-common/include/lists/string_list.h
 delete mode 100644 libretro-common/include/math/complex.h
 delete mode 100644 libretro-common/include/math/float_minmax.h
 delete mode 100644 libretro-common/include/math/fxp.h
 delete mode 100644 libretro-common/include/memalign.h
 delete mode 100644 libretro-common/include/memmap.h
 delete mode 100644 libretro-common/include/net/net_compat.h
 delete mode 100644 libretro-common/include/net/net_http.h
 delete mode 100644 libretro-common/include/net/net_http_parse.h
 delete mode 100644 libretro-common/include/net/net_ifinfo.h
 delete mode 100644 libretro-common/include/net/net_natt.h
 delete mode 100644 libretro-common/include/net/net_socket.h
 delete mode 100644 libretro-common/include/queues/fifo_queue.h
 delete mode 100644 libretro-common/include/queues/message_queue.h
 delete mode 100644 libretro-common/include/queues/task_queue.h
 delete mode 100644 libretro-common/include/retro_assert.h
 delete mode 100644 libretro-common/include/retro_common.h
 delete mode 100644 libretro-common/include/retro_dirent.h
 delete mode 100644 libretro-common/include/retro_endianness.h
 delete mode 100644 libretro-common/include/retro_environment.h
 delete mode 100644 libretro-common/include/rhash.h
 delete mode 100644 libretro-common/include/rthreads/rthreads.h
 delete mode 100644 libretro-common/include/string/stdstring.h
 delete mode 100644 libretro-common/include/utils/md5.h
 delete mode 100644 libretro-common/include/vulkan/vulkan_symbol_wrapper.h

diff --git a/libretro-common/include/audio/audio_mix.h b/libretro-common/include/audio/audio_mix.h
deleted file mode 100644
index 3b59dff..0000000
--- a/libretro-common/include/audio/audio_mix.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_mix.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_AUDIO_MIX_H__
-#define __LIBRETRO_SDK_AUDIO_MIX_H__
-
-#include <retro_common_api.h>
-
-#include <stdint.h>
-#include <stddef.h>
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <formats/rwav.h>
-#include <audio/audio_resampler.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct
-{
-   void *buf;
-   int16_t *upsample_buf;
-   float *float_buf;
-   float *float_resample_buf;
-   int16_t *resample_buf;
-   ssize_t len;
-   size_t resample_len;
-   rwav_t *rwav;
-   int sample_rate;
-   bool resample;
-   const retro_resampler_t *resampler;
-   void *resampler_data;
-   double ratio;
-} audio_chunk_t;
-
-#if defined(__SSE2__)
-#define audio_mix_volume           audio_mix_volume_SSE2
-
-void audio_mix_volume_SSE2(float *out,
-      const float *in, float vol, size_t samples);
-#else
-#define audio_mix_volume           audio_mix_volume_C
-#endif
-
-void audio_mix_volume_C(float *dst, const float *src, float vol, size_t samples);
-
-void audio_mix_free_chunk(audio_chunk_t *chunk);
-
-audio_chunk_t* audio_mix_load_wav_file(const char *path, int sample_rate);
-
-size_t audio_mix_get_chunk_num_samples(audio_chunk_t *chunk);
-
-/**
- * audio_mix_get_chunk_sample:
- * @chunk              : audio chunk instance
- * @channel            : channel of the sample (0=left, 1=right)
- * @index              : index of the sample
- *
- * Get a sample from an audio chunk.
- *
- * Returns: A signed 16-bit audio sample, (if necessary) resampled into the desired output rate.
- **/
-int16_t audio_mix_get_chunk_sample(audio_chunk_t *chunk, unsigned channel, size_t sample);
-
-int16_t* audio_mix_get_chunk_samples(audio_chunk_t *chunk);
-
-int audio_mix_get_chunk_num_channels(audio_chunk_t *chunk);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/audio/audio_mixer.h b/libretro-common/include/audio/audio_mixer.h
deleted file mode 100644
index f9044bd..0000000
--- a/libretro-common/include/audio/audio_mixer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_mixer.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_AUDIO_MIXER__H
-#define __LIBRETRO_SDK_AUDIO_MIXER__H
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum audio_mixer_type
-{
-   AUDIO_MIXER_TYPE_NONE = 0,
-   AUDIO_MIXER_TYPE_WAV,
-   AUDIO_MIXER_TYPE_OGG
-};
-
-typedef struct audio_mixer_sound audio_mixer_sound_t;
-typedef struct audio_mixer_voice audio_mixer_voice_t;
-
-typedef void (*audio_mixer_stop_cb_t)(audio_mixer_sound_t* sound, unsigned reason);
-
-/* Reasons passed to the stop callback. */
-#define AUDIO_MIXER_SOUND_FINISHED 0
-#define AUDIO_MIXER_SOUND_STOPPED  1
-#define AUDIO_MIXER_SOUND_REPEATED 2
-
-void audio_mixer_init(unsigned rate);
-
-void audio_mixer_done(void);
-
-audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size);
-audio_mixer_sound_t* audio_mixer_load_ogg(void *buffer, int32_t size);
-
-void audio_mixer_destroy(audio_mixer_sound_t* sound);
-
-audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound,
-      bool repeat, float volume, audio_mixer_stop_cb_t stop_cb);
-
-void audio_mixer_stop(audio_mixer_voice_t* voice);
-
-void audio_mixer_mix(float* buffer, size_t num_frames, float volume_override, bool override);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/audio/audio_resampler.h b/libretro-common/include/audio/audio_resampler.h
deleted file mode 100644
index 4704eef..0000000
--- a/libretro-common/include/audio/audio_resampler.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_resampler.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_AUDIO_RESAMPLER_DRIVER_H
-#define __LIBRETRO_SDK_AUDIO_RESAMPLER_DRIVER_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#define RESAMPLER_SIMD_SSE      (1 << 0)
-#define RESAMPLER_SIMD_SSE2     (1 << 1)
-#define RESAMPLER_SIMD_VMX      (1 << 2)
-#define RESAMPLER_SIMD_VMX128   (1 << 3)
-#define RESAMPLER_SIMD_AVX      (1 << 4)
-#define RESAMPLER_SIMD_NEON     (1 << 5)
-#define RESAMPLER_SIMD_SSE3     (1 << 6)
-#define RESAMPLER_SIMD_SSSE3    (1 << 7)
-#define RESAMPLER_SIMD_MMX      (1 << 8)
-#define RESAMPLER_SIMD_MMXEXT   (1 << 9)
-#define RESAMPLER_SIMD_SSE4     (1 << 10)
-#define RESAMPLER_SIMD_SSE42    (1 << 11)
-#define RESAMPLER_SIMD_AVX2     (1 << 12)
-#define RESAMPLER_SIMD_VFPU     (1 << 13)
-#define RESAMPLER_SIMD_PS       (1 << 14)
-
-/* A bit-mask of all supported SIMD instruction sets.
- * Allows an implementation to pick different 
- * resampler_implementation structs.
- */
-typedef unsigned resampler_simd_mask_t;
-
-#define RESAMPLER_API_VERSION 1
-
-struct resampler_data
-{
-   const float *data_in;
-   float *data_out;
-
-   size_t input_frames;
-   size_t output_frames;
-
-   double ratio;
-};
-
-/* Returns true if config key was found. Otherwise, 
- * returns false, and sets value to default value.
- */
-typedef int (*resampler_config_get_float_t)(void *userdata,
-      const char *key, float *value, float default_value);
-
-typedef int (*resampler_config_get_int_t)(void *userdata,
-      const char *key, int *value, int default_value);
-
-/* Allocates an array with values. free() with resampler_config_free_t. */
-typedef int (*resampler_config_get_float_array_t)(void *userdata, 
-      const char *key, float **values, unsigned *out_num_values,
-      const float *default_values, unsigned num_default_values);
-
-typedef int (*resampler_config_get_int_array_t)(void *userdata,
-      const char *key, int **values, unsigned *out_num_values,
-      const int *default_values, unsigned num_default_values);
-
-typedef int (*resampler_config_get_string_t)(void *userdata,
-      const char *key, char **output, const char *default_output);
-
-/* Calls free() in host runtime. Sometimes needed on Windows. 
- * free() on NULL is fine. */
-typedef void (*resampler_config_free_t)(void *ptr);
-
-struct resampler_config
-{
-   resampler_config_get_float_t get_float;
-   resampler_config_get_int_t get_int;
-
-   resampler_config_get_float_array_t get_float_array;
-   resampler_config_get_int_array_t get_int_array;
-
-   resampler_config_get_string_t get_string;
-   /* Avoid problems where resampler plug and host are 
-    * linked against different C runtimes. */
-   resampler_config_free_t free; 
-};
-
-/* Bandwidth factor. Will be < 1.0 for downsampling, > 1.0 for upsampling. 
- * Corresponds to expected resampling ratio. */
-typedef void *(*resampler_init_t)(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask);
-
-/* Frees the handle. */
-typedef void (*resampler_free_t)(void *data);
-
-/* Processes input data. */
-typedef void (*resampler_process_t)(void *_data, struct resampler_data *data);
-
-typedef struct retro_resampler
-{
-   resampler_init_t     init;
-   resampler_process_t  process;
-   resampler_free_t     free;
-
-   /* Must be RESAMPLER_API_VERSION */
-   unsigned api_version;
-
-   /* Human readable identifier of implementation. */
-   const char *ident;
-
-   /* Computer-friendly short version of ident.
-    * Lower case, no spaces and special characters, etc. */
-   const char *short_ident; 
-} retro_resampler_t;
-
-typedef struct audio_frame_float
-{
-   float l;
-   float r;
-} audio_frame_float_t;
-
-extern retro_resampler_t sinc_resampler;
-#ifdef HAVE_CC_RESAMPLER
-extern retro_resampler_t CC_resampler;
-#endif
-extern retro_resampler_t nearest_resampler;
-extern retro_resampler_t null_resampler;
-
-/**
- * audio_resampler_driver_find_handle:
- * @index              : index of driver to get handle to.
- *
- * Returns: handle to audio resampler driver at index. Can be NULL
- * if nothing found.
- **/
-const void *audio_resampler_driver_find_handle(int index);
-
-/**
- * audio_resampler_driver_find_ident:
- * @index              : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of audio resampler driver at index.
- * Can be NULL if nothing found.
- **/
-const char *audio_resampler_driver_find_ident(int index);
-
-/**
- * retro_resampler_realloc:
- * @re                         : Resampler handle
- * @backend                    : Resampler backend that is about to be set.
- * @ident                      : Identifier name for resampler we want.
- * @bw_ratio                   : Bandwidth ratio.
- *
- * Reallocates resampler. Will free previous handle before 
- * allocating a new one. If ident is NULL, first resampler will be used.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool retro_resampler_realloc(void **re, const retro_resampler_t **backend,
-      const char *ident, double bw_ratio);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/audio/conversion/float_to_s16.h b/libretro-common/include/audio/conversion/float_to_s16.h
deleted file mode 100644
index 0fb9115..0000000
--- a/libretro-common/include/audio/conversion/float_to_s16.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (float_to_s16.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_CONVERSION_FLOAT_TO_S16_H__
-#define __LIBRETRO_SDK_CONVERSION_FLOAT_TO_S16_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#include <stdint.h>
-#include <stddef.h>
-
-/**
- * convert_float_to_s16:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts floating point 
- * to signed integer 16-bit.
- **/
-void convert_float_to_s16(int16_t *out,
-      const float *in, size_t samples);
-
-/**
- * convert_float_to_s16_init_simd:
- *
- * Sets up function pointers for conversion
- * functions based on CPU features.
- **/
-void convert_float_to_s16_init_simd(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/audio/conversion/s16_to_float.h b/libretro-common/include/audio/conversion/s16_to_float.h
deleted file mode 100644
index ebe43ac..0000000
--- a/libretro-common/include/audio/conversion/s16_to_float.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (s16_to_float.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef __LIBRETRO_SDK_CONVERSION_S16_TO_FLOAT_H__
-#define __LIBRETRO_SDK_CONVERSION_S16_TO_FLOAT_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * convert_s16_to_float:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied (.e.g. audio volume)
- *
- * Converts from signed integer 16-bit
- * to floating point.
- **/
-void convert_s16_to_float(float *out,
-      const int16_t *in, size_t samples, float gain);
-
-/**
- * convert_s16_to_float_init_simd:
- *
- * Sets up function pointers for conversion
- * functions based on CPU features.
- **/
-void convert_s16_to_float_init_simd(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/audio/dsp_filter.h b/libretro-common/include/audio/dsp_filter.h
deleted file mode 100644
index 2055235..0000000
--- a/libretro-common/include/audio/dsp_filter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dsp_filter.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_AUDIO_DSP_FILTER_H
-#define __LIBRETRO_SDK_AUDIO_DSP_FILTER_H
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct retro_dsp_filter retro_dsp_filter_t;
-
-retro_dsp_filter_t *retro_dsp_filter_new(const char *filter_config,
-      void *string_data, float sample_rate);
-
-void retro_dsp_filter_free(retro_dsp_filter_t *dsp);
-
-struct retro_dsp_data
-{
-   float *input;
-   unsigned input_frames;
-
-   /* Set by retro_dsp_filter_process(). */
-   float *output;
-   unsigned output_frames;
-};
-
-void retro_dsp_filter_process(retro_dsp_filter_t *dsp,
-      struct retro_dsp_data *data);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/clamping.h b/libretro-common/include/clamping.h
deleted file mode 100644
index 7919332..0000000
--- a/libretro-common/include/clamping.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (clamping.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_CLAMPING_H
-#define _LIBRETRO_SDK_CLAMPING_H
-
-#include <stdint.h>
-#include <retro_inline.h>
-
-/**
- * clamp_float:
- * @val           : initial value
- * @lower         : lower limit that value should be clamped against
- * @upper         : upper limit that value should be clamped against
- *
- * Clamps a floating point value.
- *
- * Returns: a clamped value of initial float value @val.
- */
-static INLINE float clamp_float(float val, float lower, float upper)
-{
-   if (val < lower)
-      return lower;
-   if (val > upper)
-      return upper;
-   return val;
-}
-
-/**
- * clamp_8bit:
- * @val           : initial value
- *
- * Clamps an unsigned 8-bit value.
- *
- * Returns: a clamped value of initial unsigned 8-bit value @val.
- */
-static INLINE uint8_t clamp_8bit(int val)
-{
-   if (val > 255)
-      return 255;
-   if (val < 0)
-      return 0;
-   return (uint8_t)val;
-}
-
-#endif
diff --git a/libretro-common/include/compat/apple_compat.h b/libretro-common/include/compat/apple_compat.h
deleted file mode 100644
index f656546..0000000
--- a/libretro-common/include/compat/apple_compat.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (apple_compat.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __APPLE_COMPAT_H
-#define __APPLE_COMPAT_H
-
-#ifdef __APPLE__
-#include <AvailabilityMacros.h>
-#endif
-
-#ifdef __OBJC__
-
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
-typedef int NSInteger;
-typedef unsigned NSUInteger;
-typedef float CGFloat;
-#endif
-
-#ifndef __has_feature
-/* Compatibility with non-Clang compilers. */
-#define __has_feature(x) 0
-#endif
-
-#ifndef CF_RETURNS_RETAINED
-#if __has_feature(attribute_cf_returns_retained)
-#define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
-#else
-#define CF_RETURNS_RETAINED
-#endif
-#endif
-
-#ifndef NS_INLINE
-#define NS_INLINE inline
-#endif
-
-NS_INLINE CF_RETURNS_RETAINED CFTypeRef CFBridgingRetainCompat(id X)
-{
-#if __has_feature(objc_arc)
-   return (__bridge_retained CFTypeRef)X;
-#else
-   return X;
-#endif
-}
-
-#endif
-
-#ifdef IOS
-#ifndef __IPHONE_5_0
-#warning "This project uses features only available in iOS SDK 5.0 and later."
-#endif
-
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#import <GLKit/GLKit.h>
-#import <Foundation/Foundation.h>
-#endif
-
-#else
-
-#ifdef __OBJC__
-#include <objc/objc-runtime.h>
-#endif
-#endif
-
-#endif
diff --git a/libretro-common/include/compat/fnmatch.h b/libretro-common/include/compat/fnmatch.h
deleted file mode 100644
index 3f3c025..0000000
--- a/libretro-common/include/compat/fnmatch.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fnmatch.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_FNMATCH_H__
-#define __LIBRETRO_SDK_COMPAT_FNMATCH_H__
-
-#define	FNM_NOMATCH	1
-
-int rl_fnmatch(const char *pattern, const char *string, int flags);
-
-#endif
diff --git a/libretro-common/include/compat/getopt.h b/libretro-common/include/compat/getopt.h
deleted file mode 100644
index fd5300a..0000000
--- a/libretro-common/include/compat/getopt.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (getopt.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_GETOPT_H
-#define __LIBRETRO_SDK_COMPAT_GETOPT_H
-
-#if defined(RARCH_INTERNAL) && defined(HAVE_CONFIG_H)
-#include "../../../config.h"
-#endif
-
-/* Custom implementation of the GNU getopt_long for portability.
- * Not designed to be fully compatible, but compatible with 
- * the features RetroArch uses. */
-
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#else
-/* Avoid possible naming collisions during link since we 
- * prefer to use the actual name. */
-#define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_retro(argc, argv, optstring, longopts, longindex)
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-struct option
-{
-   const char *name;
-   int has_arg;
-   int *flag;
-   int val;
-};
-
-/* argv[] is declared with char * const argv[] in GNU,
- * but this makes no sense, as non-POSIX getopt_long 
- * mutates argv (non-opts are moved to the end). */
-int getopt_long(int argc, char *argv[],
-      const char *optstring, const struct option *longopts, int *longindex);
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-RETRO_END_DECLS
-
-/* If these are variously #defined, then we have bigger problems */
-#ifndef no_argument
-   #define no_argument 0
-   #define required_argument 1
-   #define optional_argument 2
-#endif
-
-/* HAVE_GETOPT_LONG */
-#endif
-
-/* pragma once */
-#endif
-
diff --git a/libretro-common/include/compat/ifaddrs.h b/libretro-common/include/compat/ifaddrs.h
deleted file mode 100644
index 2dc6848..0000000
--- a/libretro-common/include/compat/ifaddrs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI ifaddrs.h,v 2.5 2000/02/23 14:51:59 dab Exp
- */
-
-#ifndef	_IFADDRS_H_
-#define	_IFADDRS_H_
-
-struct ifaddrs
-{
-   struct ifaddrs  *ifa_next;
-   char		*ifa_name;
-   unsigned int	 ifa_flags;
-   struct sockaddr	*ifa_addr;
-   struct sockaddr	*ifa_netmask;
-   struct sockaddr	*ifa_dstaddr;
-   void		*ifa_data;
-};
-
-/*
- * This may have been defined in <net/if.h>.  Note that if <net/if.h> is
- * to be included it must be included before this header file.
- */
-#ifndef	ifa_broadaddr
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-#endif
-
-#include <sys/cdefs.h>
-
-extern int getifaddrs(struct ifaddrs **ifap);
-extern void freeifaddrs(struct ifaddrs *ifa);
-
-#endif
diff --git a/libretro-common/include/compat/intrinsics.h b/libretro-common/include/compat/intrinsics.h
deleted file mode 100644
index d4aa3c1..0000000
--- a/libretro-common/include/compat/intrinsics.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (intrinsics.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_INTRINSICS_H
-#define __LIBRETRO_SDK_COMPAT_INTRINSICS_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include <string.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-#if defined(_MSC_VER) && !defined(_XBOX)
-#if (_MSC_VER > 1310)
-#include <intrin.h>
-#endif
-#endif
-
-RETRO_BEGIN_DECLS
-
-/* Count Leading Zero, unsigned 16bit input value */
-static INLINE unsigned compat_clz_u16(uint16_t val)
-{
-#ifdef __GNUC__
-   return __builtin_clz(val << 16 | 0x8000);
-#else
-   unsigned ret = 0;
-
-   while(!(val & 0x8000) && ret < 16)
-   {
-      val <<= 1;
-      ret++;
-   }
-
-   return ret;
-#endif
-}
-
-/* Count Trailing Zero */
-static INLINE int compat_ctz(unsigned x)
-{
-#if defined(__GNUC__) && !defined(RARCH_CONSOLE)
-   return __builtin_ctz(x);
-#elif _MSC_VER >= 1400
-   unsigned long r = 0;
-   _BitScanReverse((unsigned long*)&r, x);
-   return (int)r;
-#else
-/* Only checks at nibble granularity, 
- * because that's what we need. */
-   if (x & 0x000f)
-      return 0;
-   if (x & 0x00f0)
-      return 4;
-   if (x & 0x0f00)
-      return 8;
-   if (x & 0xf000)
-      return 12;
-   return 16;
-#endif
-}
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/compat/msvc.h b/libretro-common/include/compat/msvc.h
deleted file mode 100644
index 76bc2e4..0000000
--- a/libretro-common/include/compat/msvc.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (msvc.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_MSVC_H
-#define __LIBRETRO_SDK_COMPAT_MSVC_H
-
-#ifdef _MSC_VER
-
-#ifdef __cplusplus
-extern "C"  {
-#endif
-
-/* Pre-MSVC 2015 compilers don't implement snprintf in a cross-platform manner. */
-#if _MSC_VER < 1900
-   #include <stdlib.h>
-   #ifndef snprintf
-      #define snprintf c99_snprintf_retro__
-   #endif
-   
-   int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...);
-#endif
-
-/* Pre-MSVC 2010 compilers don't implement vsnprintf in a cross-platform manner? Not sure about this one. */
-#if _MSC_VER < 1600 
-   #include <stdarg.h>
-   #include <stdlib.h>
-   #ifndef vsnprintf
-      #define vsnprintf c99_vsnprintf_retro__
-   #endif
-   int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef UNICODE /* Do not bother with UNICODE at this time. */
-#include <direct.h>
-#include <stddef.h>
-#include <math.h>
-
-/* Python headers defines ssize_t and sets HAVE_SSIZE_T.
- * Cannot duplicate these efforts.
- */
-#ifndef HAVE_SSIZE_T
-#if defined(_WIN64)
-typedef __int64 ssize_t;
-#elif defined(_WIN32)
-typedef int ssize_t;
-#endif
-#endif
-
-#define mkdir(dirname, unused) _mkdir(dirname)
-#define strtoull _strtoui64
-#undef strcasecmp
-#define strcasecmp _stricmp
-#undef strncasecmp
-#define strncasecmp _strnicmp
-
-/* Disable some of the annoying warnings. */
-#pragma warning(disable : 4800)
-#pragma warning(disable : 4805)
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4305)
-#pragma warning(disable : 4146)
-#pragma warning(disable : 4267)
-#pragma warning(disable : 4723)
-#pragma warning(disable : 4996)
-
-/* roundf is available since MSVC 2013 */
-#if _MSC_VER < 1800
-#define roundf(in) (in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f))
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX _MAX_PATH
-#endif
-
-#ifndef SIZE_MAX
-#define SIZE_MAX _UI32_MAX
-#endif
-
-#endif
-#endif
-
diff --git a/libretro-common/include/compat/msvc/stdint.h b/libretro-common/include/compat/msvc/stdint.h
deleted file mode 100644
index 403e1f7..0000000
--- a/libretro-common/include/compat/msvc/stdint.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ISO C9x  compliant stdint.h for Microsoft Visual Studio
- * Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
- *
- * Copyright (c) 2006-2008 Alexander Chemeris
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __RARCH_STDINT_H
-#define __RARCH_STDINT_H
-
-#if _MSC_VER && (_MSC_VER < 1600)
-/* Pre-MSVC 2010 needs an implementation of stdint.h. */
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-/* For Visual Studio 6 in C++ mode and for many Visual Studio versions when
- * compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
- * or compiler give many errors like this:
- *
- * error C2733: second C linkage of overloaded function 'wmemchr' not allowed
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#  include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-/* Define _W64 macros to mark types changing their size, like intptr_t. */
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-/* 7.18.1 Integer types. */
-
-/* 7.18.1.1 Exact-width integer types. */
-
-/* Visual Studio 6 and Embedded Visual C++ 4 doesn't
- * realize that, e.g. char has the same size as __int8
- * so we give up on __intX for them.
- */
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-/* 7.18.1.2 Minimum-width integer types. */
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-/* 7.18.1.3 Fastest minimum-width integer types. */
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-/* 7.18.1.4 Integer types capable of holding object pointers. */
-#ifdef _WIN64 /* [ */
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else /* _WIN64 ][ */
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif /* _WIN64 ] */
-
-/* 7.18.1.5 Greatest-width integer types. */
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-/* 7.18.2 Limits of specified-width integer types. */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-/* [   See footnote 220 at page 257 and footnote 221 at page 259. */
-
-/* 7.18.2.1 Limits of exact-width integer types. */
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-/* 7.18.2.2 Limits of minimum-width integer types. */
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-/* 7.18.2.3 Limits of fastest minimum-width integer types. */
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-/* 7.18.2.4 Limits of integer types capable of holding object pointers. */
-#ifdef _WIN64 /* [ */
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else /* _WIN64 ][ */
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif /* _WIN64 ] */
-
-/* 7.18.2.5 Limits of greatest-width integer types */
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-/* 7.18.3 Limits of other integer types */
-
-#ifdef _WIN64 /* [ */
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  /* _WIN64 ][ */
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  /* _WIN64 ] */
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX /* [ */
-#  ifdef _WIN64 /* [ */
-#     define SIZE_MAX  _UI64_MAX
-#  else /* _WIN64 ][ */
-#     define SIZE_MAX  _UI32_MAX
-#  endif /* _WIN64 ] */
-#endif /* SIZE_MAX ] */
-
-/* WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h> */
-#ifndef WCHAR_MIN /* [ */
-#  define WCHAR_MIN  0
-#endif  /* WCHAR_MIN ] */
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  /* WCHAR_MAX ] */
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif /* __STDC_LIMIT_MACROS ] */
-
-/* 7.18.4 Limits of other integer types */
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-/* [   See footnote 224 at page 260 */
-
-/* 7.18.4.1 Macros for minimum-width integer constants */
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-/* 7.18.4.2 Macros for greatest-width integer constants */
-#define INTMAX_C   INT64_C
-#define UINTMAX_C  UINT64_C
-
-#endif
-/* __STDC_CONSTANT_MACROS ] */
-
-#else
-/* Sanity for everything else. */
-#include <stdint.h>
-#endif
-
-#endif
-
diff --git a/libretro-common/include/compat/posix_string.h b/libretro-common/include/compat/posix_string.h
deleted file mode 100644
index 380e1a1..0000000
--- a/libretro-common/include/compat/posix_string.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (posix_string.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
-#define __LIBRETRO_SDK_COMPAT_POSIX_STRING_H
-
-#include <retro_common_api.h>
-
-#ifdef _MSC_VER
-#include <compat/msvc.h>
-#endif
-
-RETRO_BEGIN_DECLS
-
-#ifdef _WIN32
-#undef strtok_r
-#define strtok_r(str, delim, saveptr) retro_strtok_r__(str, delim, saveptr)
-
-char *strtok_r(char *str, const char *delim, char **saveptr);
-#endif
-
-#ifdef _MSC_VER
-#undef strcasecmp
-#undef strdup
-#define strcasecmp(a, b) retro_strcasecmp__(a, b)
-#define strdup(orig)     retro_strdup__(orig)
-int strcasecmp(const char *a, const char *b);
-char *strdup(const char *orig);
-
-/* isblank is available since MSVC 2013 */
-#if _MSC_VER < 1800
-#undef isblank
-#define isblank(c)       retro_isblank__(c)
-int isblank(int c);
-#endif
-
-#endif
-
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/compat/strcasestr.h b/libretro-common/include/compat/strcasestr.h
deleted file mode 100644
index a8676a5..0000000
--- a/libretro-common/include/compat/strcasestr.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (strcasestr.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_STRCASESTR_H
-#define __LIBRETRO_SDK_COMPAT_STRCASESTR_H
-
-#include <string.h>
-
-#if defined(RARCH_INTERNAL) && defined(HAVE_CONFIG_H)
-#include "../../../config.h"
-#endif
-
-#ifndef HAVE_STRCASESTR
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/* Avoid possible naming collisions during link 
- * since we prefer to use the actual name. */
-#define strcasestr(haystack, needle) strcasestr_retro__(haystack, needle)
-
-char *strcasestr(const char *haystack, const char *needle);
-
-RETRO_END_DECLS
-
-#endif
-
-#endif
-
diff --git a/libretro-common/include/compat/strl.h b/libretro-common/include/compat/strl.h
deleted file mode 100644
index a68005a..0000000
--- a/libretro-common/include/compat/strl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (strl.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_STRL_H
-#define __LIBRETRO_SDK_COMPAT_STRL_H
-
-#include <string.h>
-#include <stddef.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../../../config.h"
-#endif
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#ifdef __MACH__
-#ifndef HAVE_STRL
-#define HAVE_STRL
-#endif
-#endif
-
-#ifndef HAVE_STRL
-/* Avoid possible naming collisions during link since 
- * we prefer to use the actual name. */
-#define strlcpy(dst, src, size) strlcpy_retro__(dst, src, size)
-
-#define strlcat(dst, src, size) strlcat_retro__(dst, src, size)
-
-size_t strlcpy(char *dest, const char *source, size_t size);
-size_t strlcat(char *dest, const char *source, size_t size);
-
-#endif
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/compat/zconf.h b/libretro-common/include/compat/zconf.h
deleted file mode 100644
index 007b644..0000000
--- a/libretro-common/include/compat/zconf.h
+++ /dev/null
@@ -1,483 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#  endif
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/libretro-common/include/compat/zconf.h.in b/libretro-common/include/compat/zconf.h.in
deleted file mode 100644
index 007b644..0000000
--- a/libretro-common/include/compat/zconf.h.in
+++ /dev/null
@@ -1,483 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#  endif
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/libretro-common/include/compat/zlib.h b/libretro-common/include/compat/zlib.h
deleted file mode 100644
index 60fa3be..0000000
--- a/libretro-common/include/compat/zlib.h
+++ /dev/null
@@ -1,1780 +0,0 @@
-#ifndef _COMPAT_ZLIB_H
-#define _COMPAT_ZLIB_H
-
-#ifdef WANT_ZLIB
-
-#ifdef RARCH_INTERNAL
-#include "zconf.h.in"
-#endif
-
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  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.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include <stdint.h>
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip streams in memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) (voidpf opaque, uInt items, uInt size);
-typedef void   (*free_func)  (voidpf opaque, voidpf address);
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    void *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
- const char * zlibVersion (void);
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
- int deflateInit (z_streamp strm, int level);
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
- int deflate (z_streamp strm, int flush);
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
- int deflateEnd (z_streamp strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
- int inflateInit (z_streamp strm);
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
-*/
-
-
- int inflate (z_streamp strm, int flush);
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
-*/
-
-
- int inflateEnd (z_streamp strm);
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
- int deflateInit2 (z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy);
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
- int deflateSetDictionary (z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength);
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
- int deflateCopy (z_streamp dest,
-                                    z_streamp source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
- int deflateReset (z_streamp strm);
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
- int deflateParams (z_streamp strm,
-                                      int level,
-                                      int strategy);
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
- int deflateTune (z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain);
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
- uLong deflateBound (z_streamp strm,
-                                       uLong sourceLen);
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
- int deflatePending (z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits);
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
- int deflatePrime (z_streamp strm,
-                                     int bits,
-                                     int value);
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
- int deflateSetHeader (z_streamp strm,
-                                         gz_headerp head);
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
- int inflateInit2 (z_streamp strm,
-                                     int  windowBits);
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
- int inflateSetDictionary (z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength);
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
- int inflateGetDictionary (z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength);
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
- int inflateSync (z_streamp strm);
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
- int inflateCopy (z_streamp dest,
-                                    z_streamp source);
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
- int inflateReset (z_streamp strm);
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
- int inflateReset2 (z_streamp strm,
-                                      int windowBits);
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
- int inflatePrime (z_streamp strm,
-                                     int bits,
-                                     int value);
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
- long  inflateMark (z_streamp strm);
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
- int  inflateGetHeader (z_streamp strm,
-                                         gz_headerp head);
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
- int  inflateBackInit (z_streamp strm, int windowBits,
-                                        unsigned char FAR *window);
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) (void FAR *,
-                                z_const unsigned char FAR * FAR *);
-typedef int (*out_func) (void FAR *, unsigned char FAR *, unsigned);
-
- int  inflateBack (z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc);
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
-*/
-
- int  inflateBackEnd (z_streamp strm);
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
- uLong  zlibCompileFlags (void);
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
- int  compress (Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen);
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
- int  compress2 (Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level);
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
- uLong  compressBound (uLong sourceLen);
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
- int  uncompress (unsigned char *dest,   uint32_t *destLen,
-       const unsigned char *source, uint32_t sourceLen);
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
- gzFile  gzopen (const char *path, const char *mode);
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
- gzFile  gzdopen (int fd, const char *mode);
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
- int  gzbuffer (gzFile file, unsigned size);
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
- int  gzsetparams (gzFile file, int level, int strategy);
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
-
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
- int  gzread (gzFile file, voidp buf, unsigned len);
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
- int  gzwrite (gzFile file,
-                                voidpc buf, unsigned len);
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
- int gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
-*/
-
- int  gzputs (gzFile file, const char *s);
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
- char *  gzgets (gzFile file, char *buf, int len);
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
- int  gzputc (gzFile file, int c);
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
- int  gzgetc (gzFile file);
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
- int  gzungetc (int c, gzFile file);
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
- int  gzflush (gzFile file, int flush);
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
- z_off_t  gzseek (gzFile file,
-                                   z_off_t offset, int whence);
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
- int     gzrewind (gzFile file);
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
- z_off_t     gztell (gzFile file);
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
- z_off_t  gzoffset (gzFile file);
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
- int  gzeof (gzFile file);
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
- int  gzdirect (gzFile file);
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
- int     gzclose (gzFile file);
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
- int  gzclose_r (gzFile file);
- int  gzclose_w (gzFile file);
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
- const char *  gzerror (gzFile file, int *errnum);
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
- void  gzclearerr (gzFile file);
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-uint32_t adler32 (uint32_t adler, const uint8_t *buf, size_t len);
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-/*
- uLong  adler32_combine (uLong adler1, uLong adler2,
-                                          z_off_t len2);
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
- uLong  crc32   (uLong crc, const Bytef *buf, uInt len);
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-/*
- uLong  crc32_combine (uLong crc1, uLong crc2, z_off_t len2);
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
- int  deflateInit_ (z_streamp strm, int level,
-                                     const char *version, int stream_size);
- int  inflateInit_ (z_streamp strm,
-                                     const char *version, int stream_size);
- int  deflateInit2_ (z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size);
- int  inflateInit2_ (z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size);
- int  inflateBackInit_ (z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size);
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
- int  gzgetc_ (gzFile file);  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-    gzFile  gzopen64 (const char *, const char *);
-    z_off64_t  gzseek64 (gzFile, z_off64_t, int);
-    z_off64_t  gztell64 (gzFile);
-    z_off64_t  gzoffset64 (gzFile);
-    uLong  adler32_combine64 (uLong, uLong, z_off64_t);
-    uLong  crc32_combine64 (uLong, uLong, z_off64_t);
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-      gzFile  gzopen64 (const char *, const char *);
-      z_off_t  gzseek64 (gzFile, z_off_t, int);
-      z_off_t  gztell64 (gzFile);
-      z_off_t  gzoffset64 (gzFile);
-      uLong  adler32_combine64 (uLong, uLong, z_off_t);
-      uLong  crc32_combine64 (uLong, uLong, z_off_t);
-#  endif
-#else
-    gzFile  gzopen (const char *, const char *);
-    z_off_t  gzseek (gzFile, z_off_t, int);
-    z_off_t  gztell (gzFile);
-    z_off_t  gzoffset (gzFile);
-    uLong  adler32_combine (uLong, uLong, z_off_t);
-    uLong  crc32_combine (uLong, uLong, z_off_t);
-#endif
-
-#else /* Z_SOLO */
-
-    uLong  adler32_combine (uLong, uLong, z_off_t);
-    uLong  crc32_combine (uLong, uLong, z_off_t);
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
- const char   *  zError           (int);
- int             inflateSyncPoint (z_streamp);
-
-const uint32_t * get_crc_table(void);
- int             inflateUndermine (z_streamp, int);
- int             inflateResetKeep (z_streamp);
- int             deflateResetKeep (z_streamp);
-#if defined(_WIN32) && !defined(Z_SOLO)
- gzFile          gzopen_w (const wchar_t *path,
-                                            const char *mode);
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
- int            gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
-
-#else
-#include <zlib.h>
-#endif
-
-#endif
diff --git a/libretro-common/include/compat/zutil.h b/libretro-common/include/compat/zutil.h
deleted file mode 100644
index bce9a48..0000000
--- a/libretro-common/include/compat/zutil.h
+++ /dev/null
@@ -1,253 +0,0 @@
-#ifndef _COMPAT_ZUTIL_H
-#define _COMPAT_ZUTIL_H
-
-#ifdef WANT_ZLIB
-
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include <compat/zlib.h>
-
-#if defined(STDC) && !defined(Z_SOLO)
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern char z_errmsg[10][21]; /* indexed by 2-zlib_error */
-/* (array size given to avoid silly warnings with Visual C++) */
-/* (array entry size given to avoid silly string cast warnings) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  ifndef Z_SOLO
-#    if defined(__TURBOC__) || defined(__BORLANDC__)
-#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-         /* Allow compilation with ANSI keywords only enabled */
-         void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
-#      else
-#        include <alloc.h>
-#      endif
-#    else /* MSC or DJGPP */
-#      include <malloc.h>
-#    endif
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#  if defined(M_I86) && !defined(Z_SOLO)
-#    include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && \
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    uLong adler32_combine64 (uLong, uLong, z_off_t);
-    uLong crc32_combine64 (uLong, uLong, z_off_t);
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   void ZLIB_INTERNAL zmemcpy (Bytef* dest, const Bytef* source, uInt len);
-   int ZLIB_INTERNAL zmemcmp (const Bytef* s1, const Bytef* s2, uInt len);
-   void ZLIB_INTERNAL zmemzero (Bytef* dest, uInt len);
-#endif
-
-/* Diagnostic functions */
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-
-#ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items,
-                                    unsigned size);
-   void ZLIB_INTERNAL zcfree  (voidpf opaque, voidpf ptr);
-#endif
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-#endif /* ZUTIL_H */
-
-#else
-#include <zutil.h>
-#endif
-
-#endif
diff --git a/libretro-common/include/dynamic/dylib.h b/libretro-common/include/dynamic/dylib.h
deleted file mode 100644
index b8ee171..0000000
--- a/libretro-common/include/dynamic/dylib.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dylib.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __DYLIB_H
-#define __DYLIB_H
-
-#include <boolean.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <retro_common_api.h>
-
-#if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)
-#define NEED_DYNAMIC
-#else
-#undef NEED_DYNAMIC
-#endif
-
-RETRO_BEGIN_DECLS
-
-typedef void *dylib_t;
-typedef void (*function_t)(void);
-
-#ifdef NEED_DYNAMIC
-/**
- * dylib_load:
- * @path                         : Path to libretro core library.
- *
- * Platform independent dylib loading.
- *
- * Returns: library handle on success, otherwise NULL.
- **/
-dylib_t dylib_load(const char *path);
-
-/**
- * dylib_close:
- * @lib                          : Library handle.
- *
- * Frees library handle.
- **/
-void dylib_close(dylib_t lib);
-
-char *dylib_error(void);
-
-function_t dylib_proc(dylib_t lib, const char *proc);
-#endif
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/encodings/crc32.h b/libretro-common/include/encodings/crc32.h
deleted file mode 100644
index d1973e4..0000000
--- a/libretro-common/include/encodings/crc32.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (crc32.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_ENCODINGS_CRC32_H
-#define _LIBRETRO_ENCODINGS_CRC32_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-
-uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/encodings/utf.h b/libretro-common/include/encodings/utf.h
deleted file mode 100644
index cb96a53..0000000
--- a/libretro-common/include/encodings/utf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (utf.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_ENCODINGS_UTF_H
-#define _LIBRETRO_ENCODINGS_UTF_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
-      const char *in, size_t in_size);
-
-bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
-      const uint16_t *in, size_t in_size);
-
-size_t utf8len(const char *string);
-
-size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars);
-
-const char *utf8skip(const char *str, size_t chars);
-
-uint32_t utf8_walk(const char **string);
-
-bool utf16_to_char_string(const uint16_t *in, char *s, size_t len);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/encodings/win32.h b/libretro-common/include/encodings/win32.h
deleted file mode 100644
index 7d8057e..0000000
--- a/libretro-common/include/encodings/win32.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright  (C) 2010-2016 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (utf.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_ENCODINGS_WIN32_H
-#define _LIBRETRO_ENCODINGS_WIN32_H
-
-#ifndef _XBOX
-#ifdef _WIN32
-/*#define UNICODE
-#include <tchar.h>
-#include <wchar.h>*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <encodings/utf.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif
-
-#ifdef UNICODE
-#define CHAR_TO_WCHAR_ALLOC(s, ws) \
-   size_t ws##_size = (NULL != s && s[0] ? strlen(s) : 0) + 1; \
-   wchar_t *ws = (wchar_t*)calloc(ws##_size, 2); \
-   if (NULL != s && s[0]) \
-      MultiByteToWideChar(CP_UTF8, 0, s, -1, ws, ws##_size / sizeof(wchar_t));
-
-#define WCHAR_TO_CHAR_ALLOC(ws, s) \
-   size_t s##_size = ((NULL != ws && ws[0] ? wcslen((const wchar_t*)ws) : 0) / 2) + 1; \
-   char *s = (char*)calloc(s##_size, 1); \
-   if (NULL != ws && ws[0]) \
-      utf16_to_char_string((const uint16_t*)ws, s, s##_size);
-
-#else
-#define CHAR_TO_WCHAR_ALLOC(s, ws) char *ws = (NULL != s && s[0] ? strdup(s) : NULL);
-#define WCHAR_TO_CHAR_ALLOC(ws, s) char *s = (NULL != ws && ws[0] ? strdup(ws) : NULL);
-#endif
-
-#endif
diff --git a/libretro-common/include/fastcpy.h b/libretro-common/include/fastcpy.h
deleted file mode 100644
index 13b94d9..0000000
--- a/libretro-common/include/fastcpy.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fastcpy.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* in the future ASM and new c++ features can be added to speed up copying */
-#include <stdint.h>
-#include <string.h>
-#include <retro_inline.h>
-
-static INLINE void* memcpy16(void* dst,void* src,size_t size)
-{
-   return memcpy(dst,src,size * 2);
-}
-
-static INLINE void* memcpy32(void* dst,void* src,size_t size)
-{
-   return memcpy(dst,src,size * 4);
-}
-
-static INLINE void* memcpy64(void* dst,void* src,size_t size)
-{
-   return memcpy(dst,src,size * 8);
-}
-
-#ifdef USECPPSTDFILL
-#include <algorithm>
-
-static INLINE void* memset16(void* dst,uint16_t val,size_t size)
-{
-   uint16_t* typedptr = (uint16_t*)dst;
-   std::fill(typedptr, typedptr + size, val);
-   return dst;
-}
-
-static INLINE void* memset32(void* dst,uint32_t val,size_t size)
-{
-   uint32_t* typedptr = (uint32_t*)dst;
-   std::fill(typedptr, typedptr + size, val);
-   return dst;
-}
-
-static INLINE void* memset64(void* dst,uint64_t val,size_t size)
-{
-   uint64_t* typedptr = (uint64_t*)dst;
-   std::fill(typedptr, typedptr + size, val);
-   return dst;
-}
-#else
-
-static INLINE void* memset16(void* dst,uint16_t val,size_t size)
-{
-   size_t i;
-   uint16_t* typedptr = (uint16_t*)dst;
-   for(i = 0;i < size;i++)
-      typedptr[i] = val;
-   return dst;
-}
-
-static INLINE void* memset32(void* dst,uint32_t val,size_t size)
-{
-   size_t i;
-   uint32_t* typedptr = (uint32_t*)dst;
-   for(i = 0;i < size;i++)
-      typedptr[i] = val;
-   return dst;
-}
-
-static INLINE void* memset64(void* dst,uint64_t val,size_t size)
-{
-   size_t i;
-   uint64_t* typedptr = (uint64_t*)dst;
-   for(i = 0;i < size;i++)
-      typedptr[i] = val;
-   return dst;
-}
-#endif
diff --git a/libretro-common/include/features/features_cpu.h b/libretro-common/include/features/features_cpu.h
deleted file mode 100644
index fd8f5f6..0000000
--- a/libretro-common/include/features/features_cpu.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (features_cpu.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_CPU_INFO_H
-#define _LIBRETRO_SDK_CPU_INFO_H
-
-#include <retro_common_api.h>
-
-#include <stdint.h>
-
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * cpu_features_get_perf_counter:
- *
- * Gets performance counter.
- *
- * Returns: performance counter.
- **/
-retro_perf_tick_t cpu_features_get_perf_counter(void);
-
-/**
- * cpu_features_get_time_usec:
- *
- * Gets time in microseconds, from an undefined epoch.
- * The epoch may change between computers or across reboots.
- *
- * Returns: time in microseconds
- **/
-retro_time_t cpu_features_get_time_usec(void);
-
-/**
- * cpu_features_get:
- *
- * Gets CPU features.
- *
- * Returns: bitmask of all CPU features available.
- **/
-uint64_t cpu_features_get(void);
-
-/**
- * cpu_features_get_core_amount:
- *
- * Gets the amount of available CPU cores.
- *
- * Returns: amount of CPU cores available.
- **/
-unsigned cpu_features_get_core_amount(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/file/archive_file.h b/libretro-common/include/file/archive_file.h
deleted file mode 100644
index 8abe221..0000000
--- a/libretro-common/include/file/archive_file.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (archive_file.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_SDK_ARCHIVE_FILE_H__
-#define LIBRETRO_SDK_ARCHIVE_FILE_H__
-
-#include <stdint.h>
-#include <stddef.h>
-#include <boolean.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <retro_miscellaneous.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum file_archive_transfer_type
-{
-   ARCHIVE_TRANSFER_NONE = 0,
-   ARCHIVE_TRANSFER_INIT,
-   ARCHIVE_TRANSFER_ITERATE,
-   ARCHIVE_TRANSFER_DEINIT,
-   ARCHIVE_TRANSFER_DEINIT_ERROR
-};
-
-typedef struct file_archive_handle
-{
-   void     *stream;
-   uint8_t  *data;
-   uint32_t real_checksum;
-   const struct file_archive_file_backend *backend;
-} file_archive_file_handle_t;
-
-typedef struct file_archive_file_data file_archive_file_data_t;
-
-typedef struct file_archive_transfer
-{
-   file_archive_file_data_t *handle;
-   void *stream;
-   const uint8_t *footer;
-   const uint8_t *directory;
-   const uint8_t *data;
-   int32_t archive_size;
-   enum file_archive_transfer_type type;
-   const struct file_archive_file_backend *backend;
-} file_archive_transfer_t;
-
-enum file_archive_compression_mode
-{
-   ARCHIVE_MODE_UNCOMPRESSED = 0,
-   ARCHIVE_MODE_COMPRESSED   = 8
-};
-
-struct decomp_state_t
-{
-   char *opt_file;
-   char *needle;
-   void **buf;
-   size_t size;
-   bool found;
-};
-
-typedef struct
-{
-   char *source_file;
-   char *subdir;
-   char *target_dir;
-   char *target_file;
-   char *valid_ext;
-
-   char *callback_error;
-
-   file_archive_transfer_t archive;
-} decompress_state_t;
-
-struct archive_extract_userdata
-{
-   char archive_path[PATH_MAX_LENGTH];
-   char *first_extracted_file_path;
-   char *extracted_file_path;
-   const char *extraction_directory;
-   size_t archive_path_size;
-   struct string_list *ext;
-   struct string_list *list;
-   bool found_file;
-   bool list_only;
-   void *context;
-   char archive_name[PATH_MAX_LENGTH];
-   uint32_t crc;
-   struct decomp_state_t decomp_state;
-   decompress_state_t *dec;
-};
-
-/* Returns true when parsing should continue. False to stop. */
-typedef int (*file_archive_file_cb)(const char *name, const char *valid_exts,
-      const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size,
-      uint32_t crc32, struct archive_extract_userdata *userdata);
-
-struct file_archive_file_backend
-{
-   void *(*stream_new)(void);
-   void  (*stream_free)(void *);
-   bool     (*stream_decompress_data_to_file_init)(
-         file_archive_file_handle_t *, const uint8_t *,  uint32_t, uint32_t);
-   int      (*stream_decompress_data_to_file_iterate)(void *);
-   uint32_t (*stream_crc_calculate)(uint32_t, const uint8_t *, size_t);
-   int (*compressed_file_read)(const char *path, const char *needle, void **buf,
-         const char *optional_outfile);
-   int (*archive_parse_file_init)(
-      file_archive_transfer_t *state,
-      const char *file);
-   int (*archive_parse_file_iterate_step)(
-      file_archive_transfer_t *state,
-      const char *valid_exts,
-      struct archive_extract_userdata *userdata,
-      file_archive_file_cb file_cb);
-   const char *ident;
-};
-
-int file_archive_parse_file_iterate(
-      file_archive_transfer_t *state,
-      bool *returnerr,
-      const char *file,
-      const char *valid_exts,
-      file_archive_file_cb file_cb,
-      struct archive_extract_userdata *userdata);
-
-void file_archive_parse_file_iterate_stop(file_archive_transfer_t *state);
-
-int file_archive_parse_file_progress(file_archive_transfer_t *state);
-
-/**
- * file_archive_extract_file:
- * @archive_path                    : filename path to ZIP archive.
- * @archive_path_size               : size of ZIP archive.
- * @valid_exts                  : valid extensions for a file.
- * @extraction_directory        : the directory to extract the temporary
- *                                file to.
- *
- * Extract file from archive. If no file inside the archive is
- * specified, the first file found will be used.
- *
- * Returns : true (1) on success, otherwise false (0).
- **/
-bool file_archive_extract_file(char *archive_path, size_t archive_path_size,
-      const char *valid_exts, const char *extraction_dir,
-      char *out_path, size_t len);
-
-/**
- * file_archive_get_file_list:
- * @path                        : filename path of archive
- * @valid_exts                  : Valid extensions of archive to be parsed.
- *                                If NULL, allow all.
- *
- * Returns: string listing of files from archive on success, otherwise NULL.
- **/
-struct string_list* file_archive_get_file_list(const char *path, const char *valid_exts);
-
-bool file_archive_perform_mode(const char *name, const char *valid_exts,
-      const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size,
-      uint32_t crc32, struct archive_extract_userdata *userdata);
-
-int file_archive_compressed_read(
-      const char* path, void **buf,
-      const char* optional_filename, ssize_t *length);
-
-const struct file_archive_file_backend* file_archive_get_zlib_file_backend(void);
-const struct file_archive_file_backend* file_archive_get_7z_file_backend(void);
-
-const struct file_archive_file_backend* file_archive_get_file_backend(const char *path);
-
-/**
- * file_archive_get_file_crc32:
- * @path                         : filename path of archive
- *
- * Returns: CRC32 of the specified file in the archive, otherwise 0.
- * If no path within the archive is specified, the first
- * file found inside is used.
- **/
-uint32_t file_archive_get_file_crc32(const char *path);
-
-extern const struct file_archive_file_backend zlib_backend;
-extern const struct file_archive_file_backend sevenzip_backend;
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/file/config_file.h b/libretro-common/include/file/config_file.h
deleted file mode 100644
index 3e26acf..0000000
--- a/libretro-common/include/file/config_file.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (config_file.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef __LIBRETRO_SDK_CONFIG_FILE_H
-#define __LIBRETRO_SDK_CONFIG_FILE_H
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-
-#define CONFIG_GET_BOOL_BASE(conf, base, var, key) do { \
-   bool tmp = false; \
-   if (config_get_bool(conf, key, &tmp)) \
-      base->var = tmp; \
-} while(0)
-
-#define CONFIG_GET_INT_BASE(conf, base, var, key) do { \
-   int tmp = 0; \
-   if (config_get_int(conf, key, &tmp)) \
-      base->var = tmp; \
-} while(0)
-
-#define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \
-   float tmp = 0.0f; \
-   if (config_get_float(conf, key, &tmp)) \
-      base->var = tmp; \
-} while(0)
-
-typedef struct config_file config_file_t;
-
-/* Config file format
- * - # are treated as comments. Rest of the line is ignored.
- * - Format is: key = value. There can be as many spaces as you like in-between.
- * - Value can be wrapped inside "" for multiword strings. (foo = "hai u")
- * - #include includes a config file in-place.
- *
- * Path is relative to where config file was loaded unless an absolute path is chosen.
- * Key/value pairs from an #include are read-only, and cannot be modified.
- */
-
-/* Loads a config file. Returns NULL if file doesn't exist.
- * NULL path will create an empty config file. */
-config_file_t *config_file_new(const char *path);
-
-/* Load a config file from a string. */
-config_file_t *config_file_new_from_string(const char *from_string);
-
-/* Frees config file. */
-void config_file_free(config_file_t *conf);
-
-/* Loads a new config, and appends its data to conf.
- * The key-value pairs of the new config file takes priority over the old. */
-bool config_append_file(config_file_t *conf, const char *path);
-
-/* All extract functions return true when value is valid and exists.
- * Returns false otherwise. */
-
-bool config_entry_exists(config_file_t *conf, const char *entry);
-
-struct config_entry_list;
-struct config_file_entry
-{
-   const char *key;
-   const char *value;
-   /* Used intentionally. Opaque here. */
-   const struct config_entry_list *next;
-};
-
-bool config_get_entry_list_head(config_file_t *conf, struct config_file_entry *entry);
-bool config_get_entry_list_next(struct config_file_entry *entry);
-
-/* Extracts a double from config file. */
-bool config_get_double(config_file_t *conf, const char *entry, double *in);
-
-/* Extracts a float from config file. */
-bool config_get_float(config_file_t *conf, const char *entry, float *in);
-
-/* Extracts an int from config file. */
-bool config_get_int(config_file_t *conf, const char *entry, int *in);
-
-/* Extracts an uint from config file. */
-bool config_get_uint(config_file_t *conf, const char *entry, unsigned *in);
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-/* Extracts an uint64 from config file. */
-bool config_get_uint64(config_file_t *conf, const char *entry, uint64_t *in);
-#endif
-
-/* Extracts an unsigned int from config file treating input as hex. */
-bool config_get_hex(config_file_t *conf, const char *entry, unsigned *in);
-
-/* Extracts a single char. If value consists of several chars, 
- * this is an error. */
-bool config_get_char(config_file_t *conf, const char *entry, char *in);
-
-/* Extracts an allocated string in *in. This must be free()-d if 
- * this function succeeds. */
-bool config_get_string(config_file_t *conf, const char *entry, char **in);
-
-/* Extracts a string to a preallocated buffer. Avoid memory allocation. */
-bool config_get_array(config_file_t *conf, const char *entry, char *s, size_t len);
-
-/* Extracts a string to a preallocated buffer. Avoid memory allocation.
- * Recognized magic like ~/. Similar to config_get_array() otherwise. */
-bool config_get_path(config_file_t *conf, const char *entry, char *s, size_t len);
-
-/* Extracts a string to a preallocated buffer. Avoid memory allocation. */
-bool config_get_config_path(config_file_t *conf, char *s, size_t len);
-
-/* Extracts a boolean from config.
- * Valid boolean true are "true" and "1". Valid false are "false" and "0".
- * Other values will be treated as an error. */
-bool config_get_bool(config_file_t *conf, const char *entry, bool *in);
-
-/* Setters. Similar to the getters. 
- * Will not write to entry if the entry was obtained from an #include. */
-void config_set_double(config_file_t *conf, const char *entry, double value);
-void config_set_float(config_file_t *conf, const char *entry, float value);
-void config_set_int(config_file_t *conf, const char *entry, int val);
-void config_set_hex(config_file_t *conf, const char *entry, unsigned val);
-void config_set_uint64(config_file_t *conf, const char *entry, uint64_t val);
-void config_set_char(config_file_t *conf, const char *entry, char val);
-void config_set_string(config_file_t *conf, const char *entry, const char *val);
-void config_unset(config_file_t *conf, const char *key);
-void config_set_path(config_file_t *conf, const char *entry, const char *val);
-void config_set_bool(config_file_t *conf, const char *entry, bool val);
-
-/* Write the current config to a file. */
-bool config_file_write(config_file_t *conf, const char *path);
-
-/* Dump the current config to an already opened file.
- * Does not close the file. */
-void config_file_dump(config_file_t *conf, FILE *file);
-
-bool config_file_exists(const char *path);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/file/config_file_userdata.h b/libretro-common/include/file/config_file_userdata.h
deleted file mode 100644
index 0c433ed..0000000
--- a/libretro-common/include/file/config_file_userdata.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (config_file_userdata.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_CONFIG_FILE_USERDATA_H
-#define _LIBRETRO_SDK_CONFIG_FILE_USERDATA_H
-
-#include <string.h>
-
-#include <file/config_file.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-struct config_file_userdata
-{
-   config_file_t *conf;
-   const char *prefix[2];
-};
-
-int config_userdata_get_float(void *userdata, const char *key_str,
-      float *value, float default_value);
-
-int config_userdata_get_int(void *userdata, const char *key_str,
-      int *value, int default_value);
-
-int config_userdata_get_float_array(void *userdata, const char *key_str,
-      float **values, unsigned *out_num_values,
-      const float *default_values, unsigned num_default_values);
-
-int config_userdata_get_int_array(void *userdata, const char *key_str,
-      int **values, unsigned *out_num_values,
-      const int *default_values, unsigned num_default_values);
-
-int config_userdata_get_string(void *userdata, const char *key_str,
-      char **output, const char *default_output);
-
-void config_userdata_free(void *ptr);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h
deleted file mode 100644
index 2fcd947..0000000
--- a/libretro-common/include/file/file_path.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_path.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FILE_PATH_H
-#define __LIBRETRO_SDK_FILE_PATH_H
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <sys/types.h>
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
-/* Order in this enum is equivalent to negative sort order in filelist
- *  (i.e. DIRECTORY is on top of PLAIN_FILE) */
-enum
-{
-   RARCH_FILETYPE_UNSET,
-   RARCH_PLAIN_FILE,
-   RARCH_COMPRESSED_FILE_IN_ARCHIVE,
-   RARCH_COMPRESSED_ARCHIVE,
-   RARCH_DIRECTORY,
-   RARCH_FILE_UNSUPPORTED
-};
-
-
-/**
- * path_is_compressed_file:
- * @path               : path
- *
- * Checks if path is a compressed file.
- *
- * Returns: true (1) if path is a compressed file, otherwise false (0).
- **/
-bool path_is_compressed_file(const char *path);
-
-/**
- * path_contains_compressed_file:
- * @path               : path
- *
- * Checks if path contains a compressed file.
- *
- * Currently we only check for hash symbol (#) inside the pathname.
- * If path is ever expanded to a general URI, we should check for that here.
- *
- * Example:  Somewhere in the path there might be a compressed file
- * E.g.: /path/to/file.7z#mygame.img
- *
- * Returns: true (1) if path contains compressed file, otherwise false (0).
- **/
-#define path_contains_compressed_file(path) (path_get_archive_delim((path)) != NULL)
-
-/**
- * path_file_exists:
- * @path               : path
- *
- * Checks if a file already exists at the specified path (@path).
- *
- * Returns: true (1) if file already exists, otherwise false (0).
- */
-bool path_file_exists(const char *path);
-
-/**
- * path_get_archive_delim:
- * @path               : path
- *
- * Gets delimiter of an archive file. Only the first '#'
- * after a compression extension is considered.
- *
- * Returns: pointer to the delimiter in the path if it contains
- * a compressed file, otherwise NULL.
- */
-const char *path_get_archive_delim(const char *path);
-
-/**
- * path_get_extension:
- * @path               : path
- *
- * Gets extension of file. Only '.'s 
- * after the last slash are considered.
- *
- * Returns: extension part from the path.
- */
-const char *path_get_extension(const char *path);
-
-/**
- * path_remove_extension:
- * @path               : path
- *
- * Removes the extension from the path and returns the result.
- * Removes all text after and including the last '.'.
- * Only '.'s after the last slash are considered.
- *
- * Returns: path with the extension part removed.
- */
-char *path_remove_extension(char *path);
-
-/**
- * path_basename:
- * @path               : path
- *
- * Get basename from @path.
- *
- * Returns: basename from path.
- **/
-const char *path_basename(const char *path);
-
-/**
- * path_basedir:
- * @path               : path           
- *
- * Extracts base directory by mutating path.
- * Keeps trailing '/'.
- **/
-void path_basedir(char *path);
-
-/**
- * path_parent_dir:
- * @path               : path
- *
- * Extracts parent directory by mutating path.
- * Assumes that path is a directory. Keeps trailing '/'.
- **/
-void path_parent_dir(char *path);
-
-/**
- * path_resolve_realpath:
- * @buf                : buffer for path
- * @size               : size of buffer
- *
- * Turns relative paths into absolute path.
- * If relative, rebases on current working dir.
- **/
-void path_resolve_realpath(char *buf, size_t size);
-
-/**
- * path_is_absolute:
- * @path               : path
- *
- * Checks if @path is an absolute path or a relative path.
- *
- * Returns: true if path is absolute, false if path is relative.
- **/
-bool path_is_absolute(const char *path);
-
-/**
- * fill_pathname:
- * @out_path           : output path
- * @in_path            : input  path
- * @replace            : what to replace 
- * @size               : buffer size of output path
- *
- * FIXME: Verify
- *
- * Replaces filename extension with 'replace' and outputs result to out_path.
- * The extension here is considered to be the string from the last '.'
- * to the end.
- *
- * Only '.'s after the last slash are considered as extensions.
- * If no '.' is present, in_path and replace will simply be concatenated.
- * 'size' is buffer size of 'out_path'.
- * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" => 
- * out_path = "/foo/bar/baz/boo.asm" 
- * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ""     =>
- * out_path = "/foo/bar/baz/boo" 
- */
-void fill_pathname(char *out_path, const char *in_path,
-      const char *replace, size_t size);
-
-/**
- * fill_dated_filename:
- * @out_filename       : output filename
- * @ext                : extension of output filename
- * @size               : buffer size of output filename
- *
- * Creates a 'dated' filename prefixed by 'RetroArch', and 
- * concatenates extension (@ext) to it.
- *
- * E.g.: 
- * out_filename = "RetroArch-{month}{day}-{Hours}{Minutes}.{@ext}"
- **/
-void fill_dated_filename(char *out_filename,
-      const char *ext, size_t size);
-
-/**
- * fill_str_dated_filename:
- * @out_filename       : output filename
- * @in_str             : input string
- * @ext                : extension of output filename
- * @size               : buffer size of output filename
- *
- * Creates a 'dated' filename prefixed by the string @in_str, and
- * concatenates extension (@ext) to it.
- *
- * E.g.:
- * out_filename = "RetroArch-{year}{month}{day}-{Hour}{Minute}{Second}.{@ext}"
- **/
-void fill_str_dated_filename(char *out_filename,
-      const char *in_str, const char *ext, size_t size);
-
-/**
- * fill_pathname_noext:
- * @out_path           : output path
- * @in_path            : input  path
- * @replace            : what to replace 
- * @size               : buffer size of output path
- *
- * Appends a filename extension 'replace' to 'in_path', and outputs
- * result in 'out_path'.
- *
- * Assumes in_path has no extension. If an extension is still
- * present in 'in_path', it will be ignored.
- *
- */
-void fill_pathname_noext(char *out_path, const char *in_path,
-      const char *replace, size_t size);
-
-/**
- * find_last_slash:
- * @str : input path
- *
- * Gets a pointer to the last slash in the input path.
- *
- * Returns: a pointer to the last slash in the input path.
- **/
-char *find_last_slash(const char *str);
-
-/**
- * fill_pathname_dir:
- * @in_dir             : input directory path
- * @in_basename        : input basename to be appended to @in_dir
- * @replace            : replacement to be appended to @in_basename
- * @size               : size of buffer
- *
- * Appends basename of 'in_basename', to 'in_dir', along with 'replace'.
- * Basename of in_basename is the string after the last '/' or '\\',
- * i.e the filename without directories.
- *
- * If in_basename has no '/' or '\\', the whole 'in_basename' will be used.
- * 'size' is buffer size of 'in_dir'.
- *
- * E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_content/foo.c",
- * replace = ".asm" => in_dir = "/tmp/some_dir/foo.c.asm"
- **/
-void fill_pathname_dir(char *in_dir, const char *in_basename,
-      const char *replace, size_t size);
-
-/**
- * fill_pathname_base:
- * @out                : output path         
- * @in_path            : input path
- * @size               : size of output path
- *
- * Copies basename of @in_path into @out_path.
- **/
-void fill_pathname_base(char *out_path, const char *in_path, size_t size);
-
-void fill_pathname_base_noext(char *out_dir,
-      const char *in_path, size_t size);
-
-void fill_pathname_base_ext(char *out,
-      const char *in_path, const char *ext,
-      size_t size);
-
-/**
- * fill_pathname_basedir:
- * @out_dir            : output directory        
- * @in_path            : input path
- * @size               : size of output directory
- *
- * Copies base directory of @in_path into @out_path.
- * If in_path is a path without any slashes (relative current directory),
- * @out_path will get path "./".
- **/
-void fill_pathname_basedir(char *out_path, const char *in_path, size_t size);
-
-void fill_pathname_basedir_noext(char *out_dir,
-      const char *in_path, size_t size);
-
-/**
- * fill_pathname_parent_dir:
- * @out_dir            : output directory        
- * @in_dir             : input directory
- * @size               : size of output directory
- *
- * Copies parent directory of @in_dir into @out_dir.
- * Assumes @in_dir is a directory. Keeps trailing '/'.
- **/
-void fill_pathname_parent_dir(char *out_dir,
-      const char *in_dir, size_t size);
-
-/**
- * fill_pathname_resolve_relative:
- * @out_path           : output path
- * @in_refpath         : input reference path
- * @in_path            : input path
- * @size               : size of @out_path
- *
- * Joins basedir of @in_refpath together with @in_path.
- * If @in_path is an absolute path, out_path = in_path.
- * E.g.: in_refpath = "/foo/bar/baz.a", in_path = "foobar.cg",
- * out_path = "/foo/bar/foobar.cg".
- **/
-void fill_pathname_resolve_relative(char *out_path, const char *in_refpath,
-      const char *in_path, size_t size);
-
-/**
- * fill_pathname_join:
- * @out_path           : output path
- * @dir                : directory   
- * @path               : path
- * @size               : size of output path
- *
- * Joins a directory (@dir) and path (@path) together.
- * Makes sure not to get  two consecutive slashes 
- * between directory and path.
- **/
-void fill_pathname_join(char *out_path, const char *dir,
-      const char *path, size_t size);
-
-void fill_pathname_join_special_ext(char *out_path,
-      const char *dir,  const char *path,
-      const char *last, const char *ext,
-      size_t size);
-
-void fill_pathname_join_concat(char *out_path,
-      const char *dir, const char *path, 
-      const char *concat,
-      size_t size);
-
-void fill_pathname_join_noext(char *out_path,
-      const char *dir, const char *path, size_t size);
-
-/**
- * fill_pathname_join_delim:
- * @out_path           : output path
- * @dir                : directory   
- * @path               : path
- * @delim              : delimiter 
- * @size               : size of output path
- *
- * Joins a directory (@dir) and path (@path) together 
- * using the given delimiter (@delim).
- **/
-void fill_pathname_join_delim(char *out_path, const char *dir,
-      const char *path, const char delim, size_t size);
-
-void fill_pathname_join_delim_concat(char *out_path, const char *dir,
-      const char *path, const char delim, const char *concat,
-      size_t size);
-
-/**
- * fill_short_pathname_representation:
- * @out_rep            : output representation
- * @in_path            : input path
- * @size               : size of output representation
- *
- * Generates a short representation of path. It should only
- * be used for displaying the result; the output representation is not
- * binding in any meaningful way (for a normal path, this is the same as basename)
- * In case of more complex URLs, this should cut everything except for
- * the main image file.
- *
- * E.g.: "/path/to/game.img" -> game.img
- *       "/path/to/myarchive.7z#folder/to/game.img" -> game.img
- */
-void fill_short_pathname_representation(char* out_rep,
-      const char *in_path, size_t size);
-
-void fill_short_pathname_representation_noext(char* out_rep,
-      const char *in_path, size_t size);
-
-void fill_pathname_expand_special(char *out_path,
-      const char *in_path, size_t size);
-
-void fill_pathname_abbreviate_special(char *out_path,
-      const char *in_path, size_t size);
-
-/**
- * path_char_is_slash:
- * @c                  : character
- *
- * Checks if character (@c) is a slash.
- *
- * Returns: true (1) if character is a slash, otherwise false (0).
- */
-static INLINE bool path_char_is_slash(char c)
-{
-#ifdef _WIN32
-   return (c == '/') || (c == '\\');
-#else
-   return (c == '/');
-#endif
-}
-
-/**
- * path_default_slash:
- *
- * Gets the default slash separator.
- *
- * Returns: default slash separator.
- */
-static INLINE const char *path_default_slash(void)
-{
-#ifdef _WIN32
-   return "\\";
-#else
-   return "/";
-#endif
-}
-
-/** 
- * fill_pathname_slash:
- * @path               : path
- * @size               : size of path
- *
- * Assumes path is a directory. Appends a slash
- * if not already there.
- **/
-void fill_pathname_slash(char *path, size_t size);
-
-#ifndef RARCH_CONSOLE
-void fill_pathname_application_path(char *buf, size_t size);
-#endif
-
-/**
- * path_mkdir:
- * @dir                : directory
- *
- * Create directory on filesystem.
- *
- * Returns: true (1) if directory could be created, otherwise false (0).
- **/
-bool path_mkdir(const char *dir);
-
-/**
- * path_is_directory:
- * @path               : path
- *
- * Checks if path is a directory.
- *
- * Returns: true (1) if path is a directory, otherwise false (0).
- */
-bool path_is_directory(const char *path);
-
-bool path_is_character_special(const char *path);
-
-bool path_is_valid(const char *path);
-
-int32_t path_get_size(const char *path);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/file/nbio.h b/libretro-common/include/file/nbio.h
deleted file mode 100644
index 011eef5..0000000
--- a/libretro-common/include/file/nbio.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (nbio.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_NBIO_H
-#define __LIBRETRO_SDK_NBIO_H
-
-#include <stddef.h>
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#ifndef NBIO_READ
-#define NBIO_READ   0
-#endif
-
-#ifndef NBIO_WRITE
-#define NBIO_WRITE  1
-#endif
-
-#ifndef NBIO_UPDATE
-#define NBIO_UPDATE 2
-#endif
-
-#ifndef BIO_READ
-#define BIO_READ    3
-#endif
-
-#ifndef BIO_WRITE
-#define BIO_WRITE   4
-#endif
-
-struct nbio_t;
-
-/*
- * Creates an nbio structure for performing the given operation on the given file.
- */
-struct nbio_t* nbio_open(const char * filename, unsigned mode);
-
-/*
- * Starts reading the given file. When done, it will be available in nbio_get_ptr.
- * Can not be done if the structure was created with nbio_write.
- */
-void nbio_begin_read(struct nbio_t* handle);
-
-/*
- * Starts writing to the given file. Before this, you should've copied the data to nbio_get_ptr.
- * Can not be done if the structure was created with nbio_read.
- */
-void nbio_begin_write(struct nbio_t* handle);
-
-/*
- * Performs part of the requested operation, or checks how it's going.
- * When it returns true, it's done.
- */
-bool nbio_iterate(struct nbio_t* handle);
-
-/*
- * Resizes the file up to the given size; cannot shrink.
- * Can not be done if the structure was created with nbio_read.
- */
-void nbio_resize(struct nbio_t* handle, size_t len);
-
-/*
- * Returns a pointer to the file data. Writable only if structure was not created with nbio_read.
- * If any operation is in progress, the pointer will be NULL, but len will still be correct.
- */
-void* nbio_get_ptr(struct nbio_t* handle, size_t* len);
-
-/*
- * Stops any pending operation, allowing the object to be freed.
- */
-void nbio_cancel(struct nbio_t* handle);
-
-/*
- * Deletes the nbio structure and its associated pointer.
- */
-void nbio_free(struct nbio_t* handle);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/filters.h b/libretro-common/include/filters.h
deleted file mode 100644
index b021aed..0000000
--- a/libretro-common/include/filters.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (filters.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_FILTERS_H
-#define _LIBRETRO_SDK_FILTERS_H
-
-/* for MSVC; should be benign under any circumstances */
-#define _USE_MATH_DEFINES
-
-#include <stdlib.h>
-#include <math.h>
-#include <retro_inline.h>
-#include <retro_miscellaneous.h>
-
-static INLINE double sinc(double val)
-{
-   if (fabs(val) < 0.00001)
-      return 1.0;
-   return sin(val) / val;
-}
-
-/* Paeth prediction filter. */
-static INLINE int paeth(int a, int b, int c)
-{
-   int p  = a + b - c;
-   int pa = abs(p - a);
-   int pb = abs(p - b);
-   int pc = abs(p - c);
-
-   if (pa <= pb && pa <= pc)
-      return a;
-   else if (pb <= pc)
-      return b;
-   return c;
-}
-
-/* Modified Bessel function of first order.
- * Check Wiki for mathematical definition ... */
-static INLINE double besseli0(double x)
-{
-   unsigned i;
-   double sum            = 0.0;
-   double factorial      = 1.0;
-   double factorial_mult = 0.0;
-   double x_pow          = 1.0;
-   double two_div_pow    = 1.0;
-   double x_sqr          = x * x;
-
-   /* Approximate. This is an infinite sum.
-    * Luckily, it converges rather fast. */
-   for (i = 0; i < 18; i++)
-   {
-      sum += x_pow * two_div_pow / (factorial * factorial);
-
-      factorial_mult += 1.0;
-      x_pow *= x_sqr;
-      two_div_pow *= 0.25;
-      factorial *= factorial_mult;
-   }
-
-   return sum;
-}
-
-static INLINE double kaiser_window_function(double index, double beta)
-{
-   return besseli0(beta * sqrtf(1 - index * index));
-}
-
-static INLINE double lanzcos_window_function(double index)
-{
-   return sinc(M_PI * index);
-}
-
-#endif
diff --git a/libretro-common/include/formats/image.h b/libretro-common/include/formats/image.h
deleted file mode 100644
index bba8866..0000000
--- a/libretro-common/include/formats/image.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (image.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __RARCH_IMAGE_CONTEXT_H
-#define __RARCH_IMAGE_CONTEXT_H
-
-#include <stdint.h>
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-
-RETRO_BEGIN_DECLS
-
-enum image_process_code
-{
-   IMAGE_PROCESS_ERROR     = -2,
-   IMAGE_PROCESS_ERROR_END = -1,
-   IMAGE_PROCESS_NEXT      =  0,
-   IMAGE_PROCESS_END       =  1
-};
-
-struct texture_image
-{
-   unsigned width;
-   unsigned height;
-   uint32_t *pixels;
-   bool supports_rgba;
-};
-
-enum image_type_enum
-{
-   IMAGE_TYPE_NONE = 0,
-   IMAGE_TYPE_PNG,
-   IMAGE_TYPE_JPEG,
-   IMAGE_TYPE_BMP,
-   IMAGE_TYPE_TGA
-};
-
-bool image_texture_set_color_shifts(unsigned *r_shift, unsigned *g_shift,
-      unsigned *b_shift, unsigned *a_shift,
-      struct texture_image *out_img);
-
-bool image_texture_color_convert(unsigned r_shift,
-      unsigned g_shift, unsigned b_shift, unsigned a_shift,
-      struct texture_image *out_img);
-
-bool image_texture_load(struct texture_image *img, const char *path);
-void image_texture_free(struct texture_image *img);
-
-/* Image transfer */
-
-void image_transfer_free(void *data, enum image_type_enum type);
-
-void *image_transfer_new(enum image_type_enum type);
-
-bool image_transfer_start(void *data, enum image_type_enum type);
-
-void image_transfer_set_buffer_ptr(
-      void *data,
-      enum image_type_enum type,
-      void *ptr);
-
-int image_transfer_process(
-      void *data,
-      enum image_type_enum type,
-      uint32_t **buf, size_t size,
-      unsigned *width, unsigned *height);
-
-bool image_transfer_iterate(void *data, enum image_type_enum type);
-
-bool image_transfer_is_valid(void *data, enum image_type_enum type);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/formats/jsonsax.h b/libretro-common/include/formats/jsonsax.h
deleted file mode 100644
index d8b18e6..0000000
--- a/libretro-common/include/formats/jsonsax.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (jsonsax.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_JSONSAX_H__
-#define __LIBRETRO_SDK_FORMAT_JSONSAX_H__
-
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-
-enum
-{
-  JSONSAX_OK = 0,
-  JSONSAX_INTERRUPTED,
-  JSONSAX_MISSING_KEY,
-  JSONSAX_UNTERMINATED_KEY,
-  JSONSAX_MISSING_VALUE,
-  JSONSAX_UNTERMINATED_OBJECT,
-  JSONSAX_UNTERMINATED_ARRAY,
-  JSONSAX_UNTERMINATED_STRING,
-  JSONSAX_INVALID_VALUE
-};
-
-#ifdef JSONSAX_ERRORS
-extern const char* jsonsax_errors[];
-#endif
-
-typedef struct
-{
-  int ( *start_document )( void* userdata );
-  int ( *end_document )( void* userdata );
-  int ( *start_object )( void* userdata );
-  int ( *end_object )( void* userdata );
-  int ( *start_array )( void* userdata );
-  int ( *end_array )( void* userdata );
-  int ( *key )( void* userdata, const char* name, size_t length );
-  int ( *array_index )( void* userdata, unsigned int index );
-  int ( *string )( void* userdata, const char* string, size_t length );
-  int ( *number )( void* userdata, const char* number, size_t length );
-  int ( *boolean )( void* userdata, int istrue );
-  int ( *null )( void* userdata );
-}
-jsonsax_handlers_t;
-
-int jsonsax_parse( const char* json, const jsonsax_handlers_t* handlers, void* userdata );
-
-RETRO_END_DECLS
-
-#endif /* __LIBRETRO_SDK_FORMAT_JSONSAX_H__ */
diff --git a/libretro-common/include/formats/jsonsax_full.h b/libretro-common/include/formats/jsonsax_full.h
deleted file mode 100644
index b89798e..0000000
--- a/libretro-common/include/formats/jsonsax_full.h
+++ /dev/null
@@ -1,1040 +0,0 @@
-/*
-  Copyright (c) 2012 John-Anthony Owens
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"),
-  to deal in the Software without restriction, including without limitation
-  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-  and/or sell copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-
-#ifndef JSONSAX_H_INCLUDED
-#define JSONSAX_H_INCLUDED
-
-/* The library version */
-#define JSON_MAJOR_VERSION 1
-#define JSON_MINOR_VERSION 4
-#define JSON_MICRO_VERSION 5
-
-/* JSON_NO_PARSER and JSON_NO_WRITER, if defined, remove the corresponding
- * APIs and functionality from the library.
- */
-#if defined(JSON_NO_PARSER) && defined(JSON_NO_WRITER)
-#error JSON_NO_PARSER and JSON_NO_WRITER cannot both be defined!
-#endif
-
-#include <stddef.h> /* for size_t and NULL */
-
-/* The library API is C and should not be subjected to C++ name mangling. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* JSON_EXPORT controls the library's public API import/export linkage
- * specifiers. By default, the library will be compiled to support dynamic
- * linkage. In order to build the library for static linkage, the JSON_STATIC
- * macro must be defined when the library itself is built AND when the client
- * includes jsonsax.h.
- */
-#if defined(JSON_STATIC)
-#define JSON_EXPORT /* nothing */
-#else
-#if defined(_MSC_VER)
-#if defined(JSON_BUILDING)
-#define JSON_EXPORT __declspec(dllexport)
-#else
-#define JSON_EXPORT __declspec(dllimport)
-#endif
-#else
-#if defined(JSON_BUILDING)
-#define JSON_EXPORT __attribute__ ((visibility("default")))
-#else
-#define JSON_EXPORT /* nothing */
-#endif
-#endif
-#endif
-
-/* JSON_CALL controls the library's public API calling-convention. Clients'
- * handler functions should be declared with JSON_CALL in order to ensure
- * that the calling convention matches.
- */
-#ifndef JSON_CALL
-#if defined(_MSC_VER)
-#define JSON_CALL __cdecl
-#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
-#define JSON_CALL __attribute__((cdecl))
-#else
-#define JSON_CALL /* nothing */
-#endif
-#endif
-
-#define JSON_API(t) JSON_EXPORT t JSON_CALL
-
-/* Boolean values used by the library. */
-typedef enum tag_JSON_Boolean
-{
-    JSON_False = 0,
-    JSON_True  = 1
-} JSON_Boolean;
-
-/* Values returned by library APIs to indicate success or failure. */
-typedef enum tag_JSON_Status
-{
-    JSON_Failure = 0,
-    JSON_Success = 1
-} JSON_Status;
-
-/* Error codes. */
-typedef enum tag_JSON_Error
-{
-    JSON_Error_None                            = 0,
-    JSON_Error_OutOfMemory                     = 1,
-    JSON_Error_AbortedByHandler                = 2,
-    JSON_Error_BOMNotAllowed                   = 3,
-    JSON_Error_InvalidEncodingSequence         = 4,
-    JSON_Error_UnknownToken                    = 5,
-    JSON_Error_UnexpectedToken                 = 6,
-    JSON_Error_IncompleteToken                 = 7,
-    JSON_Error_ExpectedMoreTokens              = 8,
-    JSON_Error_UnescapedControlCharacter       = 9,
-    JSON_Error_InvalidEscapeSequence           = 10,
-    JSON_Error_UnpairedSurrogateEscapeSequence = 11,
-    JSON_Error_TooLongString                   = 12,
-    JSON_Error_InvalidNumber                   = 13,
-    JSON_Error_TooLongNumber                   = 14,
-    JSON_Error_DuplicateObjectMember           = 15,
-    JSON_Error_StoppedAfterEmbeddedDocument    = 16
-} JSON_Error;
-
-/* Text encodings. */
-typedef enum tag_JSON_Encoding
-{
-    JSON_UnknownEncoding = 0,
-    JSON_UTF8            = 1,
-    JSON_UTF16LE         = 2,
-    JSON_UTF16BE         = 3,
-    JSON_UTF32LE         = 4,
-    JSON_UTF32BE         = 5
-} JSON_Encoding;
-
-/* Attributes of a string value. */
-typedef enum tag_JSON_StringAttribute
-{
-    JSON_SimpleString              = 0,
-    JSON_ContainsNullCharacter     = 1 << 0, /* U+0000 */
-    JSON_ContainsControlCharacter  = 1 << 1, /* U+0000 - U+001F */
-    JSON_ContainsNonASCIICharacter = 1 << 2, /* U+0080 - U+10FFFF */
-    JSON_ContainsNonBMPCharacter   = 1 << 3, /* U+10000 - U+10FFFF */
-    JSON_ContainsReplacedCharacter = 1 << 4  /* an invalid encoding sequence was replaced by U+FFFD */
-} JSON_StringAttribute;
-typedef unsigned int JSON_StringAttributes;
-
-/* Attributes of a number value. */
-typedef enum tag_JSON_NumberAttribute
-{
-    JSON_SimpleNumber             = 0,
-    JSON_IsNegative               = 1 << 0,
-    JSON_IsHex                    = 1 << 1,
-    JSON_ContainsDecimalPoint     = 1 << 2,
-    JSON_ContainsExponent         = 1 << 3,
-    JSON_ContainsNegativeExponent = 1 << 4
-} JSON_NumberAttribute;
-typedef unsigned int JSON_NumberAttributes;
-
-/* Types of "special" number. */
-typedef enum tag_JSON_SpecialNumber
-{
-    JSON_NaN              = 0,
-    JSON_Infinity         = 1,
-    JSON_NegativeInfinity = 2
-} JSON_SpecialNumber;
-
-/* Information identifying a location in a parser instance's input stream. */
-typedef struct tag_JSON_Location
-{
-    /* The zero-based index of the byte in the input stream. Note that this
-     * is the only value that unambiguously identifies the location, since
-     * line and column refer to characters (which may be encoded in the input
-     * as multi-byte sequences) rather than bytes.
-     */
-    size_t byte;
-
-    /* The zero-based line number of the character in the input stream. Note
-     * that the parser treats each of the following character sequences as a
-     * single line break for purposes of computing line numbers:
-     *
-     *   U+000A        (LINE FEED)
-     *   U+000D        (CARRIAGE RETURN)
-     *   U+000D U+000A (CARRIAGE RETURN, LINE FEED)
-     *
-     */
-    size_t line;
-
-    /* The zero-based column number of the character in the input stream. */
-    size_t column;
-
-    /* The zero-based depth in the JSON document structure at the location. */
-    size_t depth;
-} JSON_Location;
-
-/* Custom memory management handlers.
- *
- * The semantics of these handlers correspond exactly to those of standard
- * realloc(), and free(). The handlers also receive the value of the memory
- * suite's user data parameter, which clients can use to implement memory
- * pools or impose custom allocation limits, if desired.
- */
-typedef void* (JSON_CALL * JSON_ReallocHandler)(void* userData, void* ptr, size_t size);
-typedef void (JSON_CALL * JSON_FreeHandler)(void* userData, void* ptr);
-
-/* A suite of custom memory management functions. */
-typedef struct tag_JSON_MemorySuite
-{
-    void*               userData;
-    JSON_ReallocHandler realloc;
-    JSON_FreeHandler    free;
-} JSON_MemorySuite;
-
-/******************** JSON Parser ********************/
-
-#ifndef JSON_NO_PARSER
-
-/* Parser instance. */
-struct JSON_Parser_Data; /* opaque data */
-typedef struct JSON_Parser_Data* JSON_Parser;
-
-/* Create a parser instance.
- *
- * If pMemorySuite is null, the library will use the C runtime realloc() and
- * free() as the parser's memory management suite. Otherwise, all the
- * handlers in the memory suite must be non-null or the call will fail and
- * return null.
- */
-JSON_API(JSON_Parser) JSON_Parser_Create(const JSON_MemorySuite* pMemorySuite);
-
-/* Free a parser instance.
- *
- * Every successful call to JSON_Parser_Create() must eventually be paired
- * with a call to JSON_Parser_Free() in order to avoid leaking memory.
- *
- * This function returns failure if the parser parameter is null or if the
- * function was called reentrantly from inside a handler.
- */
-JSON_API(JSON_Status) JSON_Parser_Free(JSON_Parser parser);
-
-/* Reset a parser instance so that it can be used to parse a new input stream.
- *
- * This function returns failure if the parser parameter is null or if the
- * function was called reentrantly from inside a handler.
- *
- * After a parser is reset, its state is indistinguishable from its state
- * when it was returned by JSON_Parser_Create(). The parser's custom memory
- * suite, if any, is preserved; all other settings, state, and handlers are
- * restored to their default values.
- */
-JSON_API(JSON_Status) JSON_Parser_Reset(JSON_Parser parser);
-
-/* Get and set the user data value associated with a parser instance.
- *
- * This setting allows clients to associate additional data with a
- * parser instance. The parser itself does not use the value.
- *
- * The default value of this setting is null.
- *
- * This setting can be changed at any time, even inside handlers.
- */
-JSON_API(void*) JSON_Parser_GetUserData(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetUserData(JSON_Parser parser, void* userData);
-
-/* Get and set the input encoding for a parser instance.
- *
- * If the client does not explicitly set the input encoding before calling
- * JSON_Parser_Parse() on the parser instance, the parser will use the first
- * 4 bytes of input to detect the input encoding automatically. Once the
- * parser has detected the encoding, calls to JSON_Parser_GetInputEncoding()
- * will return the detected value.
- *
- * The default value of this setting is JSON_UnknownEncoding.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Encoding) JSON_Parser_GetInputEncoding(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetInputEncoding(JSON_Parser parser, JSON_Encoding encoding);
-
-/* Get and set the string encoding for a parser instance.
- *
- * This setting controls the encoding of the string values that are
- * passed to the string and object member handlers.
- *
- * The default value of this setting is JSON_UTF8.
- *
- * This setting cannot be set to JSON_UnknownEncoding.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Encoding) JSON_Parser_GetStringEncoding(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetStringEncoding(JSON_Parser parser, JSON_Encoding encoding);
-
-/* Get and set the maximum length of strings that a parser instance allows.
- *
- * This setting controls the maximum length, in bytes (NOT characters), of
- * the encoded strings that are passed to the string and object member
- * handlers. If the parser encounters a string that, when encoded in the
- * string encoding, is longer than the maximum string length, it triggers
- * the JSON_TooLongString error.
- *
- * The default value of this setting is SIZE_MAX.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(size_t) JSON_Parser_GetMaxStringLength(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetMaxStringLength(JSON_Parser parser, size_t maxLength);
-
-/* Get and set the number encoding for a parser instance.
- *
- * This setting controls the encoding of the number values that are
- * passed to the number handler.
- *
- * The default value of this setting is JSON_UTF8.
- *
- * This setting cannot be set to JSON_UnknownEncoding.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Encoding) JSON_Parser_GetNumberEncoding(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetNumberEncoding(JSON_Parser parser, JSON_Encoding encoding);
-
-/* Get and set the maximum length of numbers that a parser instance allows.
- *
- * This setting controls the maximum length, in bytes (NOT characters), of
- * the encoded numbers that are passed to the number handler. If the parser
- * encounters a number that, when encoded in the number encoding, is longer
- * than the maximum number length, it triggers the JSON_TooLongNumber error.
- *
- * The default value of this setting is SIZE_MAX.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(size_t) JSON_Parser_GetMaxNumberLength(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetMaxNumberLength(JSON_Parser parser, size_t maxLength);
-
-/* Get and set whether a parser instance allows the input to begin with a
- * byte-order-mark (BOM).
- *
- * RFC 4627 does not allow JSON text to begin with a BOM, but some clients
- * may find it convenient to be lenient in this regard; for example, if the
- * JSON text is being read from a file that has a BOM.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetAllowBOM(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetAllowBOM(JSON_Parser parser, JSON_Boolean allowBOM);
-
-/* Get and set whether a parser instance allows Javascript-style comments to
- * appear in the JSON text.
- *
- * RFC 4627 does not allow JSON text to contain comments, but some clients
- * may find it useful to allow them.
- *
- * Both types of comment described by ECMA-262 (multi-line and single-line)
- * are supported.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetAllowComments(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetAllowComments(JSON_Parser parser, JSON_Boolean allowComments);
-
-/* Get and set whether a parser instance allows the "special" number literals
- * NaN, Infinity, and -Infinity.
- *
- * RFC 4627 does not provide any way to represent NaN, Infinity, or -Infinity,
- * but some clients may find it convenient to recognize these as literals,
- * since they are emitted by many common JSON generators.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetAllowSpecialNumbers(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetAllowSpecialNumbers(JSON_Parser parser, JSON_Boolean allowSpecialNumbers);
-
-/* Get and set whether a parser instance allows hexadecimal notation to be
- * used for specifying number values.
- *
- * RFC 4627 does not allow hexadecimal numbers, but some clients may find it
- * convenient to allow them, in order to represent binary bit patterns more
- * easily.
- *
- * The parser recognizes hexadecimal numbers that conform to the syntax of
- * HexIntegerLiteral, as described in section 7.8.3 of ECMA-262. That is, a
- * valid hexadecimal number must comprise the prefix '0x' or '0X', followed
- * by a sequence of one or more of the following characters: '0' - '9',
- * 'a' - 'f', and 'A' - 'F'.
- *
- * Hexadecimal numbers cannot be prefixed by a minus sign.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetAllowHexNumbers(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetAllowHexNumbers(JSON_Parser parser, JSON_Boolean allowHexNumbers);
-
-/* Get and set whether a parser instance allows unescaped control characters
- * (U+0000 - U+001F) to appear inside string values.
- *
- * RFC 4627 does not allow JSON text to contain unescaped control characters,
- * but some clients may find it useful to allow them.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetAllowUnescapedControlCharacters(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetAllowUnescapedControlCharacters(JSON_Parser parser, JSON_Boolean allowUnescapedControlCharacters);
-
-/* Get and set whether a parser instance replaces invalid encoding sequences
- * it encounters inside string tokens with the Unicode replacement character
- * (U+FFFD) rather than triggering an error.
- *
- * By default, the parser is strict when decoding the input stream, and will
- * fail if it encounters an encoding sequence that is not valid for the input
- * encoding. Note especially that this includes (but is not limited to) the
- * following:
- *
- *  - Overlong encoding sequences in UTF-8.
- *  - Surrogate codepoints encoded in UTF-8 or UTF-32.
- *  - Unpaired or improperly-paired surrogates in UTF-16.
- *  - Codepoints outside the Unicode range encoded in UTF-8 or UTF-32.
- *
- * The replacement follows the rules and recommendations described in section
- * 3.9 of version 5.2.0 of [the Unicode Standard](http://www.unicode.org/versions/Unicode5.2.0/).
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetReplaceInvalidEncodingSequences(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetReplaceInvalidEncodingSequences(JSON_Parser parser, JSON_Boolean replaceInvalidEncodingSequences);
-
-/* Get and set whether a parser instance tracks object member names for all
- * open objects and detects duplicate members if any occur in the input.
- *
- * RFC 4627 stipulates that JSON parsers SHOULD check for duplicates, but
- * may opt not to in light of reasonable implementation considerations.
- * Checking for duplicate members necessarily incurs non-trivial memory
- * overhead, and is therefore not enabled by default. Most clients use
- * their parse handlers to build some sort of in-memory DOM representation
- * of the JSON text and therefore already have the means to check for
- * duplicate member names without incurring additional memory overhead; it
- * is recommended that these clients implement duplicate member checking
- * in their object member handler (refer to SetObjectMemberHandler() for
- * details) and leave this setting disabled.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetTrackObjectMembers(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetTrackObjectMembers(JSON_Parser parser, JSON_Boolean trackObjectMembers);
-
-/* Get and set whether a parser instance stops parsing as soon as the end of
- * the top-level JSON document is parsed.
- *
- * This setting allows the client to parse JSON content that is embedded
- * inside a larger data stream. If this setting is enabled, the parser will,
- * upon successfully parsing the end of the embedded JSON document, set its
- * error to JSON_Error_StoppedAfterEmbeddedDocument, set its error location
- * to the location in the input stream immediately following the end of the
- * document, and return JSON_Failure from JSON_Parser_Parse().
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the parser has started parsing.
- */
-JSON_API(JSON_Boolean) JSON_Parser_GetStopAfterEmbeddedDocument(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetStopAfterEmbeddedDocument(JSON_Parser parser, JSON_Boolean stopAfterEmbeddedDocument);
-
-/* Get the type of error, if any, encountered by a parser instance.
- *
- * If the parser encountered an error while parsing input, this function
- * returns the type of the error. Otherwise, this function returns
- * JSON_Error_None.
- */
-JSON_API(JSON_Error) JSON_Parser_GetError(JSON_Parser parser);
-
-/* Get the location in the input stream at which a parser instance
- * encountered an error.
- *
- * If the parser encountered an error while parsing input, this function
- * sets the members of the structure pointed to by pLocation to the location
- * in the input stream at which the error occurred and returns success.
- * Otherwise, it leaves the members unchanged and returns failure.
- */
-JSON_API(JSON_Status) JSON_Parser_GetErrorLocation(JSON_Parser parser, JSON_Location* pLocation);
-
-/* Get the location in the input stream of the beginning of the token
- * that is currently being handled by one of a parser instance's parse
- * handlers.
- *
- * If the parser is inside a parse handler, this function sets the members
- * of the structure pointed to by pLocation to the location and returns
- * success. Otherwise, it leaves the members unchanged and returns failure.
- */
-JSON_API(JSON_Status) JSON_Parser_GetTokenLocation(JSON_Parser parser, JSON_Location* pLocation);
-
-/* Get the location in the input stream that immediately follows the end of
- * the token that is currently being handled by one of a parser instance's
- * parse handlers.
- *
- * If the parser is inside a parse handler, this function sets the members
- * of the structure pointed to by pLocation to the location and returns
- * success. Otherwise, it leaves the members unchanged and returns failure.
- */
-JSON_API(JSON_Status) JSON_Parser_GetAfterTokenLocation(JSON_Parser parser, JSON_Location* pLocation);
-
-/* Parse handlers are callbacks that the client provides in order to
- * be notified about the structure of the JSON document as it is being
- * parsed. The following notes apply equally to all parse handlers:
- *
- *   1. Parse handlers are optional. In fact, a parser with no parse
- *      handlers at all can be used to simply validate that the input
- *      is valid JSON.
- *
- *   2. Parse handlers can be set, unset, or changed at any time, even
- *      from inside a parse handler.
- *
- *   3. If a parse handler returns JSON_Parser_Abort, the parser will
- *      abort the parse, set its error to JSON_Error_AbortedByHandler,
- *      set its error location to the start of the token that triggered
- *      the handler, and return JSON_Failure from the outer call to
- *      JSON_Parser_Parse().
- *
- *   4. A parse handler can get the location in the input stream of the
- *      token that triggered the handler by calling
- *      JSON_Parser_GetTokenLocation().
- */
-
-/* Values returned by parse handlers to indicate whether parsing should
- * continue or be aborted.
- *
- * Note that JSON_TreatAsDuplicateObjectMember should only be returned by
- * object member handlers. Refer to JSON_Parser_SetObjectMemberHandler()
- * for details.
- */
-typedef enum tag_JSON_Parser_HandlerResult
-{
-    JSON_Parser_Continue                     = 0,
-    JSON_Parser_Abort                        = 1,
-    JSON_Parser_TreatAsDuplicateObjectMember = 2
-} JSON_Parser_HandlerResult;
-
-/* Get and set the handler that is called when a parser instance detects the
- * input encoding.
- *
- * If the parser instance's input encoding was set to JSON_UnknownEncoding
- * when parsing began, this handler will be called as soon as the actual
- * input encoding has been detected.
- *
- * Note that JSON_Parser_GetTokenLocation() will return failure if called
- * from inside this handler, since there is no token associated with this
- * event.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_EncodingDetectedHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_EncodingDetectedHandler) JSON_Parser_GetEncodingDetectedHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetEncodingDetectedHandler(JSON_Parser parser, JSON_Parser_EncodingDetectedHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * a JSON null literal value.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_NullHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_NullHandler) JSON_Parser_GetNullHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetNullHandler(JSON_Parser parser, JSON_Parser_NullHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * a JSON boolean value (true or false).
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_BooleanHandler)(JSON_Parser parser, JSON_Boolean value);
-JSON_API(JSON_Parser_BooleanHandler) JSON_Parser_GetBooleanHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetBooleanHandler(JSON_Parser parser, JSON_Parser_BooleanHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * a JSON string value.
- *
- * The pValue parameter points to a buffer containing the string value,
- * encoded according to the parser instance's string encoding setting. The
- * buffer is null-terminated (the null terminator character is also encoded).
- * Note, however, that JSON strings may contain embedded null characters,
- * which are specifiable using the escape sequence \u0000. The client is
- * free to modify the contents of the buffer during the handler.
- *
- * The length parameter specifies the number of bytes (NOT characters) in
- * the encoded string, not including the encoded null terminator.
- *
- * The attributes parameter provides information about the characters
- * that comprise the string. If the option to replace invalid encoding
- * sequences is enabled and the string contains any Unicode replacement
- * characters (U+FFFD) that were the result of replacing invalid encoding
- * sequences in the input, the attributes will include the value
- * JSON_ContainsReplacedCharacter. Note that the absence of this attribute
- * does not imply that the string does not contain any U+FFFD characters,
- * since such characters may have been present in the original input, and
- * not inserted by a replacement operation.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_StringHandler)(JSON_Parser parser, char* pValue, size_t length, JSON_StringAttributes attributes);
-JSON_API(JSON_Parser_StringHandler) JSON_Parser_GetStringHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetStringHandler(JSON_Parser parser, JSON_Parser_StringHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * a JSON number value.
- *
- * JSON numbers do not have a defined binary representation or precision,
- * and different clients may wish to interpret them differently, for
- * example, as IEEE 754 doubles, 64-bit integers, or arbitrary-precision
- * bignums. For this reason, the parser does not attempt to interpret
- * number values, but leaves this to the client.
- *
- * The pValue parameter points to a buffer containing the number value,
- * encoded according to the parser instance's number encoding setting. The
- * buffer is null-terminated (the null terminator character is also encoded).
- * The buffer is guaranteed to contain only characters allowed in JSON number
- * values, that is: '0' - '9', '+', '-', '.', 'e', and 'E'; if the option
- * to allow hex numbers is enabled, the text may also contain the characters
- * 'x', 'X', 'a' - 'f', and 'A' - 'F'. The client is free to modify the
- * contents of the buffer during the handler. This is especially useful
- * to clients that wish to convert the number to a double using the C
- * standard library's strtod() function, which is locale-sensitive; in this
- * case, the client should modify the buffer to replace the '.' character
- * with localconv()->decimal_point[0] before passing the buffer to strtod().
- *
- * The length parameter specifies the number of bytes (NOT characters) in
- * the encoded number, not including the encoded null terminator.
- *
- * The attributes parameter provides information about the number.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_NumberHandler)(JSON_Parser parser, char* pValue, size_t length, JSON_NumberAttributes attributes);
-JSON_API(JSON_Parser_NumberHandler) JSON_Parser_GetNumberHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetNumberHandler(JSON_Parser parser, JSON_Parser_NumberHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * one of the "special" number literals NaN, Infinity, and -Inifinity.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_SpecialNumberHandler)(JSON_Parser parser, JSON_SpecialNumber value);
-JSON_API(JSON_Parser_SpecialNumberHandler) JSON_Parser_GetSpecialNumberHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetSpecialNumberHandler(JSON_Parser parser, JSON_Parser_SpecialNumberHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * the left curly brace that starts an object.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_StartObjectHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_StartObjectHandler) JSON_Parser_GetStartObjectHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetStartObjectHandler(JSON_Parser parser, JSON_Parser_StartObjectHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * the right curly brace that ends an object.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_EndObjectHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_EndObjectHandler) JSON_Parser_GetEndObjectHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetEndObjectHandler(JSON_Parser parser, JSON_Parser_EndObjectHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * an object member name.
- *
- * The pValue parameter points to a buffer containing the member name,
- * encoded according to the parser instance's string encoding setting. The
- * buffer is null-terminated (the null terminator character is also encoded).
- * Note, however, that JSON strings may contain embedded null characters,
- * which are specifiable using the escape sequence \u0000. The client is
- * free to modify the contents of the buffer during the handler.
- *
- * The length parameter specifies the number of bytes (NOT characters) in
- * the encoded string, not including the encoded null terminator.
- *
- * The attributes parameter provides information about the characters
- * that comprise the string. If the option to replace invalid encoding
- * sequences is enabled and the string contains any Unicode replacement
- * characters (U+FFFD) that were the result of replacing invalid encoding
- * sequences in the input, the attributes will include the value
- * JSON_ContainsReplacedCharacter. Note that the absence of this attribute
- * does not imply that the string does not contain any U+FFFD characters,
- * since such characters may have been present in the original input, and
- * not inserted by a replacement operation.
- *
- * The handler can return JSON_Parser_TreatAsDuplicateObjectMember to
- * indicate that the current object already contains a member with the
- * specified name. This allows clients to implement duplicate member
- * checking without incurring the additional memory overhead associated
- * with enabling the TrackObjectMembers setting.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_ObjectMemberHandler)(JSON_Parser parser, char* pValue, size_t length, JSON_StringAttributes attributes);
-JSON_API(JSON_Parser_ObjectMemberHandler) JSON_Parser_GetObjectMemberHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetObjectMemberHandler(JSON_Parser parser, JSON_Parser_ObjectMemberHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * the left square brace that starts an array.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_StartArrayHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_StartArrayHandler) JSON_Parser_GetStartArrayHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetStartArrayHandler(JSON_Parser parser, JSON_Parser_StartArrayHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * the right square brace that ends an array.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_EndArrayHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_EndArrayHandler) JSON_Parser_GetEndArrayHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetEndArrayHandler(JSON_Parser parser, JSON_Parser_EndArrayHandler handler);
-
-/* Get and set the handler that is called when a parser instance encounters
- * an array item.
- *
- * This event is always immediately followed by a null, boolean, string,
- * number, special number, start object, or start array event.
- */
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_ArrayItemHandler)(JSON_Parser parser);
-JSON_API(JSON_Parser_ArrayItemHandler) JSON_Parser_GetArrayItemHandler(JSON_Parser parser);
-JSON_API(JSON_Status) JSON_Parser_SetArrayItemHandler(JSON_Parser parser, JSON_Parser_ArrayItemHandler handler);
-
-/* Push zero or more bytes of input to a parser instance.
- *
- * The pBytes parameter points to a buffer containing the bytes to be
- * parsed, if any. pBytes may be NULL if and only if the length parameter
- * is 0.
- *
- * The length parameter specifies the number of bytes (NOT characters)
- * pointed to by pBytes.
- *
- * The isFinal parameter specifies whether the parser should treat the
- * input to the call as the last chunk of input in the JSON document.
- * If this parameter is JSON_False, the parser will assume that more
- * input may be forthcoming.
- *
- * The parser adheres to [RFC 4627](http://www.ietf.org/rfc/rfc4627.txt),
- * except that any JSON value (null, true, false, string, number, object,
- * or array) is accepted as a valid top-level entity in the parsed text.
- *
- * This function returns failure if the parser parameter is null, if the
- * function was called reentrantly from inside a handler, or if the
- * parser instance has already finished parsing.
- */
-JSON_API(JSON_Status) JSON_Parser_Parse(JSON_Parser parser, const char* pBytes, size_t length, JSON_Boolean isFinal);
-
-#endif /* JSON_NO_PARSER */
-
-/******************** JSON Writer ********************/
-
-#ifndef JSON_NO_WRITER
-
-/* Writer instance. */
-struct JSON_Writer_Data; /* opaque data */
-typedef struct JSON_Writer_Data* JSON_Writer;
-
-/* Create a writer instance.
- *
- * If pMemorySuite is null, the library will use the C runtime realloc() and
- * free() as the writer's memory management suite. Otherwise, all the
- * handlers in the memory suite must be non-null or the call will fail and
- * return null.
- */
-JSON_API(JSON_Writer) JSON_Writer_Create(const JSON_MemorySuite* pMemorySuite);
-
-/* Free a writer instance.
- *
- * Every successful call to JSON_Writer_Create() must eventually be paired
- * with a call to JSON_Writer_Free() in order to avoid leaking memory.
- *
- * This function returns failure if the writer parameter is null or if the
- * function was called reentrantly from inside a handler.
- */
-JSON_API(JSON_Status) JSON_Writer_Free(JSON_Writer writer);
-
-/* Reset a writer instance so that it can be used to write a new output
- * stream.
- *
- * This function returns failure if the writer parameter is null or if the
- * function was called reentrantly from inside a handler.
- *
- * After a writer is reset, its state is indistinguishable from its state
- * when it was returned by JSON_Writer_Create(). The writer's custom memory
- * suite, if any, is preserved; all other settings, state, and handlers are
- * restored to their default values.
- */
-JSON_API(JSON_Status) JSON_Writer_Reset(JSON_Writer writer);
-
-/* Get and set the user data value associated with a writer instance.
- *
- * This setting allows clients to associate additional data with a
- * writer instance. The writer itself does not use the value.
- *
- * The default value of this setting is NULL.
- *
- * This setting can be changed at any time, even inside handlers.
- */
-JSON_API(void*) JSON_Writer_GetUserData(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetUserData(JSON_Writer writer, void* userData);
-
-/* Get and set the output encoding for a writer instance.
- *
- * The default value of this setting is JSON_UTF8.
- *
- * This setting cannot be set to JSON_UnknownEncoding.
- *
- * This setting cannot be changed once the writer has started writing.
- */
-JSON_API(JSON_Encoding) JSON_Writer_GetOutputEncoding(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetOutputEncoding(JSON_Writer writer, JSON_Encoding encoding);
-
-/* Get and set whether a writer instance uses CARRIAGE RETURN, LINE FEED
- * (CRLF) as the new line sequence generated by JSON_Writer_WriteNewLine().
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the writer has started writing.
- */
-JSON_API(JSON_Boolean) JSON_Writer_GetUseCRLF(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetUseCRLF(JSON_Writer writer, JSON_Boolean useCRLF);
-
-/* Get and set whether a writer instance replaces invalid encoding sequences
- * it encounters in string tokens with the Unicode replacement character
- * (U+FFFD) rather than triggering an error.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the writer has started writing.
- */
-JSON_API(JSON_Boolean) JSON_Writer_GetReplaceInvalidEncodingSequences(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetReplaceInvalidEncodingSequences(JSON_Writer writer, JSON_Boolean replaceInvalidEncodingSequences);
-
-/* Get and set whether a writer instance escapes all non-ASCII characters
- * that it outputs. This can be useful for debugging, or when the output
- * will be consumed by a parser that does not support UTF-encoded input.
- * It is not recommended as a general practice, since it bloats the size
- * of non-ASCII strings considerably, compared to UTF encoding.
- *
- * The default value of this setting is JSON_False.
- *
- * This setting cannot be changed once the writer has started writing.
- */
-JSON_API(JSON_Boolean) JSON_Writer_GetEscapeAllNonASCIICharacters(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetEscapeAllNonASCIICharacters(JSON_Writer writer, JSON_Boolean escapeAllNonASCIICharacters);
-
-/* Get the type of error, if any, encountered by a writer instance.
- *
- * If the writer encountered an error while writing input, this function
- * returns the type of the error. Otherwise, this function returns
- * JSON_Error_None.
- */
-JSON_API(JSON_Error) JSON_Writer_GetError(JSON_Writer writer);
-
-/* The JSON_Writer_WriteXXX() family of functions cause JSON text to be
- * sent to a writer instance's output handler. The following notes apply
- * equally to all these functions:
- *
- *   1. The output handler is optional, and can be set, unset, or changed
- *      at any time, even from inside the output handler.
- *
- *   2. A single call to JSON_Writer_WriteXXX() may trigger multiple calls
- *      to the output handler.
- *
- *   3. All output generated by a call to JSON_Writer_WriteXXX() is sent
- *      to the output handler before the call returns; that is, the writer
- *      does not aggregate output from multiple writes before sending it to
- *      the output handler.
- *
- *   4. A call to JSON_Writer_WriteXXX() will fail if the writer has
- *      already encountered an error.
- *
- *   5. A call to JSON_Writer_WriteXXX() will fail if the call was made
- *      reentrantly from inside a handler.
- *
- *   6. A call to JSON_Writer_WriteXXX() will fail if it would cause the
- *      writer to output grammatically-incorrect JSON text.
- *
- *   7. If an output handler returns JSON_Writer_Abort, the writer will
- *      abort the write, set its error to JSON_Error_AbortedByHandler,
- *      set its error location to the location in the output stream prior
- *      to the call to the handler, and return JSON_Failure from the outer
- *      call to JSON_Writer_WriteXXX().
- */
-
-/* Values returned by write handlers to indicate whether writing should
- * continue or be aborted.
- */
-typedef enum tag_JSON_Writer_HandlerResult
-{
-    JSON_Writer_Continue = 0,
-    JSON_Writer_Abort    = 1
-} JSON_Writer_HandlerResult;
-
-/* Get and set the handler that is called when a writer instance has output
- * ready to be written.
- *
- * The pBytes parameter points to a buffer containing the bytes to be written,
- * encoded according to the writer instance's output encoding setting. The
- * buffer is NOT null-terminated.
- *
- * The length parameter specifies the number of bytes (NOT characters) in
- * the encoded output.
- */
-typedef JSON_Writer_HandlerResult (JSON_CALL * JSON_Writer_OutputHandler)(JSON_Writer writer, const char* pBytes, size_t length);
-JSON_API(JSON_Writer_OutputHandler) JSON_Writer_GetOutputHandler(JSON_Writer writer);
-JSON_API(JSON_Status) JSON_Writer_SetOutputHandler(JSON_Writer writer, JSON_Writer_OutputHandler handler);
-
-/* Write the JSON null literal to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteNull(JSON_Writer writer);
-
-/* Write a JSON boolean value to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteBoolean(JSON_Writer writer, JSON_Boolean value);
-
-/* Write a JSON string value to the output.
- *
- * The pValue parameter points to a buffer containing the string to be
- * written. The buffer does NOT need to be null-terminated. This
- * parameter can be null if and only if the length parameter is zero.
- *
- * The length parameter specifies the number of bytes (NOT characters)
- * in the buffer. If the buffer is null-terminated, the length should
- * NOT include the null terminator.
- *
- * The encoding parameter specifies the encoding of the text pointed
- * to by pValue. This parameter cannot be JSON_UnknownEncoding.
- *
- * If the string contains invalid encoding sequences and the option to
- * replace invalid encoding sequences with the Unicode replacement
- * character (U+FFFD) is not enabled for the writer instance, the writer
- * sets its error to JSON_Error_InvalidEncodingSequence and returns
- * failure.
- *
- * The writer escapes the following codepoints:
- *
- * - BACKSPACE (U+0008)       => \b
- * - TAB (U+0009)             => \t
- * - LINE FEED (U+000A)       => \n
- * - FORM FEED (U+000C)       => \f
- * - CARRIAGE RETURN (U+000D) => \r
- * - QUOTATION MARK (U+0022)  => \"
- * - SOLIDUS (U+002F)         => \/
- * - REVERSE SOLIDUS (U+005C) => \\
- *
- * The writer also escapes the following codepoints using hex-style escape
- * sequences:
- *
- * - All control characters (U+0000 - U+001F) except those covered by the
- *   list above.
- * - DELETE (U+007F)
- * - LINE SEPARATOR (U+2028)
- * - PARAGRAPH SEPARATOR (U+2029)
- * - All 34 Unicode "noncharacter" codepoints whose values end in FE or FF.
- * - All 32 Unicode "noncharacter" codepoints in the range U+FDD0 - U+FDEF.
- * - REPLACEMENT CHARACTER (U+FFFD), if it did not appear in the original
- *   string provided by the client; in other words, if the writer introduced
- *   it in the output as a replacement for an invalid encoding sequence in
- *   the original string.
- *
- * If the setting to escape all non-ASCII characters is enabled, ALL
- * codepoints above U+0080 are escaped using hex-style escape sequences.
- */
-JSON_API(JSON_Status) JSON_Writer_WriteString(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding);
-
-/* Write a JSON number value to the output.
- *
- * The pValue parameter points to a buffer containing the number to be
- * written. The buffer does NOT need to be null-terminated.
- *
- * The length parameter specifies the number of bytes (NOT characters)
- * in the buffer. If the buffer is null-terminated, the length should
- * NOT include the null terminator.
- *
- * The encoding parameter specifies the encoding of the text pointed
- * to by pValue. This parameter cannot be JSON_UnknownEncoding.
- *
- * If the number contains an invalid encoding sequence, the writer sets
- * its error to JSON_Error_InvalidEncodingSequence and returns failure,
- * regardless of whether the option to replace invalid encoding sequences
- * with the Unicode replacement character (U+FFFD) is enabled (that
- * setting only affects writing of string values).
- *
- * The number must be a valid JSON number as described by RFC 4627, or a
- * hexadecimal number conforming to the syntax of HexIntegerLiteral, as
- * described in section 7.8.3 of ECMA-262. Otherwise, the writer sets its
- * error to JSON_Error_InvalidNumber and returns failure.
- */
-JSON_API(JSON_Status) JSON_Writer_WriteNumber(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding);
-
-/* Write a JSON "special" number literal to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteSpecialNumber(JSON_Writer writer, JSON_SpecialNumber value);
-
-/* Write a left curly-brace character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteStartObject(JSON_Writer writer);
-
-/* Write a right curly-brace character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteEndObject(JSON_Writer writer);
-
-/* Write a left square-brace character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteStartArray(JSON_Writer writer);
-
-/* Write a right square-brace character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteEndArray(JSON_Writer writer);
-
-/* Write a colon character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteColon(JSON_Writer writer);
-
-/* Write a comma character to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteComma(JSON_Writer writer);
-
-/* Write space characters to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteSpace(JSON_Writer writer, size_t numberOfSpaces);
-
-/* Write a newline sequence to the output. */
-JSON_API(JSON_Status) JSON_Writer_WriteNewLine(JSON_Writer writer);
-
-#endif /* JSON_NO_WRITER */
-
-/******************** Miscellaneous API ********************/
-
-/* Information about the library version. */
-typedef struct tag_JSON_Version
-{
-    unsigned int major;
-    unsigned int minor;
-    unsigned int micro;
-} JSON_Version;
-
-/* Get a pointer to the library version information. */
-JSON_API(const JSON_Version*) JSON_LibraryVersion(void);
-
-/* Get a constant, null-terminated, ASCII string describing an error code. */
-JSON_API(const char*) JSON_ErrorString(JSON_Error error);
-
-/* Get the UTF-16 encoding whose endianness matches the target platform.
- *
- * This function always returns either JSON_UTF16LE or JSON_UTF16BE.
- */
-JSON_API(JSON_Encoding) JSON_NativeUTF16Encoding(void);
-
-/* Get the UTF-32 encoding whose endianness matches the target platform.
- *
- * This function always returns either JSON_UTF32LE or JSON_UTF32BE.
- */
-JSON_API(JSON_Encoding) JSON_NativeUTF32Encoding(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JSONSAX_H_INCLUDED */
diff --git a/libretro-common/include/formats/rbmp.h b/libretro-common/include/formats/rbmp.h
deleted file mode 100644
index 622d8c9..0000000
--- a/libretro-common/include/formats/rbmp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rbmp.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_RBMP_H__
-#define __LIBRETRO_SDK_FORMAT_RBMP_H__
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-
-RETRO_BEGIN_DECLS
-
-enum rbmp_source_type
-{
-   RBMP_SOURCE_TYPE_DONT_CARE,
-   RBMP_SOURCE_TYPE_BGR24,
-   RBMP_SOURCE_TYPE_XRGB888,
-   RBMP_SOURCE_TYPE_RGB565,
-   RBMP_SOURCE_TYPE_ARGB8888
-};
-
-typedef struct rbmp rbmp_t;
-
-bool rbmp_save_image(
-      const char *filename,
-      const void *frame,
-      unsigned width,
-      unsigned height,
-      unsigned pitch,
-      enum rbmp_source_type type);
-
-int rbmp_process_image(rbmp_t *rbmp, void **buf,
-      size_t size, unsigned *width, unsigned *height);
-
-bool rbmp_set_buf_ptr(rbmp_t *rbmp, void *data);
-
-void rbmp_free(rbmp_t *rbmp);
-
-rbmp_t *rbmp_alloc(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/formats/rjpeg.h b/libretro-common/include/formats/rjpeg.h
deleted file mode 100644
index a999516..0000000
--- a/libretro-common/include/formats/rjpeg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rjpeg.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_RJPEG_H__
-#define __LIBRETRO_SDK_FORMAT_RJPEG_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct rjpeg rjpeg_t;
-
-int rjpeg_process_image(rjpeg_t *rjpeg, void **buf,
-      size_t size, unsigned *width, unsigned *height);
-
-bool rjpeg_set_buf_ptr(rjpeg_t *rjpeg, void *data);
-
-void rjpeg_free(rjpeg_t *rjpeg);
-
-rjpeg_t *rjpeg_alloc(void);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
deleted file mode 100644
index b16a830..0000000
--- a/libretro-common/include/formats/rpng.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rpng.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_RPNG_H__
-#define __LIBRETRO_SDK_FORMAT_RPNG_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct rpng rpng_t;
-
-rpng_t *rpng_init(const char *path);
-
-bool rpng_is_valid(rpng_t *rpng);
-
-bool rpng_set_buf_ptr(rpng_t *rpng, void *data);
-
-rpng_t *rpng_alloc(void);
-
-void rpng_free(rpng_t *rpng);
-
-bool rpng_iterate_image(rpng_t *rpng);
-
-int rpng_process_image(rpng_t *rpng,
-      void **data, size_t size, unsigned *width, unsigned *height);
-
-bool rpng_start(rpng_t *rpng);
-
-bool rpng_save_image_argb(const char *path, const uint32_t *data,
-      unsigned width, unsigned height, unsigned pitch);
-bool rpng_save_image_bgr24(const char *path, const uint8_t *data,
-      unsigned width, unsigned height, unsigned pitch);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/formats/rtga.h b/libretro-common/include/formats/rtga.h
deleted file mode 100644
index a66f4a0..0000000
--- a/libretro-common/include/formats/rtga.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rtga.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_RTGA_H__
-#define __LIBRETRO_SDK_FORMAT_RTGA_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct rtga rtga_t;
-
-int rtga_process_image(rtga_t *rtga, void **buf,
-      size_t size, unsigned *width, unsigned *height);
-
-bool rtga_set_buf_ptr(rtga_t *rtga, void *data);
-
-void rtga_free(rtga_t *rtga);
-
-rtga_t *rtga_alloc(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/formats/rwav.h b/libretro-common/include/formats/rwav.h
deleted file mode 100644
index 5407de8..0000000
--- a/libretro-common/include/formats/rwav.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rwav.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FORMAT_RWAV_H__
-#define __LIBRETRO_SDK_FORMAT_RWAV_H__
-
-#include <retro_common_api.h>
-#include <stdint.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct
-{
-   /* bits per sample */
-   int bitspersample;
-   
-   /* number of channels */
-   int numchannels;
-   
-   /* sample rate */
-   int samplerate;
-
-   /* number of *samples* */
-   size_t numsamples;
-   
-   /* number of *bytes* in the pointer below, i.e. numsamples * numchannels * bitspersample/8 */
-   size_t subchunk2size;
-   
-   /* PCM data */
-   const void* samples;
-} rwav_t;
-
-enum rwav_state
-{
-   RWAV_ITERATE_ERROR    = -1,
-   RWAV_ITERATE_MORE     = 0,
-   RWAV_ITERATE_DONE     = 1,
-   RWAV_ITERATE_BUF_SIZE = 4096
-};
-
-typedef struct rwav_iterator rwav_iterator_t;
-
-/**
- * Initializes the iterator to fill the out structure with data parsed from buf.
- */
-void rwav_init(rwav_iterator_t* iter, rwav_t* out, const void* buf, size_t size);
-
-/**
- * Parses a piece of the data. Continue calling as long as it returns RWAV_ITERATE_MORE.
- * Stop calling otherwise, and check for errors. If RWAV_ITERATE_DONE is returned,
- * the rwav_t structure passed to rwav_init is ready to be used. The iterator does not
- * have to be freed.
- */
-enum rwav_state rwav_iterate(rwav_iterator_t *iter);
-
-/**
- * Loads the entire data in one go.
- */
-enum rwav_state rwav_load(rwav_t* out, const void* buf, size_t size);
-
-/**
- * Frees parsed wave data.
- */
-void rwav_free(rwav_t *rwav);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/formats/rxml.h b/libretro-common/include/formats/rxml.h
deleted file mode 100644
index 88d25bc..0000000
--- a/libretro-common/include/formats/rxml.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rxml.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef __LIBRETRO_SDK_FORMAT_RXML_H__
-#define __LIBRETRO_SDK_FORMAT_RXML_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/* Total NIH. Very trivial "XML" implementation for use in RetroArch.
- * Error checking is minimal. Invalid documents may lead to very 
- * buggy behavior, but memory corruption should never happen.
- *
- * Only parts of standard that RetroArch cares about is supported.
- * Nothing more, nothing less. "Clever" XML documents will 
- * probably break the implementation.
- *
- * Do *NOT* try to use this for anything else. You have been warned.
- */
-
-typedef struct rxml_document rxml_document_t;
-
-struct rxml_attrib_node
-{
-   char *attrib;
-   char *value;
-   struct rxml_attrib_node *next;
-};
-
-struct rxml_node
-{
-   char *name;
-   char *data;
-   struct rxml_attrib_node *attrib;
-
-   struct rxml_node *children;
-   struct rxml_node *next;
-
-   /* Dummy. Used by libxml2 compat. 
-    * Is always set to 0, so XML_ELEMENT_NODE check goes through. */
-   int type; 
-};
-
-rxml_document_t *rxml_load_document(const char *path);
-void rxml_free_document(rxml_document_t *doc);
-
-struct rxml_node *rxml_root_node(rxml_document_t *doc);
-
-/* Drop const-correctness here to avoid warnings 
- * when used as libxml2 compat.
- * xmlGetProp() returns xmlChar*, which is supposed 
- * to be passed to xmlFree(). */
-char *rxml_node_attrib(struct rxml_node *node, const char *attrib);
-
-#ifdef RXML_LIBXML2_COMPAT
-/* Compat for part of libxml2 that RetroArch uses. */
-#define LIBXML_TEST_VERSION ((void)0)
-typedef char xmlChar; /* It's really unsigned char, but it doesn't matter. */
-typedef struct rxml_node *xmlNodePtr;
-typedef void *xmlParserCtxtPtr;
-typedef rxml_document_t *xmlDocPtr;
-#define XML_ELEMENT_NODE (0)
-#define xmlNewParserCtxt() ((void*)-1)
-#define xmlCtxtReadFile(ctx, path, a, b) rxml_load_document(path)
-#define xmlGetProp(node, prop) rxml_node_attrib(node, prop)
-#define xmlFree(p) ((void)0)
-#define xmlNodeGetContent(node) (node->data)
-#define xmlDocGetRootElement(doc) rxml_root_node(doc)
-#define xmlFreeDoc(doc) rxml_free_document(doc)
-#define xmlFreeParserCtxt(ctx) ((void)0)
-#endif
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/gl_capabilities.h b/libretro-common/include/gfx/gl_capabilities.h
deleted file mode 100644
index 4e7c97a..0000000
--- a/libretro-common/include/gfx/gl_capabilities.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (gl_capabilities.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _GL_CAPABILITIES_H
-#define _GL_CAPABILITIES_H
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum gl_capability_enum
-{
-   GL_CAPS_NONE = 0,
-   GL_CAPS_EGLIMAGE,
-   GL_CAPS_SYNC,
-   GL_CAPS_MIPMAP,
-   GL_CAPS_VAO,
-   GL_CAPS_FBO,
-   GL_CAPS_ARGB8,
-   GL_CAPS_DEBUG,
-   GL_CAPS_PACKED_DEPTH_STENCIL,
-   GL_CAPS_ES2_COMPAT,
-   GL_CAPS_UNPACK_ROW_LENGTH,
-   GL_CAPS_FULL_NPOT_SUPPORT,
-   GL_CAPS_SRGB_FBO,
-   GL_CAPS_SRGB_FBO_ES3,
-   GL_CAPS_FP_FBO,
-   GL_CAPS_BGRA8888,
-   GL_CAPS_GLES3_SUPPORTED,
-   GL_CAPS_TEX_STORAGE,
-   GL_CAPS_TEX_STORAGE_EXT
-};
-
-bool gl_check_error(char **error_string);
-
-bool gl_query_core_context_in_use(void);
-
-void gl_query_core_context_set(bool set);
-
-void gl_query_core_context_unset(void);
-
-bool gl_check_capability(enum gl_capability_enum enum_idx);
-
-bool gl_query_extension(const char *ext);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/gfx/math/matrix_3x3.h b/libretro-common/include/gfx/math/matrix_3x3.h
deleted file mode 100644
index 9bdd886..0000000
--- a/libretro-common/include/gfx/math/matrix_3x3.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (matrix_3x3.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GFX_MATH_MATRIX_3X3_H__
-#define __LIBRETRO_SDK_GFX_MATH_MATRIX_3X3_H__
-
-#include <boolean.h>
-#include <math.h>
-#include <string.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct math_matrix_3x3
-{
-   float data[9];
-} math_matrix_3x3;
-
-#define MAT_ELEM_3X3(mat, r, c) ((mat).data[3 * (r) + (c)])
-
-#define matrix_3x3_init(mat, n11, n12, n13, n21, n22, n23, n31, n32, n33) \
-   MAT_ELEM_3X3(mat, 0, 0) = n11; \
-   MAT_ELEM_3X3(mat, 0, 1) = n12; \
-   MAT_ELEM_3X3(mat, 0, 2) = n13; \
-   MAT_ELEM_3X3(mat, 1, 0) = n21; \
-   MAT_ELEM_3X3(mat, 1, 1) = n22; \
-   MAT_ELEM_3X3(mat, 1, 2) = n23; \
-   MAT_ELEM_3X3(mat, 2, 0) = n31; \
-   MAT_ELEM_3X3(mat, 2, 1) = n32; \
-   MAT_ELEM_3X3(mat, 2, 2) = n33
-
-#define matrix_3x3_identity(mat) \
-   MAT_ELEM_3X3(mat, 0, 0) = 1.0f; \
-   MAT_ELEM_3X3(mat, 0, 1) = 0; \
-   MAT_ELEM_3X3(mat, 0, 2) = 0; \
-   MAT_ELEM_3X3(mat, 1, 0) = 0; \
-   MAT_ELEM_3X3(mat, 1, 1) = 1.0f; \
-   MAT_ELEM_3X3(mat, 1, 2) = 0; \
-   MAT_ELEM_3X3(mat, 2, 0) = 0; \
-   MAT_ELEM_3X3(mat, 2, 1) = 0; \
-   MAT_ELEM_3X3(mat, 2, 2) = 1.0f
-
-#define matrix_3x3_divide_scalar(mat, s) \
-   MAT_ELEM_3X3(mat, 0, 0) /= s; \
-   MAT_ELEM_3X3(mat, 0, 1) /= s; \
-   MAT_ELEM_3X3(mat, 0, 2) /= s; \
-   MAT_ELEM_3X3(mat, 1, 0) /= s; \
-   MAT_ELEM_3X3(mat, 1, 1) /= s; \
-   MAT_ELEM_3X3(mat, 1, 2) /= s; \
-   MAT_ELEM_3X3(mat, 2, 0) /= s; \
-   MAT_ELEM_3X3(mat, 2, 1) /= s; \
-   MAT_ELEM_3X3(mat, 2, 2) /= s
-
-#define matrix_3x3_transpose(mat, in) \
-   MAT_ELEM_3X3(mat, 0, 0) = MAT_ELEM_3X3(in, 0, 0); \
-   MAT_ELEM_3X3(mat, 1, 0) = MAT_ELEM_3X3(in, 0, 1); \
-   MAT_ELEM_3X3(mat, 2, 0) = MAT_ELEM_3X3(in, 0, 2); \
-   MAT_ELEM_3X3(mat, 0, 1) = MAT_ELEM_3X3(in, 1, 0); \
-   MAT_ELEM_3X3(mat, 1, 1) = MAT_ELEM_3X3(in, 1, 1); \
-   MAT_ELEM_3X3(mat, 2, 1) = MAT_ELEM_3X3(in, 1, 2); \
-   MAT_ELEM_3X3(mat, 0, 2) = MAT_ELEM_3X3(in, 2, 0); \
-   MAT_ELEM_3X3(mat, 1, 2) = MAT_ELEM_3X3(in, 2, 1); \
-   MAT_ELEM_3X3(mat, 2, 2) = MAT_ELEM_3X3(in, 2, 2)
-
-#define matrix_3x3_multiply(out, a, b) \
-   MAT_ELEM_3X3(out, 0, 0) =  \
-      MAT_ELEM_3X3(a, 0, 0) * MAT_ELEM_3X3(b, 0, 0) + \
-      MAT_ELEM_3X3(a, 0, 1) * MAT_ELEM_3X3(b, 1, 0) + \
-      MAT_ELEM_3X3(a, 0, 2) * MAT_ELEM_3X3(b, 2, 0); \
-   MAT_ELEM_3X3(out, 0, 1) = \
-      MAT_ELEM_3X3(a, 0, 0) * MAT_ELEM_3X3(b, 0, 1) + \
-      MAT_ELEM_3X3(a, 0, 1) * MAT_ELEM_3X3(b, 1, 1) + \
-      MAT_ELEM_3X3(a, 0, 2) * MAT_ELEM_3X3(b, 2, 1); \
-   MAT_ELEM_3X3(out, 0, 2) = \
-      MAT_ELEM_3X3(a, 0, 0) * MAT_ELEM_3X3(b, 0, 2) + \
-      MAT_ELEM_3X3(a, 0, 1) * MAT_ELEM_3X3(b, 1, 2) + \
-      MAT_ELEM_3X3(a, 0, 2) * MAT_ELEM_3X3(b, 2, 2); \
-   MAT_ELEM_3X3(out, 1, 0) = \
-      MAT_ELEM_3X3(a, 1, 0) * MAT_ELEM_3X3(b, 0, 0) + \
-      MAT_ELEM_3X3(a, 1, 1) * MAT_ELEM_3X3(b, 1, 0) + \
-      MAT_ELEM_3X3(a, 1, 2) * MAT_ELEM_3X3(b, 2, 0); \
-   MAT_ELEM_3X3(out, 1, 1) =  \
-      MAT_ELEM_3X3(a, 1, 0) * MAT_ELEM_3X3(b, 0, 1) + \
-      MAT_ELEM_3X3(a, 1, 1) * MAT_ELEM_3X3(b, 1, 1) + \
-      MAT_ELEM_3X3(a, 1, 2) * MAT_ELEM_3X3(b, 2, 1); \
-   MAT_ELEM_3X3(out, 1, 2) = \
-      MAT_ELEM_3X3(a, 1, 0) * MAT_ELEM_3X3(b, 0, 2) + \
-      MAT_ELEM_3X3(a, 1, 1) * MAT_ELEM_3X3(b, 1, 2) + \
-      MAT_ELEM_3X3(a, 1, 2) * MAT_ELEM_3X3(b, 2, 2); \
-   MAT_ELEM_3X3(out, 2, 0) =  \
-      MAT_ELEM_3X3(a, 2, 0) * MAT_ELEM_3X3(b, 0, 0) + \
-      MAT_ELEM_3X3(a, 2, 1) * MAT_ELEM_3X3(b, 1, 0) + \
-      MAT_ELEM_3X3(a, 2, 2) * MAT_ELEM_3X3(b, 2, 0); \
-   MAT_ELEM_3X3(out, 2, 1) = \
-      MAT_ELEM_3X3(a, 2, 0) * MAT_ELEM_3X3(b, 0, 1) + \
-      MAT_ELEM_3X3(a, 2, 1) * MAT_ELEM_3X3(b, 1, 1) + \
-      MAT_ELEM_3X3(a, 2, 2) * MAT_ELEM_3X3(b, 2, 1); \
-   MAT_ELEM_3X3(out, 2, 2) =  \
-      MAT_ELEM_3X3(a, 2, 0) * MAT_ELEM_3X3(b, 0, 2) + \
-      MAT_ELEM_3X3(a, 2, 1) * MAT_ELEM_3X3(b, 1, 2) + \
-      MAT_ELEM_3X3(a, 2, 2) * MAT_ELEM_3X3(b, 2, 2)
-
-#define matrix_3x3_determinant(mat) (MAT_ELEM_3X3(mat, 0, 0) * (MAT_ELEM_3X3(mat, 1, 1) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 1, 2) * MAT_ELEM_3X3(mat, 2, 1)) - MAT_ELEM_3X3(mat, 0, 1) * (MAT_ELEM_3X3(mat, 1, 0) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 1, 2) * MAT_ELEM_3X3(mat, 2, 0)) + MAT_ELEM_3X3(mat, 0, 2) * (MAT_ELEM_3X3(mat, 1, 0) * MAT_ELEM_3X3(mat, 2, 1) - MAT_ELEM_3X3(mat, 1, 1) * MAT_ELEM_3X3(mat, 2, 0)))
-
-#define matrix_3x3_adjoint(mat) \
-   MAT_ELEM_3X3(mat, 0, 0) =  (MAT_ELEM_3X3(mat, 1, 1) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 1, 2) * MAT_ELEM_3X3(mat, 2, 1)); \
-   MAT_ELEM_3X3(mat, 0, 1) = -(MAT_ELEM_3X3(mat, 0, 1) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 0, 2) * MAT_ELEM_3X3(mat, 2, 1)); \
-   MAT_ELEM_3X3(mat, 0, 2) =  (MAT_ELEM_3X3(mat, 0, 1) * MAT_ELEM_3X3(mat, 1, 1) - MAT_ELEM_3X3(mat, 0, 2) * MAT_ELEM_3X3(mat, 1, 1)); \
-   MAT_ELEM_3X3(mat, 1, 0) = -(MAT_ELEM_3X3(mat, 1, 0) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 1, 2) * MAT_ELEM_3X3(mat, 2, 0)); \
-   MAT_ELEM_3X3(mat, 1, 1) =  (MAT_ELEM_3X3(mat, 0, 0) * MAT_ELEM_3X3(mat, 2, 2) - MAT_ELEM_3X3(mat, 0, 2) * MAT_ELEM_3X3(mat, 2, 0)); \
-   MAT_ELEM_3X3(mat, 1, 2) = -(MAT_ELEM_3X3(mat, 0, 0) * MAT_ELEM_3X3(mat, 1, 2) - MAT_ELEM_3X3(mat, 0, 2) * MAT_ELEM_3X3(mat, 1, 0)); \
-   MAT_ELEM_3X3(mat, 2, 0) =  (MAT_ELEM_3X3(mat, 1, 0) * MAT_ELEM_3X3(mat, 2, 1) - MAT_ELEM_3X3(mat, 1, 1) * MAT_ELEM_3X3(mat, 2, 0)); \
-   MAT_ELEM_3X3(mat, 2, 1) = -(MAT_ELEM_3X3(mat, 0, 0) * MAT_ELEM_3X3(mat, 2, 1) - MAT_ELEM_3X3(mat, 0, 1) * MAT_ELEM_3X3(mat, 2, 0)); \
-   MAT_ELEM_3X3(mat, 2, 2) =  (MAT_ELEM_3X3(mat, 0, 0) * MAT_ELEM_3X3(mat, 1, 1) - MAT_ELEM_3X3(mat, 0, 1) * MAT_ELEM_3X3(mat, 1, 0))
-
-#define FLOATS_ARE_EQUAL(x, y)  (fabs(x - y) <= 0.00001f * ((x) > (y) ? (y) : (x)))
-#define FLOAT_IS_ZERO(x)        (FLOATS_ARE_EQUAL((x) + 1, 1))
-
-static INLINE bool matrix_3x3_invert(math_matrix_3x3 *mat)
-{
-   float det = matrix_3x3_determinant(*mat);
-
-   if (FLOAT_IS_ZERO(det))
-      return false;
-
-   matrix_3x3_adjoint(*mat);
-   matrix_3x3_divide_scalar(*mat, det);
-
-   return true;
-}
-
-static INLINE bool matrix_3x3_square_to_quad(
-      const float dx0, const float dy0,
-      const float dx1, const float dy1,
-      const float dx3, const float dy3,
-      const float dx2, const float dy2,
-      math_matrix_3x3 *mat)
-{
-   float a, b, d, e;
-   float ax  = dx0 - dx1 + dx2 - dx3;
-   float ay  = dy0 - dy1 + dy2 - dy3;
-   float c   = dx0;
-   float f   = dy0;
-   float g   = 0;
-   float h   = 0;
-
-   if (FLOAT_IS_ZERO(ax) && FLOAT_IS_ZERO(ay))
-   {
-      /* affine case */
-      a = dx1 - dx0;
-      b = dx2 - dx1;
-      d = dy1 - dy0;
-      e = dy2 - dy1;
-   }
-   else
-   {
-      float ax1 = dx1 - dx2;
-      float ax2 = dx3 - dx2;
-      float ay1 = dy1 - dy2;
-      float ay2 = dy3 - dy2;
-
-      /* determinants */
-      float gtop    =  ax  * ay2 - ax2 * ay;
-      float htop    =  ax1 * ay  - ax  * ay1;
-      float bottom  =  ax1 * ay2 - ax2 * ay1;
-
-      if (!bottom)
-         return false;
-
-      g = gtop / bottom;
-      h = htop / bottom;
-
-      a = dx1 - dx0 + g * dx1;
-      b = dx3 - dx0 + h * dx3;
-      d = dy1 - dy0 + g * dy1;
-      e = dy3 - dy0 + h * dy3;
-   }
-
-
-   matrix_3x3_init(*mat,
-         a, d, g,
-         b, e, h,
-         c, f, 1.f);
-
-   return true;
-}
-
-static INLINE bool matrix_3x3_quad_to_square(
-      const float sx0, const float sy0,
-      const float sx1, const float sy1,
-      const float sx2, const float sy2,
-      const float sx3, const float sy3,
-      math_matrix_3x3 *mat)
-{
-   return matrix_3x3_square_to_quad(sx0, sy0, sx1, sy1,
-         sx2, sy2, sx3, sy3,
-         mat) ? matrix_3x3_invert(mat) : false;
-}
-
-static INLINE bool matrix_3x3_quad_to_quad(
-      const float dx0, const float dy0,
-      const float dx1, const float dy1,
-      const float dx2, const float dy2,
-      const float dx3, const float dy3,
-      const float sx0, const float sy0,
-      const float sx1, const float sy1,
-      const float sx2, const float sy2,
-      const float sx3, const float sy3,
-      math_matrix_3x3 *mat)
-{
-   math_matrix_3x3 square_to_quad;
-
-   if (matrix_3x3_square_to_quad(dx0, dy0, dx1, dy1,
-            dx2, dy2, dx3, dy3,
-            &square_to_quad))
-   {
-      math_matrix_3x3 quad_to_square;
-      if (matrix_3x3_quad_to_square(sx0, sy0, sx1, sy1,
-               sx2, sy2, sx3, sy3,
-               &quad_to_square))
-      {
-         matrix_3x3_multiply(*mat, quad_to_square, square_to_quad);
-
-         return true;
-      }
-   }
-
-   return false;
-}
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/gfx/math/matrix_4x4.h b/libretro-common/include/gfx/math/matrix_4x4.h
deleted file mode 100644
index ee8b87a..0000000
--- a/libretro-common/include/gfx/math/matrix_4x4.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (matrix_4x4.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GFX_MATH_MATRIX_4X4_H__
-#define __LIBRETRO_SDK_GFX_MATH_MATRIX_4X4_H__
-
-#include <retro_common_api.h>
-
-#include <math.h>
-#include <gfx/math/vector_3.h>
-
-/* Column-major matrix (OpenGL-style).
- * Reimplements functionality from FF OpenGL pipeline to be able 
- * to work on GLES 2.0 and modern GL variants.
- */
-
-#define MAT_ELEM_4X4(mat, row, column) ((mat).data[4 * (column) + (row)])
-
-RETRO_BEGIN_DECLS
-
-typedef struct math_matrix_4x4
-{
-   float data[16];
-} math_matrix_4x4;
-
-#define matrix_4x4_copy(dst, src) \
-   MAT_ELEM_4X4(dst, 0, 0) = MAT_ELEM_4X4(src, 0, 0); \
-   MAT_ELEM_4X4(dst, 0, 1) = MAT_ELEM_4X4(src, 0, 1); \
-   MAT_ELEM_4X4(dst, 0, 2) = MAT_ELEM_4X4(src, 0, 2); \
-   MAT_ELEM_4X4(dst, 0, 3) = MAT_ELEM_4X4(src, 0, 3); \
-   MAT_ELEM_4X4(dst, 1, 0) = MAT_ELEM_4X4(src, 1, 0); \
-   MAT_ELEM_4X4(dst, 1, 1) = MAT_ELEM_4X4(src, 1, 1); \
-   MAT_ELEM_4X4(dst, 1, 2) = MAT_ELEM_4X4(src, 1, 2); \
-   MAT_ELEM_4X4(dst, 1, 3) = MAT_ELEM_4X4(src, 1, 3); \
-   MAT_ELEM_4X4(dst, 2, 0) = MAT_ELEM_4X4(src, 2, 0); \
-   MAT_ELEM_4X4(dst, 2, 1) = MAT_ELEM_4X4(src, 2, 1); \
-   MAT_ELEM_4X4(dst, 2, 2) = MAT_ELEM_4X4(src, 2, 2); \
-   MAT_ELEM_4X4(dst, 2, 3) = MAT_ELEM_4X4(src, 2, 3); \
-   MAT_ELEM_4X4(dst, 3, 0) = MAT_ELEM_4X4(src, 3, 0); \
-   MAT_ELEM_4X4(dst, 3, 1) = MAT_ELEM_4X4(src, 3, 1); \
-   MAT_ELEM_4X4(dst, 3, 2) = MAT_ELEM_4X4(src, 3, 2); \
-   MAT_ELEM_4X4(dst, 3, 3) = MAT_ELEM_4X4(src, 3, 3)
-
-/*
- * Sets mat to an identity matrix
- */
-#define matrix_4x4_identity(mat) \
-   MAT_ELEM_4X4(mat, 0, 0)    = 1.0f; \
-   MAT_ELEM_4X4(mat, 0, 1)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1)    = 1.0f; \
-   MAT_ELEM_4X4(mat, 1, 2)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2)    = 1.0f; \
-   MAT_ELEM_4X4(mat, 2, 3)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 0)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2)    = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3)    = 1.0f
-
-/*
- * Sets out to the transposed matrix of in
- */
-
-#define matrix_4x4_transpose(out, in) \
-   MAT_ELEM_4X4(out, 0, 0) = MAT_ELEM_4X4(in, 0, 0); \
-   MAT_ELEM_4X4(out, 1, 0) = MAT_ELEM_4X4(in, 0, 1); \
-   MAT_ELEM_4X4(out, 2, 0) = MAT_ELEM_4X4(in, 0, 2); \
-   MAT_ELEM_4X4(out, 3, 0) = MAT_ELEM_4X4(in, 0, 3); \
-   MAT_ELEM_4X4(out, 0, 1) = MAT_ELEM_4X4(in, 1, 0); \
-   MAT_ELEM_4X4(out, 1, 1) = MAT_ELEM_4X4(in, 1, 1); \
-   MAT_ELEM_4X4(out, 2, 1) = MAT_ELEM_4X4(in, 1, 2); \
-   MAT_ELEM_4X4(out, 3, 1) = MAT_ELEM_4X4(in, 1, 3); \
-   MAT_ELEM_4X4(out, 0, 2) = MAT_ELEM_4X4(in, 2, 0); \
-   MAT_ELEM_4X4(out, 1, 2) = MAT_ELEM_4X4(in, 2, 1); \
-   MAT_ELEM_4X4(out, 2, 2) = MAT_ELEM_4X4(in, 2, 2); \
-   MAT_ELEM_4X4(out, 3, 2) = MAT_ELEM_4X4(in, 2, 3); \
-   MAT_ELEM_4X4(out, 0, 3) = MAT_ELEM_4X4(in, 3, 0); \
-   MAT_ELEM_4X4(out, 1, 3) = MAT_ELEM_4X4(in, 3, 1); \
-   MAT_ELEM_4X4(out, 2, 3) = MAT_ELEM_4X4(in, 3, 2); \
-   MAT_ELEM_4X4(out, 3, 3) = MAT_ELEM_4X4(in, 3, 3)
-
-/*
- * Builds an X-axis rotation matrix
- */
-#define matrix_4x4_rotate_x(mat, radians) \
-{ \
-   float cosine            = cosf(radians); \
-   float sine              = sinf(radians); \
-   MAT_ELEM_4X4(mat, 0, 0) = 1.0f; \
-   MAT_ELEM_4X4(mat, 0, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) = cosine; \
-   MAT_ELEM_4X4(mat, 1, 2) = -sine; \
-   MAT_ELEM_4X4(mat, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) = sine; \
-   MAT_ELEM_4X4(mat, 2, 2) = cosine; \
-   MAT_ELEM_4X4(mat, 2, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) = 1.0f; \
-}
-
-/*
- * Builds a rotation matrix using the 
- * rotation around the Y-axis.
- */
-
-#define matrix_4x4_rotate_y(mat, radians) \
-{ \
-   float cosine            = cosf(radians); \
-   float sine              = sinf(radians); \
-   MAT_ELEM_4X4(mat, 0, 0) = cosine; \
-   MAT_ELEM_4X4(mat, 0, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) = -sine; \
-   MAT_ELEM_4X4(mat, 0, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) = 1.0f; \
-   MAT_ELEM_4X4(mat, 1, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0) = sine; \
-   MAT_ELEM_4X4(mat, 2, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = cosine; \
-   MAT_ELEM_4X4(mat, 2, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) = 1.0f; \
-}
-
-/*
- * Builds a rotation matrix using the 
- * rotation around the Z-axis.
- */
-#define matrix_4x4_rotate_z(mat, radians) \
-{ \
-   float cosine            = cosf(radians); \
-   float sine              = sinf(radians); \
-   MAT_ELEM_4X4(mat, 0, 0) = cosine; \
-   MAT_ELEM_4X4(mat, 0, 1) = -sine; \
-   MAT_ELEM_4X4(mat, 0, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0) = sine; \
-   MAT_ELEM_4X4(mat, 1, 1) = cosine; \
-   MAT_ELEM_4X4(mat, 1, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = 1.0f; \
-   MAT_ELEM_4X4(mat, 2, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) = 1.0f; \
-}
-
-/*
- * Creates an orthographic projection matrix.
- */
-#define matrix_4x4_ortho(mat, left, right, bottom, top, znear, zfar) \
-{ \
-   float rl                = (right) - (left); \
-   float tb                = (top)   - (bottom); \
-   float fn                = (zfar)  - (znear); \
-   MAT_ELEM_4X4(mat, 0, 0) =  2.0f / rl; \
-   MAT_ELEM_4X4(mat, 0, 1) =  0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) =  0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = -((left) + (right))  / rl; \
-   MAT_ELEM_4X4(mat, 1, 0) =  0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) =  2.0f / tb; \
-   MAT_ELEM_4X4(mat, 1, 2) =  0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = -((top)  + (bottom)) / tb; \
-   MAT_ELEM_4X4(mat, 2, 0) =  0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) =  0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = -2.0f / fn; \
-   MAT_ELEM_4X4(mat, 2, 3) = -((zfar) + (znear))  / fn; \
-   MAT_ELEM_4X4(mat, 3, 0) =  0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) =  0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) =  0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) =  1.0f; \
-}
-
-#define matrix_4x4_lookat(out, eye, center, up) \
-{ \
-   vec3_t zaxis;   /* the "forward" vector */ \
-   vec3_t xaxis;   /* the "right"   vector */ \
-   vec3_t yaxis;   /* the "up"      vector */ \
-   vec3_copy(zaxis, center); \
-   vec3_subtract(zaxis, eye); \
-   vec3_normalize(zaxis); \
-   vec3_cross(xaxis, zaxis, up); \
-   vec3_normalize(xaxis); \
-   vec3_cross(yaxis, xaxis, zaxis); \
-   MAT_ELEM_4X4(out, 0, 0) = xaxis[0]; \
-   MAT_ELEM_4X4(out, 0, 1) = yaxis[0]; \
-   MAT_ELEM_4X4(out, 0, 2) = -zaxis[0]; \
-   MAT_ELEM_4X4(out, 0, 3) = 0.0; \
-   MAT_ELEM_4X4(out, 1, 0) = xaxis[1]; \
-   MAT_ELEM_4X4(out, 1, 1) = yaxis[1]; \
-   MAT_ELEM_4X4(out, 1, 2) = -zaxis[1]; \
-   MAT_ELEM_4X4(out, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(out, 2, 0) = xaxis[2]; \
-   MAT_ELEM_4X4(out, 2, 1) = yaxis[2]; \
-   MAT_ELEM_4X4(out, 2, 2) = -zaxis[2]; \
-   MAT_ELEM_4X4(out, 2, 3) = 0.0f; \
-   MAT_ELEM_4X4(out, 3, 0) = -(xaxis[0] * eye[0] + xaxis[1] * eye[1] + xaxis[2] * eye[2]); \
-   MAT_ELEM_4X4(out, 3, 1) = -(yaxis[0] * eye[0] + yaxis[1] * eye[1] + yaxis[2] * eye[2]); \
-   MAT_ELEM_4X4(out, 3, 2) = (zaxis[0] * eye[0] + zaxis[1] * eye[1] + zaxis[2] * eye[2]); \
-   MAT_ELEM_4X4(out, 3, 3) = 1.f; \
-}
-
-/*
- * Multiplies a with b, stores the result in out
- */
-
-#define matrix_4x4_multiply(out, a, b) \
-   MAT_ELEM_4X4(out, 0, 0) =  \
-      MAT_ELEM_4X4(a, 0, 0) * MAT_ELEM_4X4(b, 0, 0) + \
-      MAT_ELEM_4X4(a, 0, 1) * MAT_ELEM_4X4(b, 1, 0) + \
-      MAT_ELEM_4X4(a, 0, 2) * MAT_ELEM_4X4(b, 2, 0) + \
-      MAT_ELEM_4X4(a, 0, 3) * MAT_ELEM_4X4(b, 3, 0); \
-   MAT_ELEM_4X4(out, 0, 1) =  \
-      MAT_ELEM_4X4(a, 0, 0) * MAT_ELEM_4X4(b, 0, 1) + \
-      MAT_ELEM_4X4(a, 0, 1) * MAT_ELEM_4X4(b, 1, 1) + \
-      MAT_ELEM_4X4(a, 0, 2) * MAT_ELEM_4X4(b, 2, 1) + \
-      MAT_ELEM_4X4(a, 0, 3) * MAT_ELEM_4X4(b, 3, 1); \
-   MAT_ELEM_4X4(out, 0, 2) =  \
-      MAT_ELEM_4X4(a, 0, 0) * MAT_ELEM_4X4(b, 0, 2) + \
-      MAT_ELEM_4X4(a, 0, 1) * MAT_ELEM_4X4(b, 1, 2) + \
-      MAT_ELEM_4X4(a, 0, 2) * MAT_ELEM_4X4(b, 2, 2) + \
-      MAT_ELEM_4X4(a, 0, 3) * MAT_ELEM_4X4(b, 3, 2); \
-   MAT_ELEM_4X4(out, 0, 3) =  \
-      MAT_ELEM_4X4(a, 0, 0) * MAT_ELEM_4X4(b, 0, 3) + \
-      MAT_ELEM_4X4(a, 0, 1) * MAT_ELEM_4X4(b, 1, 3) + \
-      MAT_ELEM_4X4(a, 0, 2) * MAT_ELEM_4X4(b, 2, 3) + \
-      MAT_ELEM_4X4(a, 0, 3) * MAT_ELEM_4X4(b, 3, 3); \
-   MAT_ELEM_4X4(out, 1, 0) =  \
-      MAT_ELEM_4X4(a, 1, 0) * MAT_ELEM_4X4(b, 0, 0) + \
-      MAT_ELEM_4X4(a, 1, 1) * MAT_ELEM_4X4(b, 1, 0) + \
-      MAT_ELEM_4X4(a, 1, 2) * MAT_ELEM_4X4(b, 2, 0) + \
-      MAT_ELEM_4X4(a, 1, 3) * MAT_ELEM_4X4(b, 3, 0); \
-   MAT_ELEM_4X4(out, 1, 1) =  \
-      MAT_ELEM_4X4(a, 1, 0) * MAT_ELEM_4X4(b, 0, 1) + \
-      MAT_ELEM_4X4(a, 1, 1) * MAT_ELEM_4X4(b, 1, 1) + \
-      MAT_ELEM_4X4(a, 1, 2) * MAT_ELEM_4X4(b, 2, 1) + \
-      MAT_ELEM_4X4(a, 1, 3) * MAT_ELEM_4X4(b, 3, 1); \
-   MAT_ELEM_4X4(out, 1, 2) =  \
-      MAT_ELEM_4X4(a, 1, 0) * MAT_ELEM_4X4(b, 0, 2) + \
-      MAT_ELEM_4X4(a, 1, 1) * MAT_ELEM_4X4(b, 1, 2) + \
-      MAT_ELEM_4X4(a, 1, 2) * MAT_ELEM_4X4(b, 2, 2) + \
-      MAT_ELEM_4X4(a, 1, 3) * MAT_ELEM_4X4(b, 3, 2); \
-   MAT_ELEM_4X4(out, 1, 3) =  \
-      MAT_ELEM_4X4(a, 1, 0) * MAT_ELEM_4X4(b, 0, 3) + \
-      MAT_ELEM_4X4(a, 1, 1) * MAT_ELEM_4X4(b, 1, 3) + \
-      MAT_ELEM_4X4(a, 1, 2) * MAT_ELEM_4X4(b, 2, 3) + \
-      MAT_ELEM_4X4(a, 1, 3) * MAT_ELEM_4X4(b, 3, 3); \
-   MAT_ELEM_4X4(out, 2, 0) =  \
-      MAT_ELEM_4X4(a, 2, 0) * MAT_ELEM_4X4(b, 0, 0) + \
-      MAT_ELEM_4X4(a, 2, 1) * MAT_ELEM_4X4(b, 1, 0) + \
-      MAT_ELEM_4X4(a, 2, 2) * MAT_ELEM_4X4(b, 2, 0) + \
-      MAT_ELEM_4X4(a, 2, 3) * MAT_ELEM_4X4(b, 3, 0); \
-   MAT_ELEM_4X4(out, 2, 1) =  \
-      MAT_ELEM_4X4(a, 2, 0) * MAT_ELEM_4X4(b, 0, 1) + \
-      MAT_ELEM_4X4(a, 2, 1) * MAT_ELEM_4X4(b, 1, 1) + \
-      MAT_ELEM_4X4(a, 2, 2) * MAT_ELEM_4X4(b, 2, 1) + \
-      MAT_ELEM_4X4(a, 2, 3) * MAT_ELEM_4X4(b, 3, 1); \
-   MAT_ELEM_4X4(out, 2, 2) =  \
-      MAT_ELEM_4X4(a, 2, 0) * MAT_ELEM_4X4(b, 0, 2) + \
-      MAT_ELEM_4X4(a, 2, 1) * MAT_ELEM_4X4(b, 1, 2) + \
-      MAT_ELEM_4X4(a, 2, 2) * MAT_ELEM_4X4(b, 2, 2) + \
-      MAT_ELEM_4X4(a, 2, 3) * MAT_ELEM_4X4(b, 3, 2); \
-   MAT_ELEM_4X4(out, 2, 3) =  \
-      MAT_ELEM_4X4(a, 2, 0) * MAT_ELEM_4X4(b, 0, 3) + \
-      MAT_ELEM_4X4(a, 2, 1) * MAT_ELEM_4X4(b, 1, 3) + \
-      MAT_ELEM_4X4(a, 2, 2) * MAT_ELEM_4X4(b, 2, 3) + \
-      MAT_ELEM_4X4(a, 2, 3) * MAT_ELEM_4X4(b, 3, 3); \
-   MAT_ELEM_4X4(out, 3, 0) =  \
-      MAT_ELEM_4X4(a, 3, 0) * MAT_ELEM_4X4(b, 0, 0) + \
-      MAT_ELEM_4X4(a, 3, 1) * MAT_ELEM_4X4(b, 1, 0) + \
-      MAT_ELEM_4X4(a, 3, 2) * MAT_ELEM_4X4(b, 2, 0) + \
-      MAT_ELEM_4X4(a, 3, 3) * MAT_ELEM_4X4(b, 3, 0); \
-   MAT_ELEM_4X4(out, 3, 1) =  \
-      MAT_ELEM_4X4(a, 3, 0) * MAT_ELEM_4X4(b, 0, 1) + \
-      MAT_ELEM_4X4(a, 3, 1) * MAT_ELEM_4X4(b, 1, 1) + \
-      MAT_ELEM_4X4(a, 3, 2) * MAT_ELEM_4X4(b, 2, 1) + \
-      MAT_ELEM_4X4(a, 3, 3) * MAT_ELEM_4X4(b, 3, 1); \
-   MAT_ELEM_4X4(out, 3, 2) = \
-      MAT_ELEM_4X4(a, 3, 0) * MAT_ELEM_4X4(b, 0, 2) + \
-      MAT_ELEM_4X4(a, 3, 1) * MAT_ELEM_4X4(b, 1, 2) + \
-      MAT_ELEM_4X4(a, 3, 2) * MAT_ELEM_4X4(b, 2, 2) + \
-      MAT_ELEM_4X4(a, 3, 3) * MAT_ELEM_4X4(b, 3, 2); \
-   MAT_ELEM_4X4(out, 3, 3) =  \
-      MAT_ELEM_4X4(a, 3, 0) * MAT_ELEM_4X4(b, 0, 3) + \
-      MAT_ELEM_4X4(a, 3, 1) * MAT_ELEM_4X4(b, 1, 3) + \
-      MAT_ELEM_4X4(a, 3, 2) * MAT_ELEM_4X4(b, 2, 3) + \
-      MAT_ELEM_4X4(a, 3, 3) * MAT_ELEM_4X4(b, 3, 3)
-
-#define matrix_4x4_scale(mat, x, y, z) \
-   MAT_ELEM_4X4(mat, 0, 0) = x; \
-   MAT_ELEM_4X4(mat, 0, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) = y; \
-   MAT_ELEM_4X4(mat, 1, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = z; \
-   MAT_ELEM_4X4(mat, 2, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) = 1.0f
-
-/*
- * Builds a translation matrix. All other elements in 
- * the matrix will be set to zero except for the
- * diagonal which is set to 1.0
- */
-
-#define matrix_4x4_translate(mat, x, y, z) \
-   MAT_ELEM_4X4(mat, 0, 0) = 1.0f; \
-   MAT_ELEM_4X4(mat, 0, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = x; \
-   MAT_ELEM_4X4(mat, 1, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) = 1.0f; \
-   MAT_ELEM_4X4(mat, 1, 2) = 1.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = y; \
-   MAT_ELEM_4X4(mat, 2, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = 1.0f; \
-   MAT_ELEM_4X4(mat, 2, 3) = z; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 3) = 1.0f
-
-/*
- * Creates a perspective projection matrix.
- */
-
-#define  matrix_4x4_projection(mat, y_fov, aspect, znear, zfar) \
-{ \
-   float const a           = 1.f / tan((y_fov) / 2.f); \
-   float delta_z           = (zfar) - (znear); \
-   MAT_ELEM_4X4(mat, 0, 0) = a / (aspect); \
-   MAT_ELEM_4X4(mat, 0, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 0, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 1) = a; \
-   MAT_ELEM_4X4(mat, 1, 2) = 0.0f; \
-   MAT_ELEM_4X4(mat, 1, 3) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 2, 2) = -(((zfar) + (znear)) / delta_z); \
-   MAT_ELEM_4X4(mat, 2, 3) = -1.f; \
-   MAT_ELEM_4X4(mat, 3, 0) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 1) = 0.0f; \
-   MAT_ELEM_4X4(mat, 3, 2) = -((2.f * (zfar) * (znear)) / delta_z); \
-   MAT_ELEM_4X4(mat, 3, 3) = 0.0f; \
-}
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/math/vector_2.h b/libretro-common/include/gfx/math/vector_2.h
deleted file mode 100644
index 435ebb1..0000000
--- a/libretro-common/include/gfx/math/vector_2.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (vector_2.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GFX_MATH_VECTOR_2_H__
-#define __LIBRETRO_SDK_GFX_MATH_VECTOR_2_H__
-
-#include <stdint.h>
-#include <math.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
-typedef float vec2_t[2];
-
-#define vec2_dot(a, b)   ((a[0] * b[0]) + (a[1] * b[1]))
-
-#define vec2_cross(a, b) ((a[0]*b[1]) - (a[1]*b[0]))
-
-#define vec2_add(dst, src) \
-   dst[0] += src[0]; \
-   dst[1] += src[1]
-
-#define vec2_subtract(dst, src) \
-   dst[0] -= src[0]; \
-   dst[1] -= src[1]
-
-#define vec2_copy(dst, src) \
-   dst[0] = src[0]; \
-   dst[1] = src[1]
-
-static INLINE float overflow(void)
-{
-   unsigned i;
-   volatile float f = 1e10;
-
-   for(i = 0; i < 10; ++i)	
-      f *= f;
-   return f;
-}
-
-static INLINE int16_t tofloat16(float f)
-{
-	union uif32
-   {
-      float f;
-      uint32_t i;
-   };
-
-   int i, s, e, m;
-   union uif32 Entry;
-   Entry.f = f;
-   i       = (int)Entry.i;
-   s       =  (i >> 16) & 0x00008000;
-   e       = ((i >> 23) & 0x000000ff) - (127 - 15);
-   m       =   i        & 0x007fffff;
-
-   if(e <= 0)
-   {
-      if(e < -10)
-         return (int16_t)(s);
-
-      m = (m | 0x00800000) >> (1 - e);
-
-      if(m & 0x00001000) 
-         m += 0x00002000;
-
-      return (int16_t)(s | (m >> 13));
-   }
-
-   if(e == 0xff - (127 - 15))
-   {
-      if(m == 0)
-         return (int16_t)(s | 0x7c00);
-
-      m >>= 13;
-
-      return (int16_t)(s | 0x7c00 | m | (m == 0));
-   }
-
-   if(m &  0x00001000)
-   {
-      m += 0x00002000;
-
-      if(m & 0x00800000)
-      {
-         m =  0;
-         e += 1;
-      }
-   }
-
-   if (e > 30)
-   {
-      overflow();
-
-      return (int16_t)(s | 0x7c00);
-   }
-
-   return (int16_t)(s | (e << 10) | (m >> 13));
-}
-
-static INLINE unsigned int vec2_packHalf2x16(float vec0, float vec1)
-{
-   union
-   {
-      int16_t in[2];
-      unsigned int out;
-   } u;
-
-   u.in[0] = tofloat16(vec0);
-   u.in[1] = tofloat16(vec1);
-
-   return u.out;
-}
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/math/vector_3.h b/libretro-common/include/gfx/math/vector_3.h
deleted file mode 100644
index 6725617..0000000
--- a/libretro-common/include/gfx/math/vector_3.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (vector_3.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GFX_MATH_VECTOR_3_H__
-#define __LIBRETRO_SDK_GFX_MATH_VECTOR_3_H__
-
-#include <stdint.h>
-#include <math.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef float vec3_t[3];
-
-#define vec3_dot(a, b) (a[0] * b[0] + a[1] * b[1] + a[2] * b[2])
-
-#define vec3_cross(dst, a, b)  \
-   dst[0] = a[1]*b[2] - a[2]*b[1]; \
-   dst[1] = a[2]*b[0] - a[0]*b[2]; \
-   dst[2] = a[0]*b[1] - a[1]*b[0]
-
-#define vec3_length(a) sqrtf(vec3_dot(a,a))
-
-#define vec3_add(dst, src) \
-   dst[0] += src[0]; \
-   dst[1] += src[1]; \
-   dst[2] += src[2]
-
-#define vec3_subtract(dst, src) \
-   dst[0] -= src[0]; \
-   dst[1] -= src[1]; \
-   dst[2] -= src[2]
-
-#define vec3_scale(dst, scale) \
-   dst[0] *= scale; \
-   dst[1] *= scale; \
-   dst[2] *= scale
-
-#define vec3_copy(dst, src) \
-   dst[0] = src[0]; \
-   dst[1] = src[1]; \
-   dst[2] = src[2]
-
-#define vec3_normalize(dst) vec3_scale(dst,1.0f / vec3_length(dst))
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/math/vector_4.h b/libretro-common/include/gfx/math/vector_4.h
deleted file mode 100644
index 3b9510c..0000000
--- a/libretro-common/include/gfx/math/vector_4.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (vector_4.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GFX_MATH_VECTOR_4_H__
-#define __LIBRETRO_SDK_GFX_MATH_VECTOR_4_H__
-
-#include <stdint.h>
-#include <math.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef float vec4_t[4];
-
-#define vec4_add(dst, src) \
-   dst[0] += src[0]; \
-   dst[1] += src[1]; \
-   dst[2] += src[2]; \
-   dst[3] += src[3]
-
-#define vec4_subtract(dst, src) \
-   dst[0] -= src[0]; \
-   dst[1] -= src[1]; \
-   dst[2] -= src[2]; \
-   dst[3] -= src[3]
-
-#define vec4_scale(dst, scale) \
-   dst[0] *= scale; \
-   dst[1] *= scale; \
-   dst[2] *= scale; \
-   dst[3] *= scale
-
-#define vec4_copy(dst, src) \
-   dst[0] = src[0]; \
-   dst[1] = src[1]; \
-   dst[2] = src[2]; \
-   dst[3] = src[3]
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/scaler/filter.h b/libretro-common/include/gfx/scaler/filter.h
deleted file mode 100644
index ba5ae93..0000000
--- a/libretro-common/include/gfx/scaler/filter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (filter.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_SCALER_FILTER_H__
-#define __LIBRETRO_SDK_SCALER_FILTER_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#include <boolean.h>
-#include <gfx/scaler/scaler.h>
-
-bool scaler_gen_filter(struct scaler_ctx *ctx);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/scaler/pixconv.h b/libretro-common/include/gfx/scaler/pixconv.h
deleted file mode 100644
index 6dfab47..0000000
--- a/libretro-common/include/gfx/scaler/pixconv.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (pixconv.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_SCALER_PIXCONV_H__
-#define __LIBRETRO_SDK_SCALER_PIXCONV_H__
-
-#include <clamping.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-
-void conv_0rgb1555_argb8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_0rgb1555_rgb565(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_rgb565_0rgb1555(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_rgb565_argb8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_rgba4444_argb8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_rgba4444_rgb565(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_bgr24_argb8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_argb8888_0rgb1555(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_argb8888_rgba4444(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_argb8888_rgb565(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_argb8888_bgr24(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_argb8888_abgr8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_0rgb1555_bgr24(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_rgb565_bgr24(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_yuyv_argb8888(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-void conv_copy(void *output, const void *input,
-      int width, int height,
-      int out_stride, int in_stride);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/scaler/scaler.h b/libretro-common/include/gfx/scaler/scaler.h
deleted file mode 100644
index 469afaf..0000000
--- a/libretro-common/include/gfx/scaler/scaler.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (scaler.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_SCALER_H__
-#define __LIBRETRO_SDK_SCALER_H__
-
-#include <retro_common_api.h>
-
-#include <stdint.h>
-#include <stddef.h>
-#include <boolean.h>
-#include <clamping.h>
-
-RETRO_BEGIN_DECLS
-
-enum scaler_pix_fmt
-{
-   SCALER_FMT_ARGB8888 = 0,
-   SCALER_FMT_ABGR8888,
-   SCALER_FMT_0RGB1555,
-   SCALER_FMT_RGB565,
-   SCALER_FMT_BGR24,
-   SCALER_FMT_YUYV,
-   SCALER_FMT_RGBA4444
-};
-
-enum scaler_type
-{
-   SCALER_TYPE_UNKNOWN = 0,
-   SCALER_TYPE_POINT,
-   SCALER_TYPE_BILINEAR,
-   SCALER_TYPE_SINC
-};
-
-struct scaler_filter
-{
-   int16_t *filter;
-   int filter_len;
-   int filter_stride;
-   int *filter_pos;
-};
-
-struct scaler_ctx
-{
-   int in_width;
-   int in_height;
-   int in_stride;
-
-   int out_width;
-   int out_height;
-   int out_stride;
-
-   enum scaler_pix_fmt in_fmt;
-   enum scaler_pix_fmt out_fmt;
-   enum scaler_type scaler_type;
-
-   void (*scaler_horiz)(const struct scaler_ctx*,
-         const void*, int);
-   void (*scaler_vert)(const struct scaler_ctx*,
-         void*, int);
-   void (*scaler_special)(const struct scaler_ctx*,
-         void*, const void*, int, int, int, int, int, int);
-
-   void (*in_pixconv)(void*, const void*, int, int, int, int);
-   void (*out_pixconv)(void*, const void*, int, int, int, int);
-   void (*direct_pixconv)(void*, const void*, int, int, int, int);
-
-   bool unscaled;
-   struct scaler_filter horiz, vert;
-
-   struct
-   {
-      uint32_t *frame;
-      int stride;
-   } input;
-
-   struct
-   {
-      uint64_t *frame;
-      int width;
-      int height;
-      int stride;
-   } scaled;
-
-   struct
-   {
-      uint32_t *frame;
-      int stride;
-   } output;
-};
-
-bool scaler_ctx_gen_filter(struct scaler_ctx *ctx);
-
-void scaler_ctx_gen_reset(struct scaler_ctx *ctx);
-
-/**
- * scaler_ctx_scale:
- * @ctx          : pointer to scaler context object.
- * @output       : pointer to output image.
- * @input        : pointer to input image.
- *
- * Scales an input image to an output image.
- **/
-void scaler_ctx_scale(struct scaler_ctx *ctx,
-      void *output, const void *input);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/scaler/scaler_int.h b/libretro-common/include/gfx/scaler/scaler_int.h
deleted file mode 100644
index 87ef68e..0000000
--- a/libretro-common/include/gfx/scaler/scaler_int.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (scaler_int.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_SCALER_INT_H__
-#define __LIBRETRO_SDK_SCALER_INT_H__
-
-#include <gfx/scaler/scaler.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-void scaler_argb8888_vert(const struct scaler_ctx *ctx,
-      void *output, int stride);
-
-void scaler_argb8888_horiz(const struct scaler_ctx *ctx,
-      const void *input, int stride);
-
-void scaler_argb8888_point_special(const struct scaler_ctx *ctx,
-      void *output, const void *input,
-      int out_width, int out_height,
-      int in_width, int in_height,
-      int out_stride, int in_stride);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/gfx/video_frame.h b/libretro-common/include/gfx/video_frame.h
deleted file mode 100644
index 4b0f7d1..0000000
--- a/libretro-common/include/gfx/video_frame.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (video_frame.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_VIDEO_FRAME_H
-#define _LIBRETRO_SDK_VIDEO_FRAME_H
-
-#include <stdint.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-#include <gfx/scaler/scaler.h>
-
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-#define scaler_ctx_scale_direct(ctx, output, input) \
-   if (ctx->unscaled) \
-      /* Just perform straight pixel conversion. */ \
-      ctx->direct_pixconv(output, input, \
-            ctx->out_width, ctx->out_height, \
-            ctx->out_stride, ctx->in_stride); \
-   else \
-      scaler_ctx_scale(ctx, output, input)
-
-static INLINE void video_frame_convert_rgb16_to_rgb32(
-      struct scaler_ctx *scaler,
-      void *output,
-      const void *input,
-      int width, int height,
-      int in_pitch)
-{
-   if (width != scaler->in_width || height != scaler->in_height)
-   {
-      scaler->in_width    = width;
-      scaler->in_height   = height;
-      scaler->out_width   = width;
-      scaler->out_height  = height;
-      scaler->in_fmt      = SCALER_FMT_RGB565;
-      scaler->out_fmt     = SCALER_FMT_ARGB8888;
-      scaler->scaler_type = SCALER_TYPE_POINT;
-      scaler_ctx_gen_filter(scaler);
-   }
-
-   scaler->in_stride  = in_pitch;
-   scaler->out_stride = width * sizeof(uint32_t);
-
-   scaler_ctx_scale_direct(scaler, output, input);
-}
-
-static INLINE void video_frame_scale(
-      struct scaler_ctx *scaler,
-      void *output,
-      const void *input,
-      enum scaler_pix_fmt format,
-      unsigned scaler_width,
-      unsigned scaler_height,
-      unsigned scaler_pitch,
-      unsigned width,
-      unsigned height,
-      unsigned pitch)
-{
-   if (
-            width  != (unsigned)scaler->in_width
-         || height != (unsigned)scaler->in_height
-         || format != scaler->in_fmt
-         || pitch  != (unsigned)scaler->in_stride
-      )
-   {
-      scaler->in_fmt    = format;
-      scaler->in_width  = width;
-      scaler->in_height = height;
-      scaler->in_stride = pitch;
-
-      scaler->out_width  = scaler_width;
-      scaler->out_height = scaler_height;
-      scaler->out_stride = scaler_pitch;
-
-      scaler_ctx_gen_filter(scaler);
-   }
-
-   scaler_ctx_scale_direct(scaler, output, input);
-}
-
-static INLINE void video_frame_record_scale(
-      struct scaler_ctx *scaler,
-      void *output,
-      const void *input,
-      unsigned scaler_width,
-      unsigned scaler_height,
-      unsigned scaler_pitch,
-      unsigned width,
-      unsigned height,
-      unsigned pitch,
-      bool bilinear)
-{
-   if (
-            width  != (unsigned)scaler->in_width
-         || height != (unsigned)scaler->in_height
-      )
-   {
-      scaler->in_width    = width;
-      scaler->in_height   = height;
-      scaler->in_stride   = pitch;
-
-      scaler->scaler_type = bilinear ?
-         SCALER_TYPE_BILINEAR : SCALER_TYPE_POINT;
-
-      scaler->out_width  = scaler_width;
-      scaler->out_height = scaler_height;
-      scaler->out_stride = scaler_pitch;
-
-      scaler_ctx_gen_filter(scaler);
-   }
-
-   scaler_ctx_scale_direct(scaler, output, input);
-}
-
-static INLINE void video_frame_convert_argb8888_to_abgr8888(
-      struct scaler_ctx *scaler,
-      void *output, const void *input,
-      int width, int height, int in_pitch)
-{
-   if (width != scaler->in_width || height != scaler->in_height)
-   {
-      scaler->in_width    = width;
-      scaler->in_height   = height;
-      scaler->out_width   = width;
-      scaler->out_height  = height;
-      scaler->in_fmt      = SCALER_FMT_ARGB8888;
-      scaler->out_fmt     = SCALER_FMT_ABGR8888;
-      scaler->scaler_type = SCALER_TYPE_POINT;
-      scaler_ctx_gen_filter(scaler);
-   }
-
-   scaler->in_stride  = in_pitch;
-   scaler->out_stride = width * sizeof(uint32_t);
-
-   scaler_ctx_scale_direct(scaler, output, input);
-}
-
-static INLINE void video_frame_convert_to_bgr24(
-      struct scaler_ctx *scaler,
-      void *output, const void *input,
-      int width, int height, int in_pitch)
-{
-   scaler->in_width    = width;
-   scaler->in_height   = height;
-   scaler->out_width   = width;
-   scaler->out_height  = height;
-   scaler->out_fmt     = SCALER_FMT_BGR24;
-   scaler->scaler_type = SCALER_TYPE_POINT;
-
-   scaler_ctx_gen_filter(scaler);
-
-   scaler->in_stride   = in_pitch;
-   scaler->out_stride  = width * 3;
-
-   scaler_ctx_scale_direct(scaler, output, input);
-}
-
-static INLINE void video_frame_convert_rgba_to_bgr(
-      const void *src_data,
-      void *dst_data,
-      unsigned width)
-{
-   unsigned x;
-   uint8_t      *dst  = (uint8_t*)dst_data;
-   const uint8_t *src = (const uint8_t*)src_data;
-
-   for (x = 0; x < width; x++, dst += 3, src += 4)
-   {
-      dst[0] = src[2];
-      dst[1] = src[1];
-      dst[2] = src[0];
-   }
-}
-
-static INLINE bool video_pixel_frame_scale(
-      struct scaler_ctx *scaler,
-      void *output, const void *data,
-      unsigned width, unsigned height,
-      size_t pitch)
-{
-   scaler->in_width      = width;
-   scaler->in_height     = height;
-   scaler->out_width     = width;
-   scaler->out_height    = height;
-   scaler->in_stride     = (int)pitch;
-   scaler->out_stride    = width * sizeof(uint16_t);
-
-   scaler_ctx_scale_direct(scaler, output, data);
-
-   return true;
-}
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/glsm/glsm.h b/libretro-common/include/glsm/glsm.h
deleted file mode 100644
index 8e30acd..0000000
--- a/libretro-common/include/glsm/glsm.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsm.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_SDK_GLSM_H
-#define LIBRETRO_SDK_GLSM_H
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-#include <libretro.h>
-#include <glsym/rglgen_headers.h>
-
-RETRO_BEGIN_DECLS
-
-#ifdef HAVE_OPENGLES2
-typedef GLfloat GLdouble;
-typedef GLclampf GLclampd;
-#endif
-
-#if defined(HAVE_OPENGLES2)
-#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
-#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
-#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
-#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
-#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT
-#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
-#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
-#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_EXT
-#elif defined(HAVE_PSGL)
-#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_OES
-#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_SCE
-#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
-#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT_OES
-#else
-#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
-#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
-#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
-#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
-#endif
-
-#if defined(HAVE_PSGL)
-#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
-#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
-#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
-#elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
-#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
-#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
-#else
-#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER
-#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE
-#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0
-#endif
-
-#ifndef GL_FOG
-#define GL_FOG 0x0B60
-#endif
-
-#ifndef GL_ALPHA_TEST
-#define GL_ALPHA_TEST 0x0BC0
-#endif
-
-#ifndef GL_CLIP_DISTANCE0
-#define GL_CLIP_DISTANCE0 0x3000
-#endif
-
-#define MAX_ATTRIB 8
-
-enum
-{
-   SGL_DEPTH_TEST             = 0,
-   SGL_BLEND,
-   SGL_POLYGON_OFFSET_FILL,
-   SGL_FOG,
-   SGL_CULL_FACE,
-   SGL_ALPHA_TEST,
-   SGL_SCISSOR_TEST,
-   SGL_STENCIL_TEST,
-#if !defined(HAVE_OPENGLES)
-   SGL_DEPTH_CLAMP,
-   SGL_CLIP_DISTANCE0,
-#endif
-   SGL_DITHER,
-   SGL_SAMPLE_ALPHA_TO_COVERAGE,
-   SGL_SAMPLE_COVERAGE,
-#ifndef HAVE_OPENGLES
-   SGL_COLOR_LOGIC_OP,
-#endif
-   SGL_CAP_MAX
-};
-
-enum glsm_state_ctl
-{
-   GLSM_CTL_NONE = 0,
-   GLSM_CTL_STATE_SETUP,
-   GLSM_CTL_STATE_BIND,
-   GLSM_CTL_STATE_UNBIND,
-   GLSM_CTL_STATE_CONTEXT_RESET,
-   GLSM_CTL_STATE_CONTEXT_DESTROY,
-   GLSM_CTL_STATE_CONTEXT_INIT,
-   GLSM_CTL_IS_IMM_VBO,
-   GLSM_CTL_SET_IMM_VBO,
-   GLSM_CTL_UNSET_IMM_VBO,
-   GLSM_CTL_IMM_VBO_DISABLE,
-   GLSM_CTL_IMM_VBO_DRAW,
-   GLSM_CTL_PROC_ADDRESS_GET
-};
-
-typedef bool (*glsm_imm_vbo_draw)(void *);
-typedef bool (*glsm_imm_vbo_disable)(void *);
-typedef bool (*glsm_framebuffer_lock)(void *);
-
-typedef struct glsm_ctx_proc_address
-{
-   retro_get_proc_address_t addr;
-} glsm_ctx_proc_address_t;
-
-typedef struct glsm_ctx_params
-{
-   glsm_framebuffer_lock    framebuffer_lock;
-   glsm_imm_vbo_draw        imm_vbo_draw;
-   glsm_imm_vbo_disable     imm_vbo_disable;
-   retro_hw_context_reset_t context_reset;
-   retro_hw_context_reset_t context_destroy;
-   retro_environment_t environ_cb;
-   bool stencil;
-   unsigned major;
-   unsigned minor;
-} glsm_ctx_params_t;
-
-GLuint glsm_get_current_framebuffer(void);
-
-bool glsm_ctl(enum glsm_state_ctl state, void *data);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/glsm/glsmsym.h b/libretro-common/include/glsm/glsmsym.h
deleted file mode 100644
index 7b12246..0000000
--- a/libretro-common/include/glsm/glsmsym.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsmsym.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_SDK_GLSM_SYM_H
-#define LIBRETRO_SDK_GLSM_SYM_H
-
-#include <glsm/glsm.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/* deprecated old FF-style GL symbols */
-#define glTexCoord2f                rglTexCoord2f
-
-/* more forward-compatible GL subset symbols */
-#define glBlitFramebuffer           rglBlitFramebuffer
-#define glVertexAttrib4f            rglVertexAttrib4f
-#define glVertexAttrib4fv           rglVertexAttrib4fv
-#define glDrawArrays                rglDrawArrays
-#define glDrawElements              rglDrawElements
-#define glCompressedTexImage2D      rglCompressedTexImage2D
-#define glBindTexture               rglBindTexture
-#define glActiveTexture             rglActiveTexture
-#define glFramebufferTexture        rglFramebufferTexture
-#define glFramebufferTexture2D      rglFramebufferTexture2D
-#define glFramebufferRenderbuffer   rglFramebufferRenderbuffer
-#define glDeleteFramebuffers        rglDeleteFramebuffers
-#define glDeleteTextures            rglDeleteTextures
-#define glDeleteBuffers             rglDeleteBuffers
-#define glRenderbufferStorage       rglRenderbufferStorage
-#define glBindRenderbuffer          rglBindRenderbuffer
-#define glDeleteRenderbuffers       rglDeleteRenderbuffers
-#define glGenRenderbuffers          rglGenRenderbuffers
-#define glGenFramebuffers           rglGenFramebuffers
-#define glGenTextures               rglGenTextures
-#define glBindFramebuffer           rglBindFramebuffer
-#define glGenerateMipmap            rglGenerateMipmap
-#define glCheckFramebufferStatus    rglCheckFramebufferStatus
-#define glBindFragDataLocation      rglBindFragDataLocation
-#define glBindAttribLocation        rglBindAttribLocation
-#define glLinkProgram               rglLinkProgram
-#define glGetProgramiv              rglGetProgramiv
-#define glGetShaderiv               rglGetShaderiv
-#define glAttachShader              rglAttachShader
-#define glDetachShader              rglDetachShader
-#define glShaderSource              rglShaderSource
-#define glCompileShader             rglCompileShader
-#define glCreateProgram             rglCreateProgram
-#define glGetShaderInfoLog          rglGetShaderInfoLog
-#define glGetProgramInfoLog         rglGetProgramInfoLog
-#define glIsProgram                 rglIsProgram
-#define glEnableVertexAttribArray   rglEnableVertexAttribArray
-#define glDisableVertexAttribArray  rglDisableVertexAttribArray
-#define glVertexAttribPointer       rglVertexAttribPointer
-#define glVertexAttribIPointer      rglVertexAttribIPointer
-#define glVertexAttribLPointer      rglVertexAttribLPointer
-#define glGetUniformLocation        rglGetUniformLocation
-#define glGenBuffers                rglGenBuffers
-#define glDisable(T)                rglDisable(S##T)
-#define glEnable(T)                 rglEnable(S##T)
-#define glIsEnabled(T)              rglIsEnabled(S##T)
-#define glUseProgram                rglUseProgram
-#define glDepthMask                 rglDepthMask
-#define glStencilMask               rglStencilMask
-#define glBufferData                rglBufferData
-#define glBufferSubData             rglBufferSubData
-#define glBindBuffer                rglBindBuffer
-#define glCreateShader              rglCreateShader
-#define glDeleteShader              rglDeleteShader
-#define glDeleteProgram             rglDeleteProgram
-#define glUniform1f                 rglUniform1f
-#define glUniform1i                 rglUniform1i
-#define glUniform2f                 rglUniform2f
-#define glUniform2i                 rglUniform2i
-#define glUniform2fv                rglUniform2fv
-#define glUniform3f                 rglUniform3f
-#define glUniform3fv                rglUniform3fv
-#define glUniform4i                 rglUniform4i
-#define glUniform4f                 rglUniform4f
-#define glUniform4fv                rglUniform4fv
-#define glUniform1ui                rglUniform1ui
-#define glUniform2ui                rglUniform2ui
-#define glUniform3ui                rglUniform3ui
-#define glUniform4ui                rglUniform4ui
-#define glGetActiveUniform          rglGetActiveUniform
-#define glBlendFunc                 rglBlendFunc
-#define glBlendFuncSeparate         rglBlendFuncSeparate
-#define glDepthFunc                 rglDepthFunc
-#define glColorMask                 rglColorMask
-#define glClearColor                rglClearColor
-#define glViewport                  rglViewport
-#define glScissor                   rglScissor
-#define glStencilFunc               rglStencilFunc
-#define glCullFace                  rglCullFace
-#define glStencilOp                 rglStencilOp
-#define glFrontFace                 rglFrontFace
-#define glDepthRange                rglDepthRange
-#define glClearDepth                rglClearDepth
-#define glPolygonOffset             rglPolygonOffset
-#define glPixelStorei               rglPixelStorei
-#define glReadBuffer                rglReadBuffer
-#define glUniformMatrix4fv          rglUniformMatrix4fv
-#define glGetAttribLocation         rglGetAttribLocation
-#define glTexStorage2D              rglTexStorage2D
-#define glDrawBuffers               rglDrawBuffers
-#define glGenVertexArrays           rglGenVertexArrays
-#define glBindVertexArray           rglBindVertexArray
-#define glBlendEquation             rglBlendEquation
-#define glBlendColor                rglBlendColor
-#define glBlendEquationSeparate     rglBlendEquationSeparate
-#define glCopyImageSubData          rglCopyImageSubData
-#define glMapBuffer                 rglMapBuffer
-#define glUnmapBuffer               rglUnmapBuffer
-#define glMapBufferRange            rglMapBufferRange
-#define glUniformBlockBinding       rglUniformBlockBinding
-#define glGetUniformBlockIndex      rglGetUniformBlockIndex
-#define glGetActiveUniformBlockiv   rglGetActiveUniformBlockiv
-#define glBindBufferBase            rglBindBufferBase 
-#define glGetUniformIndices         rglGetUniformIndices
-#define glGetActiveUniformsiv       rglGetActiveUniformsiv
-#define glGetError                  rglGetError
-#define glClear                     rglClear
-#define glPolygonMode               rglPolygonMode
-#define glLineWidth                 rglLineWidth
-#define glTexImage2DMultisample     rglTexImage2DMultisample
-#define glTexStorage2DMultisample   rglTexStorage2DMultisample
-#define glMemoryBarrier             rglMemoryBarrier
-#define glBindImageTexture          rglBindImageTexture
-#define glProgramBinary             rglProgramBinary
-#define glGetProgramBinary          rglGetProgramBinary
-#define glProgramParameteri         rglProgramParameteri
-#define glTexSubImage2D             rglTexSubImage2D
-#define glDeleteVertexArrays        rglDeleteVertexArrays
-#define glRenderbufferStorageMultisample rglRenderbufferStorageMultisample
-#define glUniform1iv                rglUniform1iv
-#define glUniform1fv                rglUniform1fv
-#define glValidateProgram           rglValidateProgram
-#define glGetStringi                rglGetStringi
-#define glTexBuffer                 rglTexBuffer
-#define glClearBufferfv             rglClearBufferfv
-#define glClearBufferfi             rglClearBufferfi
-#define glWaitSync                  rglWaitSync
-#define glFenceSync                 rglFenceSync
-#define glDeleteSync                rglDeleteSync
-#define glBufferStorage             rglBufferStorage
-#define glFlushMappedBufferRange    rglFlushMappedBufferRange
-#define glClientWaitSync            rglClientWaitSync
-#define glDrawElementsBaseVertex    rglDrawElementsBaseVertex
-
-const GLubyte* rglGetStringi(GLenum name, GLuint index);
-void rglTexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
-void rglClearBufferfv( 	GLenum buffer,
-  	GLint drawBuffer,
-  	const GLfloat * value);
-void rglClearBufferfi( 	GLenum buffer,
-  	GLint drawBuffer,
-  	GLfloat depth,
-  	GLint stencil);
-void rglValidateProgram(GLuint program);
-void rglRenderbufferStorageMultisample( 	GLenum target,
-  	GLsizei samples,
-  	GLenum internalformat,
-  	GLsizei width,
-  	GLsizei height);
-void rglUniform1iv(GLint location,  GLsizei count,  const GLint *value);
-void rglUniform1fv(GLint location,  GLsizei count,  const GLfloat *value);
-void rglProgramParameteri( 	GLuint program,
-  	GLenum pname,
-  	GLint value);
-void rglGetProgramBinary( 	GLuint program,
-  	GLsizei bufsize,
-  	GLsizei *length,
-  	GLenum *binaryFormat,
-  	void *binary);
-void rglProgramBinary(GLuint program,
-  	GLenum binaryFormat,
-  	const void *binary,
-  	GLsizei length);
-void rglBindImageTexture( 	GLuint unit,
-  	GLuint texture,
-  	GLint level,
-  	GLboolean layered,
-  	GLint layer,
-  	GLenum access,
-  	GLenum format);
-void rglTexStorage2DMultisample(GLenum target, GLsizei samples,
-      GLenum internalformat, GLsizei width, GLsizei height,
-      GLboolean fixedsamplelocations);
-void rglGetActiveUniformsiv( 	GLuint program,
-  	GLsizei uniformCount,
-  	const GLuint *uniformIndices,
-  	GLenum pname,
-  	GLint *params);
-void rglGetUniformIndices( 	GLuint program,
-  	GLsizei uniformCount,
-  	const GLchar **uniformNames,
-  	GLuint *uniformIndices);
-void rglBindBufferBase( 	GLenum target,
-  	GLuint index,
-  	GLuint buffer);
-void rglGetActiveUniformBlockiv( 	GLuint program,
-  	GLuint uniformBlockIndex,
-  	GLenum pname,
-  	GLint *params);
-GLuint rglGetUniformBlockIndex( 	GLuint program,
-  	const GLchar *uniformBlockName);
-void * rglMapBuffer(	GLenum target, GLenum access);
-void *rglMapBufferRange( 	GLenum target,
-  	GLintptr offset,
-  	GLsizeiptr length,
-  	GLbitfield access);
-GLboolean rglUnmapBuffer( 	GLenum target);
-void rglBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void rglBlendEquation(GLenum mode);
-void rglGenVertexArrays(GLsizei n, GLuint *arrays);
-void rglReadBuffer(GLenum mode);
-void rglPixelStorei(GLenum pname, GLint param);
-void rglTexCoord2f(GLfloat s, GLfloat t);
-void rglDrawElements(GLenum mode, GLsizei count, GLenum type,
-                           const GLvoid * indices);
-void rglTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat,
-      GLsizei width, GLsizei height);
-void rglCompressedTexImage2D(GLenum target, GLint level,
-      GLenum internalformat, GLsizei width, GLsizei height,
-      GLint border, GLsizei imageSize, const GLvoid *data);
-void glBindTexture(GLenum target, GLuint texture);
-void glActiveTexture(GLenum texture);
-void rglFramebufferTexture(GLenum target, GLenum attachment,
-  	GLuint texture, GLint level);
-void rglFramebufferTexture2D(GLenum target, GLenum attachment,
-      GLenum textarget, GLuint texture, GLint level);
-void rglFramebufferRenderbuffer(GLenum target, GLenum attachment,
-      GLenum renderbuffertarget, GLuint renderbuffer);
-void rglDeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
-void rglRenderbufferStorage(GLenum target, GLenum internalFormat,
-      GLsizei width, GLsizei height);
-void rglDeleteTextures(GLsizei n, const GLuint *textures);
-void rglBindRenderbuffer(GLenum target, GLuint renderbuffer);
-void rglDeleteRenderbuffers(GLsizei n, GLuint *renderbuffers);
-void rglGenRenderbuffers(GLsizei n, GLuint *renderbuffers);
-void rglGenFramebuffers(GLsizei n, GLuint *ids);
-void rglGenTextures(GLsizei n, GLuint *textures);
-void rglBindFramebuffer(GLenum target, GLuint framebuffer);
-void rglGenerateMipmap(GLenum target);
-GLenum rglCheckFramebufferStatus(GLenum target);
-void rglBindFragDataLocation(GLuint program, GLuint colorNumber,
-                                   const char * name);
-void rglBindAttribLocation(GLuint program, GLuint index, const GLchar *name);
-void rglLinkProgram(GLuint program);
-void rglGetProgramiv(GLuint shader, GLenum pname, GLint *params);
-void rglGetShaderiv(GLuint shader, GLenum pname, GLint *params);
-void rglAttachShader(GLuint program, GLuint shader);
-void rglShaderSource(GLuint shader, GLsizei count,
-      const GLchar **string, const GLint *length);
-void rglCompileShader(GLuint shader);
-GLuint rglCreateProgram(void);
-void rglGetShaderInfoLog(GLuint shader, GLsizei maxLength,
-      GLsizei *length, GLchar *infoLog);
-void rglGetProgramInfoLog(GLuint shader, GLsizei maxLength,
-      GLsizei *length, GLchar *infoLog);
-GLboolean rglIsProgram(GLuint program);
-void rglEnableVertexAttribArray(GLuint index);
-void rglDisableVertexAttribArray(GLuint index);
-void rglVertexAttribPointer(GLuint name, GLint size,
-      GLenum type, GLboolean normalized, GLsizei stride,
-      const GLvoid* pointer);
-GLint rglGetUniformLocation(GLuint program, const GLchar *name);
-void rglGenBuffers(GLsizei n, GLuint *buffers);
-void rglDisable(GLenum cap);
-void rglEnable(GLenum cap);
-void rglUseProgram(GLuint program);
-void rglDepthMask(GLboolean flag);
-void rglStencilMask(GLenum mask);
-void rglBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-void rglBufferSubData(GLenum target, GLintptr offset,
-      GLsizeiptr size, const GLvoid *data);
-void rglBindBuffer(GLenum target, GLuint buffer);
-GLuint rglCreateShader(GLenum shader);
-void rglDeleteShader(GLuint shader);
-void rglUniform1f(GLint location, GLfloat v0);
-void rglUniform1i(GLint location, GLint v0);
-void rglUniform2f(GLint location, GLfloat v0, GLfloat v1);
-void rglUniform2i(GLint location, GLint v0, GLint v1);
-void rglUniform2fv(GLint location, GLsizei count, const GLfloat *value);
-void rglUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-void rglUniform3fv(GLint location, GLsizei count, const GLfloat *value);
-void rglUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-void rglUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-void rglUniform4fv(GLint location, GLsizei count, const GLfloat *value);
-void rglBlendFunc(GLenum sfactor, GLenum dfactor);
-void rglBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha,
-      GLenum dstAlpha);
-void rglDepthFunc(GLenum func);
-void rglColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-void rglClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void rglViewport(GLint x, GLint y, GLsizei width, GLsizei height);
-void rglScissor(GLint x, GLint y, GLsizei width, GLsizei height);
-GLboolean rglIsEnabled(GLenum cap);
-void rglStencilFunc(GLenum func, GLint ref, GLuint mask);
-void rglCullFace(GLenum mode);
-void rglStencilOp(GLenum sfail, GLenum dpfail, GLenum dppass);
-void rglFrontFace(GLenum mode);
-void rglDepthRange(GLclampd zNear, GLclampd zFar);
-void rglClearDepth(GLdouble depth);
-void rglPolygonOffset(GLfloat factor, GLfloat units);
-void rglDrawArrays(GLenum mode, GLint first, GLsizei count);
-void rglVertexAttrib4f(GLuint name, GLfloat x, GLfloat y,
-      GLfloat z, GLfloat w);
-void rglVertexAttrib4fv(GLuint name, GLfloat* v);
-void rglDeleteProgram(GLuint program);
-void rglDeleteBuffers(GLsizei n, const GLuint *buffers);
-void rglBlitFramebuffer(
-      GLint srcX0, GLint srcY0,
-      GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0,
-      GLint dstX1, GLint dstY1,
-      GLbitfield mask, GLenum filter);
-void rglDetachShader(GLuint program, GLuint shader);
-void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat *value);
-GLint rglGetAttribLocation(GLuint program, const GLchar *name);
-void rglDrawBuffers(GLsizei n, const GLenum *bufs);
-void rglBindVertexArray(GLuint array);
-
-void rglGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize,
-      GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-void rglUniform1ui(GLint location, GLuint v);
-void rglUniform2ui(GLint location, GLuint v0, GLuint v1);
-void rglUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2);
-void rglUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-void rglBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
-void rglCopyImageSubData( 	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 srcWidth,
-  	GLsizei srcHeight,
-  	GLsizei srcDepth);
-void rglVertexAttribIPointer(
-      GLuint index,
-      GLint size,
-      GLenum type,
-      GLsizei stride,
-      const GLvoid * pointer);
-void rglVertexAttribLPointer(
-      GLuint index,
-      GLint size,
-      GLenum type,
-      GLsizei stride,
-      const GLvoid * pointer);
-void rglUniformBlockBinding( 	GLuint program,
-  	GLuint uniformBlockIndex,
-  	GLuint uniformBlockBinding);
-GLenum rglGetError(void);
-void rglClear(GLbitfield mask);
-void rglPolygonMode(GLenum face, GLenum mode);
-void rglLineWidth(GLfloat width);
-void rglTexImage2DMultisample( 	GLenum target,
-  	GLsizei samples,
-  	GLenum internalformat,
-  	GLsizei width,
-  	GLsizei height,
-  	GLboolean fixedsamplelocations);
-void rglMemoryBarrier( 	GLbitfield barriers);
-void rglTexSubImage2D( 	GLenum target,
-  	GLint level,
-  	GLint xoffset,
-  	GLint yoffset,
-  	GLsizei width,
-  	GLsizei height,
-  	GLenum format,
-  	GLenum type,
-  	const GLvoid * pixels);
-void rglDeleteVertexArrays(GLsizei n, const GLuint *arrays);
-void *rglFenceSync(GLenum condition, GLbitfield flags);
-void rglDeleteSync(void *sync);
-void rglWaitSync(void *sync, GLbitfield flags, uint64_t timeout);
-void rglBufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags);
-void rglFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);
-GLenum rglClientWaitSync(void *sync, GLbitfield flags, uint64_t timeout);
-void rglDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-			       GLvoid *indices, GLint basevertex);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/glsym/glsym.h b/libretro-common/include/glsym/glsym.h
deleted file mode 100644
index c1c13e2..0000000
--- a/libretro-common/include/glsym/glsym.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_GLSYM_H__
-#define __LIBRETRO_SDK_GLSYM_H__
-
-#include "rglgen.h"
-
-#ifndef HAVE_PSGL
-#if defined(HAVE_OPENGLES2)
-#include "glsym_es2.h"
-#elif defined(HAVE_OPENGLES3)
-#include "glsym_es3.h"
-#else
-#include "glsym_gl.h"
-#endif
-#endif
-
-#endif
-
diff --git a/libretro-common/include/glsym/glsym_es2.h b/libretro-common/include/glsym/glsym_es2.h
deleted file mode 100644
index 666d84d..0000000
--- a/libretro-common/include/glsym/glsym_es2.h
+++ /dev/null
@@ -1,639 +0,0 @@
-#ifndef RGLGEN_DECL_H__
-#define RGLGEN_DECL_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef GL_APIENTRY
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROCKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#else
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-typedef void (APIENTRY *RGLGENGLDEBUGPROCARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#endif
-#ifndef GL_OES_EGL_image
-typedef void *GLeglImageOES;
-#endif
-#if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2)
-typedef GLint GLfixed;
-#endif
-
-typedef void (GL_APIENTRYP RGLSYMGLBLENDBARRIERKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC) (RGLGENGLDEBUGPROCKHR callback, const void *userParam);
-typedef GLuint (GL_APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGKHRPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (GL_APIENTRYP RGLSYMGLPUSHDEBUGGROUPKHRPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (GL_APIENTRYP RGLSYMGLPOPDEBUGGROUPKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETPOINTERVKHRPROC) (GLenum pname, void **params);
-typedef GLenum (GL_APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLREADNPIXELSKHRPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMFVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMUIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYIMAGESUBDATAOESPROC) (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 srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (GL_APIENTRYP RGLSYMGLENABLEIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDISABLEIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONIOESPROC) (GLuint buf, GLenum mode);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCIOESPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIOESPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLCOLORMASKIOESPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISENABLEDIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREOESPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLint length);
-typedef void *(GL_APIENTRYP RGLSYMGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLUNMAPBUFFEROESPROC) (GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void **params);
-typedef void (GL_APIENTRYP RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-typedef void (GL_APIENTRYP RGLSYMGLMINSAMPLESHADINGOESPROC) (GLfloat value);
-typedef void (GL_APIENTRYP RGLSYMGLPATCHPARAMETERIOESPROC) (GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIIVOESPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIUIVOESPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIIVOESPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIUIVOESPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIIVOESPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIUIVOESPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC) (GLuint sampler, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFEROESPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFERRANGEOESPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTUREVIEWOESPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-typedef void (GL_APIENTRYP RGLSYMGLBINDVERTEXARRAYOESPROC) (GLuint array);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
-typedef void (GL_APIENTRYP RGLSYMGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISVERTEXARRAYOESPROC) (GLuint array);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTARRAYVOESPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTINDEXEDFOESPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTINDEXEDFVOESPROC) (GLuint index, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORARRAYVOESPROC) (GLuint first, GLsizei count, const GLint *v);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORINDEXEDOESPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORINDEXEDVOESPROC) (GLuint index, const GLint *v);
-typedef void (GL_APIENTRYP RGLSYMGLDEPTHRANGEARRAYFVOESPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLDEPTHRANGEINDEXEDFOESPROC) (GLuint index, GLfloat n, GLfloat f);
-typedef void (GL_APIENTRYP RGLSYMGLGETFLOATI_VOESPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef void (GL_APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (GL_APIENTRYP RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC) (GLuint program, GLenum programInterface, const GLchar *name);
-typedef GLint (GL_APIENTRYP RGLSYMGLGETFRAGDATAINDEXEXTPROC) (GLuint program, const GLchar *name);
-typedef void (GL_APIENTRYP RGLSYMGLBUFFERSTORAGEEXTPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARTEXIMAGEEXTPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARTEXSUBIMAGEEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYIMAGESUBDATAEXTPROC) (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 srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (GL_APIENTRYP RGLSYMGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP RGLSYMGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP RGLSYMGLPOPGROUPMARKEREXTPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
-typedef void (GL_APIENTRYP RGLSYMGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISQUERYEXTPROC) (GLuint id);
-typedef void (GL_APIENTRYP RGLSYMGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
-typedef void (GL_APIENTRYP RGLSYMGLENDQUERYEXTPROC) (GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTIVEXTPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum *bufs);
-typedef void (GL_APIENTRYP RGLSYMGLENABLEIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDISABLEIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLCOLORMASKIEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISENABLEDIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GL_APIENTRYP RGLSYMGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor);
-typedef void *(GL_APIENTRYP RGLSYMGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (GL_APIENTRYP RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (GL_APIENTRYP RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
-typedef void (GL_APIENTRYP RGLSYMGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices);
-typedef void (GL_APIENTRYP RGLSYMGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (GL_APIENTRYP RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
-typedef void (GL_APIENTRYP RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-typedef void (GL_APIENTRYP RGLSYMGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
-typedef GLenum (GL_APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program);
-typedef void (GL_APIENTRYP RGLSYMGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef GLuint (GL_APIENTRYP RGLSYMGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines);
-typedef void (GL_APIENTRYP RGLSYMGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (GL_APIENTRYP RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target, GLsizei size);
-typedef GLsizei (GL_APIENTRYP RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC) (GLsizei offset, GLsizei n, const GLuint *values);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPAGECOMMITMENTEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
-typedef void (GL_APIENTRYP RGLSYMGLPATCHPARAMETERIEXTPROC) (GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFERRANGEEXTPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-typedef void (GL_APIENTRYP RGLSYMGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei samples, GLint baseViewIndex, GLsizei numViews);
-
-#define glBlendBarrierKHR __rglgen_glBlendBarrierKHR
-#define glDebugMessageControlKHR __rglgen_glDebugMessageControlKHR
-#define glDebugMessageInsertKHR __rglgen_glDebugMessageInsertKHR
-#define glDebugMessageCallbackKHR __rglgen_glDebugMessageCallbackKHR
-#define glGetDebugMessageLogKHR __rglgen_glGetDebugMessageLogKHR
-#define glPushDebugGroupKHR __rglgen_glPushDebugGroupKHR
-#define glPopDebugGroupKHR __rglgen_glPopDebugGroupKHR
-#define glObjectLabelKHR __rglgen_glObjectLabelKHR
-#define glGetObjectLabelKHR __rglgen_glGetObjectLabelKHR
-#define glObjectPtrLabelKHR __rglgen_glObjectPtrLabelKHR
-#define glGetObjectPtrLabelKHR __rglgen_glGetObjectPtrLabelKHR
-#define glGetPointervKHR __rglgen_glGetPointervKHR
-#define glGetGraphicsResetStatusKHR __rglgen_glGetGraphicsResetStatusKHR
-#define glReadnPixelsKHR __rglgen_glReadnPixelsKHR
-#define glGetnUniformfvKHR __rglgen_glGetnUniformfvKHR
-#define glGetnUniformivKHR __rglgen_glGetnUniformivKHR
-#define glGetnUniformuivKHR __rglgen_glGetnUniformuivKHR
-#define glEGLImageTargetTexture2DOES __rglgen_glEGLImageTargetTexture2DOES
-#define glEGLImageTargetRenderbufferStorageOES __rglgen_glEGLImageTargetRenderbufferStorageOES
-#define glCopyImageSubDataOES __rglgen_glCopyImageSubDataOES
-#define glEnableiOES __rglgen_glEnableiOES
-#define glDisableiOES __rglgen_glDisableiOES
-#define glBlendEquationiOES __rglgen_glBlendEquationiOES
-#define glBlendEquationSeparateiOES __rglgen_glBlendEquationSeparateiOES
-#define glBlendFunciOES __rglgen_glBlendFunciOES
-#define glBlendFuncSeparateiOES __rglgen_glBlendFuncSeparateiOES
-#define glColorMaskiOES __rglgen_glColorMaskiOES
-#define glIsEnablediOES __rglgen_glIsEnablediOES
-#define glDrawElementsBaseVertexOES __rglgen_glDrawElementsBaseVertexOES
-#define glDrawRangeElementsBaseVertexOES __rglgen_glDrawRangeElementsBaseVertexOES
-#define glDrawElementsInstancedBaseVertexOES __rglgen_glDrawElementsInstancedBaseVertexOES
-#define glMultiDrawElementsBaseVertexOES __rglgen_glMultiDrawElementsBaseVertexOES
-#define glFramebufferTextureOES __rglgen_glFramebufferTextureOES
-#define glGetProgramBinaryOES __rglgen_glGetProgramBinaryOES
-#define glProgramBinaryOES __rglgen_glProgramBinaryOES
-#define glMapBufferOES __rglgen_glMapBufferOES
-#define glUnmapBufferOES __rglgen_glUnmapBufferOES
-#define glGetBufferPointervOES __rglgen_glGetBufferPointervOES
-#define glPrimitiveBoundingBoxOES __rglgen_glPrimitiveBoundingBoxOES
-#define glMinSampleShadingOES __rglgen_glMinSampleShadingOES
-#define glPatchParameteriOES __rglgen_glPatchParameteriOES
-#define glTexImage3DOES __rglgen_glTexImage3DOES
-#define glTexSubImage3DOES __rglgen_glTexSubImage3DOES
-#define glCopyTexSubImage3DOES __rglgen_glCopyTexSubImage3DOES
-#define glCompressedTexImage3DOES __rglgen_glCompressedTexImage3DOES
-#define glCompressedTexSubImage3DOES __rglgen_glCompressedTexSubImage3DOES
-#define glFramebufferTexture3DOES __rglgen_glFramebufferTexture3DOES
-#define glTexParameterIivOES __rglgen_glTexParameterIivOES
-#define glTexParameterIuivOES __rglgen_glTexParameterIuivOES
-#define glGetTexParameterIivOES __rglgen_glGetTexParameterIivOES
-#define glGetTexParameterIuivOES __rglgen_glGetTexParameterIuivOES
-#define glSamplerParameterIivOES __rglgen_glSamplerParameterIivOES
-#define glSamplerParameterIuivOES __rglgen_glSamplerParameterIuivOES
-#define glGetSamplerParameterIivOES __rglgen_glGetSamplerParameterIivOES
-#define glGetSamplerParameterIuivOES __rglgen_glGetSamplerParameterIuivOES
-#define glTexBufferOES __rglgen_glTexBufferOES
-#define glTexBufferRangeOES __rglgen_glTexBufferRangeOES
-#define glTexStorage3DMultisampleOES __rglgen_glTexStorage3DMultisampleOES
-#define glTextureViewOES __rglgen_glTextureViewOES
-#define glBindVertexArrayOES __rglgen_glBindVertexArrayOES
-#define glDeleteVertexArraysOES __rglgen_glDeleteVertexArraysOES
-#define glGenVertexArraysOES __rglgen_glGenVertexArraysOES
-#define glIsVertexArrayOES __rglgen_glIsVertexArrayOES
-#define glViewportArrayvOES __rglgen_glViewportArrayvOES
-#define glViewportIndexedfOES __rglgen_glViewportIndexedfOES
-#define glViewportIndexedfvOES __rglgen_glViewportIndexedfvOES
-#define glScissorArrayvOES __rglgen_glScissorArrayvOES
-#define glScissorIndexedOES __rglgen_glScissorIndexedOES
-#define glScissorIndexedvOES __rglgen_glScissorIndexedvOES
-#define glDepthRangeArrayfvOES __rglgen_glDepthRangeArrayfvOES
-#define glDepthRangeIndexedfOES __rglgen_glDepthRangeIndexedfOES
-#define glGetFloati_vOES __rglgen_glGetFloati_vOES
-#define glDrawArraysInstancedBaseInstanceEXT __rglgen_glDrawArraysInstancedBaseInstanceEXT
-#define glDrawElementsInstancedBaseInstanceEXT __rglgen_glDrawElementsInstancedBaseInstanceEXT
-#define glDrawElementsInstancedBaseVertexBaseInstanceEXT __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT
-#define glBindFragDataLocationIndexedEXT __rglgen_glBindFragDataLocationIndexedEXT
-#define glBindFragDataLocationEXT __rglgen_glBindFragDataLocationEXT
-#define glGetProgramResourceLocationIndexEXT __rglgen_glGetProgramResourceLocationIndexEXT
-#define glGetFragDataIndexEXT __rglgen_glGetFragDataIndexEXT
-#define glBufferStorageEXT __rglgen_glBufferStorageEXT
-#define glClearTexImageEXT __rglgen_glClearTexImageEXT
-#define glClearTexSubImageEXT __rglgen_glClearTexSubImageEXT
-#define glCopyImageSubDataEXT __rglgen_glCopyImageSubDataEXT
-#define glLabelObjectEXT __rglgen_glLabelObjectEXT
-#define glGetObjectLabelEXT __rglgen_glGetObjectLabelEXT
-#define glInsertEventMarkerEXT __rglgen_glInsertEventMarkerEXT
-#define glPushGroupMarkerEXT __rglgen_glPushGroupMarkerEXT
-#define glPopGroupMarkerEXT __rglgen_glPopGroupMarkerEXT
-#define glDiscardFramebufferEXT __rglgen_glDiscardFramebufferEXT
-#define glGenQueriesEXT __rglgen_glGenQueriesEXT
-#define glDeleteQueriesEXT __rglgen_glDeleteQueriesEXT
-#define glIsQueryEXT __rglgen_glIsQueryEXT
-#define glBeginQueryEXT __rglgen_glBeginQueryEXT
-#define glEndQueryEXT __rglgen_glEndQueryEXT
-#define glQueryCounterEXT __rglgen_glQueryCounterEXT
-#define glGetQueryivEXT __rglgen_glGetQueryivEXT
-#define glGetQueryObjectivEXT __rglgen_glGetQueryObjectivEXT
-#define glGetQueryObjectuivEXT __rglgen_glGetQueryObjectuivEXT
-#define glDrawBuffersEXT __rglgen_glDrawBuffersEXT
-#define glEnableiEXT __rglgen_glEnableiEXT
-#define glDisableiEXT __rglgen_glDisableiEXT
-#define glBlendEquationiEXT __rglgen_glBlendEquationiEXT
-#define glBlendEquationSeparateiEXT __rglgen_glBlendEquationSeparateiEXT
-#define glBlendFunciEXT __rglgen_glBlendFunciEXT
-#define glBlendFuncSeparateiEXT __rglgen_glBlendFuncSeparateiEXT
-#define glColorMaskiEXT __rglgen_glColorMaskiEXT
-#define glIsEnablediEXT __rglgen_glIsEnablediEXT
-#define glDrawElementsBaseVertexEXT __rglgen_glDrawElementsBaseVertexEXT
-#define glDrawRangeElementsBaseVertexEXT __rglgen_glDrawRangeElementsBaseVertexEXT
-#define glDrawElementsInstancedBaseVertexEXT __rglgen_glDrawElementsInstancedBaseVertexEXT
-#define glMultiDrawElementsBaseVertexEXT __rglgen_glMultiDrawElementsBaseVertexEXT
-#define glDrawArraysInstancedEXT __rglgen_glDrawArraysInstancedEXT
-#define glDrawElementsInstancedEXT __rglgen_glDrawElementsInstancedEXT
-#define glFramebufferTextureEXT __rglgen_glFramebufferTextureEXT
-#define glVertexAttribDivisorEXT __rglgen_glVertexAttribDivisorEXT
-#define glMapBufferRangeEXT __rglgen_glMapBufferRangeEXT
-#define glFlushMappedBufferRangeEXT __rglgen_glFlushMappedBufferRangeEXT
-#define glMultiDrawArraysEXT __rglgen_glMultiDrawArraysEXT
-#define glMultiDrawElementsEXT __rglgen_glMultiDrawElementsEXT
-#define glMultiDrawArraysIndirectEXT __rglgen_glMultiDrawArraysIndirectEXT
-#define glMultiDrawElementsIndirectEXT __rglgen_glMultiDrawElementsIndirectEXT
-#define glRenderbufferStorageMultisampleEXT __rglgen_glRenderbufferStorageMultisampleEXT
-#define glFramebufferTexture2DMultisampleEXT __rglgen_glFramebufferTexture2DMultisampleEXT
-#define glReadBufferIndexedEXT __rglgen_glReadBufferIndexedEXT
-#define glDrawBuffersIndexedEXT __rglgen_glDrawBuffersIndexedEXT
-#define glGetIntegeri_vEXT __rglgen_glGetIntegeri_vEXT
-#define glPolygonOffsetClampEXT __rglgen_glPolygonOffsetClampEXT
-#define glPrimitiveBoundingBoxEXT __rglgen_glPrimitiveBoundingBoxEXT
-#define glRasterSamplesEXT __rglgen_glRasterSamplesEXT
-#define glGetGraphicsResetStatusEXT __rglgen_glGetGraphicsResetStatusEXT
-#define glReadnPixelsEXT __rglgen_glReadnPixelsEXT
-#define glGetnUniformfvEXT __rglgen_glGetnUniformfvEXT
-#define glGetnUniformivEXT __rglgen_glGetnUniformivEXT
-#define glActiveShaderProgramEXT __rglgen_glActiveShaderProgramEXT
-#define glBindProgramPipelineEXT __rglgen_glBindProgramPipelineEXT
-#define glCreateShaderProgramvEXT __rglgen_glCreateShaderProgramvEXT
-#define glDeleteProgramPipelinesEXT __rglgen_glDeleteProgramPipelinesEXT
-#define glGenProgramPipelinesEXT __rglgen_glGenProgramPipelinesEXT
-#define glGetProgramPipelineInfoLogEXT __rglgen_glGetProgramPipelineInfoLogEXT
-#define glGetProgramPipelineivEXT __rglgen_glGetProgramPipelineivEXT
-#define glIsProgramPipelineEXT __rglgen_glIsProgramPipelineEXT
-#define glProgramParameteriEXT __rglgen_glProgramParameteriEXT
-#define glProgramUniform1fEXT __rglgen_glProgramUniform1fEXT
-#define glProgramUniform1fvEXT __rglgen_glProgramUniform1fvEXT
-#define glProgramUniform1iEXT __rglgen_glProgramUniform1iEXT
-#define glProgramUniform1ivEXT __rglgen_glProgramUniform1ivEXT
-#define glProgramUniform2fEXT __rglgen_glProgramUniform2fEXT
-#define glProgramUniform2fvEXT __rglgen_glProgramUniform2fvEXT
-#define glProgramUniform2iEXT __rglgen_glProgramUniform2iEXT
-#define glProgramUniform2ivEXT __rglgen_glProgramUniform2ivEXT
-#define glProgramUniform3fEXT __rglgen_glProgramUniform3fEXT
-#define glProgramUniform3fvEXT __rglgen_glProgramUniform3fvEXT
-#define glProgramUniform3iEXT __rglgen_glProgramUniform3iEXT
-#define glProgramUniform3ivEXT __rglgen_glProgramUniform3ivEXT
-#define glProgramUniform4fEXT __rglgen_glProgramUniform4fEXT
-#define glProgramUniform4fvEXT __rglgen_glProgramUniform4fvEXT
-#define glProgramUniform4iEXT __rglgen_glProgramUniform4iEXT
-#define glProgramUniform4ivEXT __rglgen_glProgramUniform4ivEXT
-#define glProgramUniformMatrix2fvEXT __rglgen_glProgramUniformMatrix2fvEXT
-#define glProgramUniformMatrix3fvEXT __rglgen_glProgramUniformMatrix3fvEXT
-#define glProgramUniformMatrix4fvEXT __rglgen_glProgramUniformMatrix4fvEXT
-#define glUseProgramStagesEXT __rglgen_glUseProgramStagesEXT
-#define glValidateProgramPipelineEXT __rglgen_glValidateProgramPipelineEXT
-#define glProgramUniform1uiEXT __rglgen_glProgramUniform1uiEXT
-#define glProgramUniform2uiEXT __rglgen_glProgramUniform2uiEXT
-#define glProgramUniform3uiEXT __rglgen_glProgramUniform3uiEXT
-#define glProgramUniform4uiEXT __rglgen_glProgramUniform4uiEXT
-#define glProgramUniform1uivEXT __rglgen_glProgramUniform1uivEXT
-#define glProgramUniform2uivEXT __rglgen_glProgramUniform2uivEXT
-#define glProgramUniform3uivEXT __rglgen_glProgramUniform3uivEXT
-#define glProgramUniform4uivEXT __rglgen_glProgramUniform4uivEXT
-#define glProgramUniformMatrix2x3fvEXT __rglgen_glProgramUniformMatrix2x3fvEXT
-#define glProgramUniformMatrix3x2fvEXT __rglgen_glProgramUniformMatrix3x2fvEXT
-#define glProgramUniformMatrix2x4fvEXT __rglgen_glProgramUniformMatrix2x4fvEXT
-#define glProgramUniformMatrix4x2fvEXT __rglgen_glProgramUniformMatrix4x2fvEXT
-#define glProgramUniformMatrix3x4fvEXT __rglgen_glProgramUniformMatrix3x4fvEXT
-#define glProgramUniformMatrix4x3fvEXT __rglgen_glProgramUniformMatrix4x3fvEXT
-#define glFramebufferPixelLocalStorageSizeEXT __rglgen_glFramebufferPixelLocalStorageSizeEXT
-#define glGetFramebufferPixelLocalStorageSizeEXT __rglgen_glGetFramebufferPixelLocalStorageSizeEXT
-#define glClearPixelLocalStorageuiEXT __rglgen_glClearPixelLocalStorageuiEXT
-#define glTexPageCommitmentEXT __rglgen_glTexPageCommitmentEXT
-#define glPatchParameteriEXT __rglgen_glPatchParameteriEXT
-#define glTexParameterIivEXT __rglgen_glTexParameterIivEXT
-#define glTexParameterIuivEXT __rglgen_glTexParameterIuivEXT
-#define glGetTexParameterIivEXT __rglgen_glGetTexParameterIivEXT
-#define glGetTexParameterIuivEXT __rglgen_glGetTexParameterIuivEXT
-#define glSamplerParameterIivEXT __rglgen_glSamplerParameterIivEXT
-#define glSamplerParameterIuivEXT __rglgen_glSamplerParameterIuivEXT
-#define glGetSamplerParameterIivEXT __rglgen_glGetSamplerParameterIivEXT
-#define glGetSamplerParameterIuivEXT __rglgen_glGetSamplerParameterIuivEXT
-#define glTexBufferEXT __rglgen_glTexBufferEXT
-#define glTexBufferRangeEXT __rglgen_glTexBufferRangeEXT
-#define glTexStorage1DEXT __rglgen_glTexStorage1DEXT
-#define glTexStorage2DEXT __rglgen_glTexStorage2DEXT
-#define glTexStorage3DEXT __rglgen_glTexStorage3DEXT
-#define glTextureStorage1DEXT __rglgen_glTextureStorage1DEXT
-#define glTextureStorage2DEXT __rglgen_glTextureStorage2DEXT
-#define glTextureStorage3DEXT __rglgen_glTextureStorage3DEXT
-#define glTextureViewEXT __rglgen_glTextureViewEXT
-#define glesEXT __rglgen_glesEXT
-#define glFramebufferTextureMultiviewOVR __rglgen_glFramebufferTextureMultiviewOVR
-#define glFramebufferTextureMultisampleMultiviewOVR __rglgen_glFramebufferTextureMultisampleMultiviewOVR
-
-extern RGLSYMGLBLENDBARRIERKHRPROC __rglgen_glBlendBarrierKHR;
-extern RGLSYMGLDEBUGMESSAGECONTROLKHRPROC __rglgen_glDebugMessageControlKHR;
-extern RGLSYMGLDEBUGMESSAGEINSERTKHRPROC __rglgen_glDebugMessageInsertKHR;
-extern RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC __rglgen_glDebugMessageCallbackKHR;
-extern RGLSYMGLGETDEBUGMESSAGELOGKHRPROC __rglgen_glGetDebugMessageLogKHR;
-extern RGLSYMGLPUSHDEBUGGROUPKHRPROC __rglgen_glPushDebugGroupKHR;
-extern RGLSYMGLPOPDEBUGGROUPKHRPROC __rglgen_glPopDebugGroupKHR;
-extern RGLSYMGLOBJECTLABELKHRPROC __rglgen_glObjectLabelKHR;
-extern RGLSYMGLGETOBJECTLABELKHRPROC __rglgen_glGetObjectLabelKHR;
-extern RGLSYMGLOBJECTPTRLABELKHRPROC __rglgen_glObjectPtrLabelKHR;
-extern RGLSYMGLGETOBJECTPTRLABELKHRPROC __rglgen_glGetObjectPtrLabelKHR;
-extern RGLSYMGLGETPOINTERVKHRPROC __rglgen_glGetPointervKHR;
-extern RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC __rglgen_glGetGraphicsResetStatusKHR;
-extern RGLSYMGLREADNPIXELSKHRPROC __rglgen_glReadnPixelsKHR;
-extern RGLSYMGLGETNUNIFORMFVKHRPROC __rglgen_glGetnUniformfvKHR;
-extern RGLSYMGLGETNUNIFORMIVKHRPROC __rglgen_glGetnUniformivKHR;
-extern RGLSYMGLGETNUNIFORMUIVKHRPROC __rglgen_glGetnUniformuivKHR;
-extern RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC __rglgen_glEGLImageTargetTexture2DOES;
-extern RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC __rglgen_glEGLImageTargetRenderbufferStorageOES;
-extern RGLSYMGLCOPYIMAGESUBDATAOESPROC __rglgen_glCopyImageSubDataOES;
-extern RGLSYMGLENABLEIOESPROC __rglgen_glEnableiOES;
-extern RGLSYMGLDISABLEIOESPROC __rglgen_glDisableiOES;
-extern RGLSYMGLBLENDEQUATIONIOESPROC __rglgen_glBlendEquationiOES;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC __rglgen_glBlendEquationSeparateiOES;
-extern RGLSYMGLBLENDFUNCIOESPROC __rglgen_glBlendFunciOES;
-extern RGLSYMGLBLENDFUNCSEPARATEIOESPROC __rglgen_glBlendFuncSeparateiOES;
-extern RGLSYMGLCOLORMASKIOESPROC __rglgen_glColorMaskiOES;
-extern RGLSYMGLISENABLEDIOESPROC __rglgen_glIsEnablediOES;
-extern RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glDrawElementsBaseVertexOES;
-extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC __rglgen_glDrawRangeElementsBaseVertexOES;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC __rglgen_glDrawElementsInstancedBaseVertexOES;
-extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glMultiDrawElementsBaseVertexOES;
-extern RGLSYMGLFRAMEBUFFERTEXTUREOESPROC __rglgen_glFramebufferTextureOES;
-extern RGLSYMGLGETPROGRAMBINARYOESPROC __rglgen_glGetProgramBinaryOES;
-extern RGLSYMGLPROGRAMBINARYOESPROC __rglgen_glProgramBinaryOES;
-extern RGLSYMGLMAPBUFFEROESPROC __rglgen_glMapBufferOES;
-extern RGLSYMGLUNMAPBUFFEROESPROC __rglgen_glUnmapBufferOES;
-extern RGLSYMGLGETBUFFERPOINTERVOESPROC __rglgen_glGetBufferPointervOES;
-extern RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC __rglgen_glPrimitiveBoundingBoxOES;
-extern RGLSYMGLMINSAMPLESHADINGOESPROC __rglgen_glMinSampleShadingOES;
-extern RGLSYMGLPATCHPARAMETERIOESPROC __rglgen_glPatchParameteriOES;
-extern RGLSYMGLTEXIMAGE3DOESPROC __rglgen_glTexImage3DOES;
-extern RGLSYMGLTEXSUBIMAGE3DOESPROC __rglgen_glTexSubImage3DOES;
-extern RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC __rglgen_glCopyTexSubImage3DOES;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC __rglgen_glCompressedTexImage3DOES;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC __rglgen_glCompressedTexSubImage3DOES;
-extern RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC __rglgen_glFramebufferTexture3DOES;
-extern RGLSYMGLTEXPARAMETERIIVOESPROC __rglgen_glTexParameterIivOES;
-extern RGLSYMGLTEXPARAMETERIUIVOESPROC __rglgen_glTexParameterIuivOES;
-extern RGLSYMGLGETTEXPARAMETERIIVOESPROC __rglgen_glGetTexParameterIivOES;
-extern RGLSYMGLGETTEXPARAMETERIUIVOESPROC __rglgen_glGetTexParameterIuivOES;
-extern RGLSYMGLSAMPLERPARAMETERIIVOESPROC __rglgen_glSamplerParameterIivOES;
-extern RGLSYMGLSAMPLERPARAMETERIUIVOESPROC __rglgen_glSamplerParameterIuivOES;
-extern RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC __rglgen_glGetSamplerParameterIivOES;
-extern RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC __rglgen_glGetSamplerParameterIuivOES;
-extern RGLSYMGLTEXBUFFEROESPROC __rglgen_glTexBufferOES;
-extern RGLSYMGLTEXBUFFERRANGEOESPROC __rglgen_glTexBufferRangeOES;
-extern RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC __rglgen_glTexStorage3DMultisampleOES;
-extern RGLSYMGLTEXTUREVIEWOESPROC __rglgen_glTextureViewOES;
-extern RGLSYMGLBINDVERTEXARRAYOESPROC __rglgen_glBindVertexArrayOES;
-extern RGLSYMGLDELETEVERTEXARRAYSOESPROC __rglgen_glDeleteVertexArraysOES;
-extern RGLSYMGLGENVERTEXARRAYSOESPROC __rglgen_glGenVertexArraysOES;
-extern RGLSYMGLISVERTEXARRAYOESPROC __rglgen_glIsVertexArrayOES;
-extern RGLSYMGLVIEWPORTARRAYVOESPROC __rglgen_glViewportArrayvOES;
-extern RGLSYMGLVIEWPORTINDEXEDFOESPROC __rglgen_glViewportIndexedfOES;
-extern RGLSYMGLVIEWPORTINDEXEDFVOESPROC __rglgen_glViewportIndexedfvOES;
-extern RGLSYMGLSCISSORARRAYVOESPROC __rglgen_glScissorArrayvOES;
-extern RGLSYMGLSCISSORINDEXEDOESPROC __rglgen_glScissorIndexedOES;
-extern RGLSYMGLSCISSORINDEXEDVOESPROC __rglgen_glScissorIndexedvOES;
-extern RGLSYMGLDEPTHRANGEARRAYFVOESPROC __rglgen_glDepthRangeArrayfvOES;
-extern RGLSYMGLDEPTHRANGEINDEXEDFOESPROC __rglgen_glDepthRangeIndexedfOES;
-extern RGLSYMGLGETFLOATI_VOESPROC __rglgen_glGetFloati_vOES;
-extern RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawArraysInstancedBaseInstanceEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseInstanceEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT;
-extern RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __rglgen_glBindFragDataLocationIndexedEXT;
-extern RGLSYMGLBINDFRAGDATALOCATIONEXTPROC __rglgen_glBindFragDataLocationEXT;
-extern RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __rglgen_glGetProgramResourceLocationIndexEXT;
-extern RGLSYMGLGETFRAGDATAINDEXEXTPROC __rglgen_glGetFragDataIndexEXT;
-extern RGLSYMGLBUFFERSTORAGEEXTPROC __rglgen_glBufferStorageEXT;
-extern RGLSYMGLCLEARTEXIMAGEEXTPROC __rglgen_glClearTexImageEXT;
-extern RGLSYMGLCLEARTEXSUBIMAGEEXTPROC __rglgen_glClearTexSubImageEXT;
-extern RGLSYMGLCOPYIMAGESUBDATAEXTPROC __rglgen_glCopyImageSubDataEXT;
-extern RGLSYMGLLABELOBJECTEXTPROC __rglgen_glLabelObjectEXT;
-extern RGLSYMGLGETOBJECTLABELEXTPROC __rglgen_glGetObjectLabelEXT;
-extern RGLSYMGLINSERTEVENTMARKEREXTPROC __rglgen_glInsertEventMarkerEXT;
-extern RGLSYMGLPUSHGROUPMARKEREXTPROC __rglgen_glPushGroupMarkerEXT;
-extern RGLSYMGLPOPGROUPMARKEREXTPROC __rglgen_glPopGroupMarkerEXT;
-extern RGLSYMGLDISCARDFRAMEBUFFEREXTPROC __rglgen_glDiscardFramebufferEXT;
-extern RGLSYMGLGENQUERIESEXTPROC __rglgen_glGenQueriesEXT;
-extern RGLSYMGLDELETEQUERIESEXTPROC __rglgen_glDeleteQueriesEXT;
-extern RGLSYMGLISQUERYEXTPROC __rglgen_glIsQueryEXT;
-extern RGLSYMGLBEGINQUERYEXTPROC __rglgen_glBeginQueryEXT;
-extern RGLSYMGLENDQUERYEXTPROC __rglgen_glEndQueryEXT;
-extern RGLSYMGLQUERYCOUNTEREXTPROC __rglgen_glQueryCounterEXT;
-extern RGLSYMGLGETQUERYIVEXTPROC __rglgen_glGetQueryivEXT;
-extern RGLSYMGLGETQUERYOBJECTIVEXTPROC __rglgen_glGetQueryObjectivEXT;
-extern RGLSYMGLGETQUERYOBJECTUIVEXTPROC __rglgen_glGetQueryObjectuivEXT;
-extern RGLSYMGLDRAWBUFFERSEXTPROC __rglgen_glDrawBuffersEXT;
-extern RGLSYMGLENABLEIEXTPROC __rglgen_glEnableiEXT;
-extern RGLSYMGLDISABLEIEXTPROC __rglgen_glDisableiEXT;
-extern RGLSYMGLBLENDEQUATIONIEXTPROC __rglgen_glBlendEquationiEXT;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC __rglgen_glBlendEquationSeparateiEXT;
-extern RGLSYMGLBLENDFUNCIEXTPROC __rglgen_glBlendFunciEXT;
-extern RGLSYMGLBLENDFUNCSEPARATEIEXTPROC __rglgen_glBlendFuncSeparateiEXT;
-extern RGLSYMGLCOLORMASKIEXTPROC __rglgen_glColorMaskiEXT;
-extern RGLSYMGLISENABLEDIEXTPROC __rglgen_glIsEnablediEXT;
-extern RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawElementsBaseVertexEXT;
-extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawRangeElementsBaseVertexEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __rglgen_glDrawElementsInstancedBaseVertexEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glMultiDrawElementsBaseVertexEXT;
-extern RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC __rglgen_glDrawArraysInstancedEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC __rglgen_glDrawElementsInstancedEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC __rglgen_glFramebufferTextureEXT;
-extern RGLSYMGLVERTEXATTRIBDIVISOREXTPROC __rglgen_glVertexAttribDivisorEXT;
-extern RGLSYMGLMAPBUFFERRANGEEXTPROC __rglgen_glMapBufferRangeEXT;
-extern RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC __rglgen_glFlushMappedBufferRangeEXT;
-extern RGLSYMGLMULTIDRAWARRAYSEXTPROC __rglgen_glMultiDrawArraysEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSEXTPROC __rglgen_glMultiDrawElementsEXT;
-extern RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC __rglgen_glMultiDrawArraysIndirectEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC __rglgen_glMultiDrawElementsIndirectEXT;
-extern RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __rglgen_glRenderbufferStorageMultisampleEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __rglgen_glFramebufferTexture2DMultisampleEXT;
-extern RGLSYMGLREADBUFFERINDEXEDEXTPROC __rglgen_glReadBufferIndexedEXT;
-extern RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC __rglgen_glDrawBuffersIndexedEXT;
-extern RGLSYMGLGETINTEGERI_VEXTPROC __rglgen_glGetIntegeri_vEXT;
-extern RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC __rglgen_glPolygonOffsetClampEXT;
-extern RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC __rglgen_glPrimitiveBoundingBoxEXT;
-extern RGLSYMGLRASTERSAMPLESEXTPROC __rglgen_glRasterSamplesEXT;
-extern RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC __rglgen_glGetGraphicsResetStatusEXT;
-extern RGLSYMGLREADNPIXELSEXTPROC __rglgen_glReadnPixelsEXT;
-extern RGLSYMGLGETNUNIFORMFVEXTPROC __rglgen_glGetnUniformfvEXT;
-extern RGLSYMGLGETNUNIFORMIVEXTPROC __rglgen_glGetnUniformivEXT;
-extern RGLSYMGLACTIVESHADERPROGRAMEXTPROC __rglgen_glActiveShaderProgramEXT;
-extern RGLSYMGLBINDPROGRAMPIPELINEEXTPROC __rglgen_glBindProgramPipelineEXT;
-extern RGLSYMGLCREATESHADERPROGRAMVEXTPROC __rglgen_glCreateShaderProgramvEXT;
-extern RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC __rglgen_glDeleteProgramPipelinesEXT;
-extern RGLSYMGLGENPROGRAMPIPELINESEXTPROC __rglgen_glGenProgramPipelinesEXT;
-extern RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC __rglgen_glGetProgramPipelineInfoLogEXT;
-extern RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC __rglgen_glGetProgramPipelineivEXT;
-extern RGLSYMGLISPROGRAMPIPELINEEXTPROC __rglgen_glIsProgramPipelineEXT;
-extern RGLSYMGLPROGRAMPARAMETERIEXTPROC __rglgen_glProgramParameteriEXT;
-extern RGLSYMGLPROGRAMUNIFORM1FEXTPROC __rglgen_glProgramUniform1fEXT;
-extern RGLSYMGLPROGRAMUNIFORM1FVEXTPROC __rglgen_glProgramUniform1fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM1IEXTPROC __rglgen_glProgramUniform1iEXT;
-extern RGLSYMGLPROGRAMUNIFORM1IVEXTPROC __rglgen_glProgramUniform1ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM2FEXTPROC __rglgen_glProgramUniform2fEXT;
-extern RGLSYMGLPROGRAMUNIFORM2FVEXTPROC __rglgen_glProgramUniform2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM2IEXTPROC __rglgen_glProgramUniform2iEXT;
-extern RGLSYMGLPROGRAMUNIFORM2IVEXTPROC __rglgen_glProgramUniform2ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM3FEXTPROC __rglgen_glProgramUniform3fEXT;
-extern RGLSYMGLPROGRAMUNIFORM3FVEXTPROC __rglgen_glProgramUniform3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM3IEXTPROC __rglgen_glProgramUniform3iEXT;
-extern RGLSYMGLPROGRAMUNIFORM3IVEXTPROC __rglgen_glProgramUniform3ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM4FEXTPROC __rglgen_glProgramUniform4fEXT;
-extern RGLSYMGLPROGRAMUNIFORM4FVEXTPROC __rglgen_glProgramUniform4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM4IEXTPROC __rglgen_glProgramUniform4iEXT;
-extern RGLSYMGLPROGRAMUNIFORM4IVEXTPROC __rglgen_glProgramUniform4ivEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC __rglgen_glProgramUniformMatrix2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC __rglgen_glProgramUniformMatrix3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC __rglgen_glProgramUniformMatrix4fvEXT;
-extern RGLSYMGLUSEPROGRAMSTAGESEXTPROC __rglgen_glUseProgramStagesEXT;
-extern RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC __rglgen_glValidateProgramPipelineEXT;
-extern RGLSYMGLPROGRAMUNIFORM1UIEXTPROC __rglgen_glProgramUniform1uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM2UIEXTPROC __rglgen_glProgramUniform2uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM3UIEXTPROC __rglgen_glProgramUniform3uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM4UIEXTPROC __rglgen_glProgramUniform4uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC __rglgen_glProgramUniform1uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC __rglgen_glProgramUniform2uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC __rglgen_glProgramUniform3uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC __rglgen_glProgramUniform4uivEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __rglgen_glProgramUniformMatrix2x3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __rglgen_glProgramUniformMatrix3x2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __rglgen_glProgramUniformMatrix2x4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __rglgen_glProgramUniformMatrix4x2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __rglgen_glProgramUniformMatrix3x4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __rglgen_glProgramUniformMatrix4x3fvEXT;
-extern RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glFramebufferPixelLocalStorageSizeEXT;
-extern RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glGetFramebufferPixelLocalStorageSizeEXT;
-extern RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC __rglgen_glClearPixelLocalStorageuiEXT;
-extern RGLSYMGLTEXPAGECOMMITMENTEXTPROC __rglgen_glTexPageCommitmentEXT;
-extern RGLSYMGLPATCHPARAMETERIEXTPROC __rglgen_glPatchParameteriEXT;
-extern RGLSYMGLTEXPARAMETERIIVEXTPROC __rglgen_glTexParameterIivEXT;
-extern RGLSYMGLTEXPARAMETERIUIVEXTPROC __rglgen_glTexParameterIuivEXT;
-extern RGLSYMGLGETTEXPARAMETERIIVEXTPROC __rglgen_glGetTexParameterIivEXT;
-extern RGLSYMGLGETTEXPARAMETERIUIVEXTPROC __rglgen_glGetTexParameterIuivEXT;
-extern RGLSYMGLSAMPLERPARAMETERIIVEXTPROC __rglgen_glSamplerParameterIivEXT;
-extern RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC __rglgen_glSamplerParameterIuivEXT;
-extern RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC __rglgen_glGetSamplerParameterIivEXT;
-extern RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC __rglgen_glGetSamplerParameterIuivEXT;
-extern RGLSYMGLTEXBUFFEREXTPROC __rglgen_glTexBufferEXT;
-extern RGLSYMGLTEXBUFFERRANGEEXTPROC __rglgen_glTexBufferRangeEXT;
-extern RGLSYMGLTEXSTORAGE1DEXTPROC __rglgen_glTexStorage1DEXT;
-extern RGLSYMGLTEXSTORAGE2DEXTPROC __rglgen_glTexStorage2DEXT;
-extern RGLSYMGLTEXSTORAGE3DEXTPROC __rglgen_glTexStorage3DEXT;
-extern RGLSYMGLTEXTURESTORAGE1DEXTPROC __rglgen_glTextureStorage1DEXT;
-extern RGLSYMGLTEXTURESTORAGE2DEXTPROC __rglgen_glTextureStorage2DEXT;
-extern RGLSYMGLTEXTURESTORAGE3DEXTPROC __rglgen_glTextureStorage3DEXT;
-extern RGLSYMGLTEXTUREVIEWEXTPROC __rglgen_glTextureViewEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultiviewOVR;
-extern RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultisampleMultiviewOVR;
-
-struct rglgen_sym_map { const char *sym; void *ptr; };
-extern const struct rglgen_sym_map rglgen_symbol_map[];
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libretro-common/include/glsym/glsym_es3.h b/libretro-common/include/glsym/glsym_es3.h
deleted file mode 100644
index 9ffd150..0000000
--- a/libretro-common/include/glsym/glsym_es3.h
+++ /dev/null
@@ -1,650 +0,0 @@
-#ifndef RGLGEN_DECL_H__
-#define RGLGEN_DECL_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef GL_APIENTRY
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROCKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#else
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-typedef void (APIENTRY *RGLGENGLDEBUGPROCARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#endif
-#ifndef GL_OES_EGL_image
-typedef void *GLeglImageOES;
-#endif
-#if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2)
-typedef GLint GLfixed;
-#endif
-#if defined(OSX) && !defined(MAC_OS_X_VERSION_10_7)
-typedef long long int GLint64;
-typedef unsigned long long int GLuint64;
-typedef unsigned long long int GLuint64EXT;
-typedef struct __GLsync *GLsync;
-#endif
-typedef void (GL_APIENTRYP RGLSYMGLBLENDBARRIERKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC) (RGLGENGLDEBUGPROCKHR callback, const void *userParam);
-typedef GLuint (GL_APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGKHRPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (GL_APIENTRYP RGLSYMGLPUSHDEBUGGROUPKHRPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (GL_APIENTRYP RGLSYMGLPOPDEBUGGROUPKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETPOINTERVKHRPROC) (GLenum pname, void **params);
-typedef GLenum (GL_APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLREADNPIXELSKHRPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMFVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMUIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYIMAGESUBDATAOESPROC) (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 srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (GL_APIENTRYP RGLSYMGLENABLEIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDISABLEIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONIOESPROC) (GLuint buf, GLenum mode);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCIOESPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIOESPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLCOLORMASKIOESPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISENABLEDIOESPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREOESPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLint length);
-typedef void *(GL_APIENTRYP RGLSYMGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLUNMAPBUFFEROESPROC) (GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, void **params);
-typedef void (GL_APIENTRYP RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-typedef void (GL_APIENTRYP RGLSYMGLMINSAMPLESHADINGOESPROC) (GLfloat value);
-typedef void (GL_APIENTRYP RGLSYMGLPATCHPARAMETERIOESPROC) (GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIIVOESPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIUIVOESPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIIVOESPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIUIVOESPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIIVOESPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIUIVOESPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC) (GLuint sampler, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFEROESPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFERRANGEOESPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTUREVIEWOESPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-typedef void (GL_APIENTRYP RGLSYMGLBINDVERTEXARRAYOESPROC) (GLuint array);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
-typedef void (GL_APIENTRYP RGLSYMGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISVERTEXARRAYOESPROC) (GLuint array);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTARRAYVOESPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTINDEXEDFOESPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-typedef void (GL_APIENTRYP RGLSYMGLVIEWPORTINDEXEDFVOESPROC) (GLuint index, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORARRAYVOESPROC) (GLuint first, GLsizei count, const GLint *v);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORINDEXEDOESPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLSCISSORINDEXEDVOESPROC) (GLuint index, const GLint *v);
-typedef void (GL_APIENTRYP RGLSYMGLDEPTHRANGEARRAYFVOESPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (GL_APIENTRYP RGLSYMGLDEPTHRANGEINDEXEDFOESPROC) (GLuint index, GLfloat n, GLfloat f);
-typedef void (GL_APIENTRYP RGLSYMGLGETFLOATI_VOESPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
-typedef void (GL_APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef void (GL_APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (GL_APIENTRYP RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC) (GLuint program, GLenum programInterface, const GLchar *name);
-typedef GLint (GL_APIENTRYP RGLSYMGLGETFRAGDATAINDEXEXTPROC) (GLuint program, const GLchar *name);
-typedef void (GL_APIENTRYP RGLSYMGLBUFFERSTORAGEEXTPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARTEXIMAGEEXTPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARTEXSUBIMAGEEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-typedef void (GL_APIENTRYP RGLSYMGLCOPYIMAGESUBDATAEXTPROC) (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 srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (GL_APIENTRYP RGLSYMGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (GL_APIENTRYP RGLSYMGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP RGLSYMGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
-typedef void (GL_APIENTRYP RGLSYMGLPOPGROUPMARKEREXTPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
-typedef void (GL_APIENTRYP RGLSYMGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISQUERYEXTPROC) (GLuint id);
-typedef void (GL_APIENTRYP RGLSYMGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
-typedef void (GL_APIENTRYP RGLSYMGLENDQUERYEXTPROC) (GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTIVEXTPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum *bufs);
-typedef void (GL_APIENTRYP RGLSYMGLENABLEIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDISABLEIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (GL_APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (GL_APIENTRYP RGLSYMGLCOLORMASKIEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISENABLEDIEXTPROC) (GLenum target, GLuint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (GL_APIENTRYP RGLSYMGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor);
-typedef void *(GL_APIENTRYP RGLSYMGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (GL_APIENTRYP RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (GL_APIENTRYP RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (GL_APIENTRYP RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
-typedef void (GL_APIENTRYP RGLSYMGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
-typedef void (GL_APIENTRYP RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices);
-typedef void (GL_APIENTRYP RGLSYMGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (GL_APIENTRYP RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp);
-typedef void (GL_APIENTRYP RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);
-typedef void (GL_APIENTRYP RGLSYMGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations);
-typedef GLenum (GL_APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
-typedef void (GL_APIENTRYP RGLSYMGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program);
-typedef void (GL_APIENTRYP RGLSYMGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef GLuint (GL_APIENTRYP RGLSYMGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings);
-typedef void (GL_APIENTRYP RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines);
-typedef void (GL_APIENTRYP RGLSYMGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (GL_APIENTRYP RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params);
-typedef GLboolean (GL_APIENTRYP RGLSYMGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (GL_APIENTRYP RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target, GLsizei size);
-typedef GLsizei (GL_APIENTRYP RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC) (GLuint target);
-typedef void (GL_APIENTRYP RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC) (GLsizei offset, GLsizei n, const GLuint *values);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPAGECOMMITMENTEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit);
-typedef void (GL_APIENTRYP RGLSYMGLPATCHPARAMETERIEXTPROC) (GLenum pname, GLint value);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (GL_APIENTRYP RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (GL_APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, GLuint *params);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (GL_APIENTRYP RGLSYMGLTEXBUFFERRANGEEXTPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (GL_APIENTRYP RGLSYMGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-typedef void (GL_APIENTRYP RGLSYMGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint *box);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
-typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLsizei samples, GLint baseViewIndex, GLsizei numViews);
-
-#define glBlendBarrierKHR __rglgen_glBlendBarrierKHR
-#define glDebugMessageControlKHR __rglgen_glDebugMessageControlKHR
-#define glDebugMessageInsertKHR __rglgen_glDebugMessageInsertKHR
-#define glDebugMessageCallbackKHR __rglgen_glDebugMessageCallbackKHR
-#define glGetDebugMessageLogKHR __rglgen_glGetDebugMessageLogKHR
-#define glPushDebugGroupKHR __rglgen_glPushDebugGroupKHR
-#define glPopDebugGroupKHR __rglgen_glPopDebugGroupKHR
-#define glObjectLabelKHR __rglgen_glObjectLabelKHR
-#define glGetObjectLabelKHR __rglgen_glGetObjectLabelKHR
-#define glObjectPtrLabelKHR __rglgen_glObjectPtrLabelKHR
-#define glGetObjectPtrLabelKHR __rglgen_glGetObjectPtrLabelKHR
-#define glGetPointervKHR __rglgen_glGetPointervKHR
-#define glGetGraphicsResetStatusKHR __rglgen_glGetGraphicsResetStatusKHR
-#define glReadnPixelsKHR __rglgen_glReadnPixelsKHR
-#define glGetnUniformfvKHR __rglgen_glGetnUniformfvKHR
-#define glGetnUniformivKHR __rglgen_glGetnUniformivKHR
-#define glGetnUniformuivKHR __rglgen_glGetnUniformuivKHR
-#define glEGLImageTargetTexture2DOES __rglgen_glEGLImageTargetTexture2DOES
-#define glEGLImageTargetRenderbufferStorageOES __rglgen_glEGLImageTargetRenderbufferStorageOES
-#define glCopyImageSubDataOES __rglgen_glCopyImageSubDataOES
-#define glEnableiOES __rglgen_glEnableiOES
-#define glDisableiOES __rglgen_glDisableiOES
-#define glBlendEquationiOES __rglgen_glBlendEquationiOES
-#define glBlendEquationSeparateiOES __rglgen_glBlendEquationSeparateiOES
-#define glBlendFunciOES __rglgen_glBlendFunciOES
-#define glBlendFuncSeparateiOES __rglgen_glBlendFuncSeparateiOES
-#define glColorMaskiOES __rglgen_glColorMaskiOES
-#define glIsEnablediOES __rglgen_glIsEnablediOES
-#define glDrawElementsBaseVertexOES __rglgen_glDrawElementsBaseVertexOES
-#define glDrawRangeElementsBaseVertexOES __rglgen_glDrawRangeElementsBaseVertexOES
-#define glDrawElementsInstancedBaseVertexOES __rglgen_glDrawElementsInstancedBaseVertexOES
-#define glMultiDrawElementsBaseVertexOES __rglgen_glMultiDrawElementsBaseVertexOES
-#define glFramebufferTextureOES __rglgen_glFramebufferTextureOES
-#define glGetProgramBinaryOES __rglgen_glGetProgramBinaryOES
-#define glProgramBinaryOES __rglgen_glProgramBinaryOES
-#define glMapBufferOES __rglgen_glMapBufferOES
-#define glUnmapBufferOES __rglgen_glUnmapBufferOES
-#define glGetBufferPointervOES __rglgen_glGetBufferPointervOES
-#define glPrimitiveBoundingBoxOES __rglgen_glPrimitiveBoundingBoxOES
-#define glMinSampleShadingOES __rglgen_glMinSampleShadingOES
-#define glPatchParameteriOES __rglgen_glPatchParameteriOES
-#define glTexImage3DOES __rglgen_glTexImage3DOES
-#define glTexSubImage3DOES __rglgen_glTexSubImage3DOES
-#define glCopyTexSubImage3DOES __rglgen_glCopyTexSubImage3DOES
-#define glCompressedTexImage3DOES __rglgen_glCompressedTexImage3DOES
-#define glCompressedTexSubImage3DOES __rglgen_glCompressedTexSubImage3DOES
-#define glFramebufferTexture3DOES __rglgen_glFramebufferTexture3DOES
-#define glTexParameterIivOES __rglgen_glTexParameterIivOES
-#define glTexParameterIuivOES __rglgen_glTexParameterIuivOES
-#define glGetTexParameterIivOES __rglgen_glGetTexParameterIivOES
-#define glGetTexParameterIuivOES __rglgen_glGetTexParameterIuivOES
-#define glSamplerParameterIivOES __rglgen_glSamplerParameterIivOES
-#define glSamplerParameterIuivOES __rglgen_glSamplerParameterIuivOES
-#define glGetSamplerParameterIivOES __rglgen_glGetSamplerParameterIivOES
-#define glGetSamplerParameterIuivOES __rglgen_glGetSamplerParameterIuivOES
-#define glTexBufferOES __rglgen_glTexBufferOES
-#define glTexBufferRangeOES __rglgen_glTexBufferRangeOES
-#define glTexStorage3DMultisampleOES __rglgen_glTexStorage3DMultisampleOES
-#define glTextureViewOES __rglgen_glTextureViewOES
-#define glBindVertexArrayOES __rglgen_glBindVertexArrayOES
-#define glDeleteVertexArraysOES __rglgen_glDeleteVertexArraysOES
-#define glGenVertexArraysOES __rglgen_glGenVertexArraysOES
-#define glIsVertexArrayOES __rglgen_glIsVertexArrayOES
-#define glViewportArrayvOES __rglgen_glViewportArrayvOES
-#define glViewportIndexedfOES __rglgen_glViewportIndexedfOES
-#define glViewportIndexedfvOES __rglgen_glViewportIndexedfvOES
-#define glScissorArrayvOES __rglgen_glScissorArrayvOES
-#define glScissorIndexedOES __rglgen_glScissorIndexedOES
-#define glScissorIndexedvOES __rglgen_glScissorIndexedvOES
-#define glDepthRangeArrayfvOES __rglgen_glDepthRangeArrayfvOES
-#define glDepthRangeIndexedfOES __rglgen_glDepthRangeIndexedfOES
-#define glGetFloati_vOES __rglgen_glGetFloati_vOES
-#define glDrawArraysInstancedBaseInstanceEXT __rglgen_glDrawArraysInstancedBaseInstanceEXT
-#define glDrawElementsInstancedBaseInstanceEXT __rglgen_glDrawElementsInstancedBaseInstanceEXT
-#define glDrawElementsInstancedBaseVertexBaseInstanceEXT __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT
-#define glBindFragDataLocationIndexedEXT __rglgen_glBindFragDataLocationIndexedEXT
-#define glBindFragDataLocationEXT __rglgen_glBindFragDataLocationEXT
-#define glGetProgramResourceLocationIndexEXT __rglgen_glGetProgramResourceLocationIndexEXT
-#define glGetFragDataIndexEXT __rglgen_glGetFragDataIndexEXT
-#define glBufferStorageEXT __rglgen_glBufferStorageEXT
-#define glClearTexImageEXT __rglgen_glClearTexImageEXT
-#define glClearTexSubImageEXT __rglgen_glClearTexSubImageEXT
-#define glCopyImageSubDataEXT __rglgen_glCopyImageSubDataEXT
-#define glLabelObjectEXT __rglgen_glLabelObjectEXT
-#define glGetObjectLabelEXT __rglgen_glGetObjectLabelEXT
-#define glInsertEventMarkerEXT __rglgen_glInsertEventMarkerEXT
-#define glPushGroupMarkerEXT __rglgen_glPushGroupMarkerEXT
-#define glPopGroupMarkerEXT __rglgen_glPopGroupMarkerEXT
-#define glDiscardFramebufferEXT __rglgen_glDiscardFramebufferEXT
-#define glGenQueriesEXT __rglgen_glGenQueriesEXT
-#define glDeleteQueriesEXT __rglgen_glDeleteQueriesEXT
-#define glIsQueryEXT __rglgen_glIsQueryEXT
-#define glBeginQueryEXT __rglgen_glBeginQueryEXT
-#define glEndQueryEXT __rglgen_glEndQueryEXT
-#define glQueryCounterEXT __rglgen_glQueryCounterEXT
-#define glGetQueryivEXT __rglgen_glGetQueryivEXT
-#define glGetQueryObjectivEXT __rglgen_glGetQueryObjectivEXT
-#define glGetQueryObjectuivEXT __rglgen_glGetQueryObjectuivEXT
-#define glGetQueryObjecti64vEXT __rglgen_glGetQueryObjecti64vEXT
-#define glGetQueryObjectui64vEXT __rglgen_glGetQueryObjectui64vEXT
-#define glDrawBuffersEXT __rglgen_glDrawBuffersEXT
-#define glEnableiEXT __rglgen_glEnableiEXT
-#define glDisableiEXT __rglgen_glDisableiEXT
-#define glBlendEquationiEXT __rglgen_glBlendEquationiEXT
-#define glBlendEquationSeparateiEXT __rglgen_glBlendEquationSeparateiEXT
-#define glBlendFunciEXT __rglgen_glBlendFunciEXT
-#define glBlendFuncSeparateiEXT __rglgen_glBlendFuncSeparateiEXT
-#define glColorMaskiEXT __rglgen_glColorMaskiEXT
-#define glIsEnablediEXT __rglgen_glIsEnablediEXT
-#define glDrawElementsBaseVertexEXT __rglgen_glDrawElementsBaseVertexEXT
-#define glDrawRangeElementsBaseVertexEXT __rglgen_glDrawRangeElementsBaseVertexEXT
-#define glDrawElementsInstancedBaseVertexEXT __rglgen_glDrawElementsInstancedBaseVertexEXT
-#define glMultiDrawElementsBaseVertexEXT __rglgen_glMultiDrawElementsBaseVertexEXT
-#define glDrawArraysInstancedEXT __rglgen_glDrawArraysInstancedEXT
-#define glDrawElementsInstancedEXT __rglgen_glDrawElementsInstancedEXT
-#define glFramebufferTextureEXT __rglgen_glFramebufferTextureEXT
-#define glVertexAttribDivisorEXT __rglgen_glVertexAttribDivisorEXT
-#define glMapBufferRangeEXT __rglgen_glMapBufferRangeEXT
-#define glFlushMappedBufferRangeEXT __rglgen_glFlushMappedBufferRangeEXT
-#define glMultiDrawArraysEXT __rglgen_glMultiDrawArraysEXT
-#define glMultiDrawElementsEXT __rglgen_glMultiDrawElementsEXT
-#define glMultiDrawArraysIndirectEXT __rglgen_glMultiDrawArraysIndirectEXT
-#define glMultiDrawElementsIndirectEXT __rglgen_glMultiDrawElementsIndirectEXT
-#define glRenderbufferStorageMultisampleEXT __rglgen_glRenderbufferStorageMultisampleEXT
-#define glFramebufferTexture2DMultisampleEXT __rglgen_glFramebufferTexture2DMultisampleEXT
-#define glReadBufferIndexedEXT __rglgen_glReadBufferIndexedEXT
-#define glDrawBuffersIndexedEXT __rglgen_glDrawBuffersIndexedEXT
-#define glGetIntegeri_vEXT __rglgen_glGetIntegeri_vEXT
-#define glPolygonOffsetClampEXT __rglgen_glPolygonOffsetClampEXT
-#define glPrimitiveBoundingBoxEXT __rglgen_glPrimitiveBoundingBoxEXT
-#define glRasterSamplesEXT __rglgen_glRasterSamplesEXT
-#define glGetGraphicsResetStatusEXT __rglgen_glGetGraphicsResetStatusEXT
-#define glReadnPixelsEXT __rglgen_glReadnPixelsEXT
-#define glGetnUniformfvEXT __rglgen_glGetnUniformfvEXT
-#define glGetnUniformivEXT __rglgen_glGetnUniformivEXT
-#define glActiveShaderProgramEXT __rglgen_glActiveShaderProgramEXT
-#define glBindProgramPipelineEXT __rglgen_glBindProgramPipelineEXT
-#define glCreateShaderProgramvEXT __rglgen_glCreateShaderProgramvEXT
-#define glDeleteProgramPipelinesEXT __rglgen_glDeleteProgramPipelinesEXT
-#define glGenProgramPipelinesEXT __rglgen_glGenProgramPipelinesEXT
-#define glGetProgramPipelineInfoLogEXT __rglgen_glGetProgramPipelineInfoLogEXT
-#define glGetProgramPipelineivEXT __rglgen_glGetProgramPipelineivEXT
-#define glIsProgramPipelineEXT __rglgen_glIsProgramPipelineEXT
-#define glProgramParameteriEXT __rglgen_glProgramParameteriEXT
-#define glProgramUniform1fEXT __rglgen_glProgramUniform1fEXT
-#define glProgramUniform1fvEXT __rglgen_glProgramUniform1fvEXT
-#define glProgramUniform1iEXT __rglgen_glProgramUniform1iEXT
-#define glProgramUniform1ivEXT __rglgen_glProgramUniform1ivEXT
-#define glProgramUniform2fEXT __rglgen_glProgramUniform2fEXT
-#define glProgramUniform2fvEXT __rglgen_glProgramUniform2fvEXT
-#define glProgramUniform2iEXT __rglgen_glProgramUniform2iEXT
-#define glProgramUniform2ivEXT __rglgen_glProgramUniform2ivEXT
-#define glProgramUniform3fEXT __rglgen_glProgramUniform3fEXT
-#define glProgramUniform3fvEXT __rglgen_glProgramUniform3fvEXT
-#define glProgramUniform3iEXT __rglgen_glProgramUniform3iEXT
-#define glProgramUniform3ivEXT __rglgen_glProgramUniform3ivEXT
-#define glProgramUniform4fEXT __rglgen_glProgramUniform4fEXT
-#define glProgramUniform4fvEXT __rglgen_glProgramUniform4fvEXT
-#define glProgramUniform4iEXT __rglgen_glProgramUniform4iEXT
-#define glProgramUniform4ivEXT __rglgen_glProgramUniform4ivEXT
-#define glProgramUniformMatrix2fvEXT __rglgen_glProgramUniformMatrix2fvEXT
-#define glProgramUniformMatrix3fvEXT __rglgen_glProgramUniformMatrix3fvEXT
-#define glProgramUniformMatrix4fvEXT __rglgen_glProgramUniformMatrix4fvEXT
-#define glUseProgramStagesEXT __rglgen_glUseProgramStagesEXT
-#define glValidateProgramPipelineEXT __rglgen_glValidateProgramPipelineEXT
-#define glProgramUniform1uiEXT __rglgen_glProgramUniform1uiEXT
-#define glProgramUniform2uiEXT __rglgen_glProgramUniform2uiEXT
-#define glProgramUniform3uiEXT __rglgen_glProgramUniform3uiEXT
-#define glProgramUniform4uiEXT __rglgen_glProgramUniform4uiEXT
-#define glProgramUniform1uivEXT __rglgen_glProgramUniform1uivEXT
-#define glProgramUniform2uivEXT __rglgen_glProgramUniform2uivEXT
-#define glProgramUniform3uivEXT __rglgen_glProgramUniform3uivEXT
-#define glProgramUniform4uivEXT __rglgen_glProgramUniform4uivEXT
-#define glProgramUniformMatrix2x3fvEXT __rglgen_glProgramUniformMatrix2x3fvEXT
-#define glProgramUniformMatrix3x2fvEXT __rglgen_glProgramUniformMatrix3x2fvEXT
-#define glProgramUniformMatrix2x4fvEXT __rglgen_glProgramUniformMatrix2x4fvEXT
-#define glProgramUniformMatrix4x2fvEXT __rglgen_glProgramUniformMatrix4x2fvEXT
-#define glProgramUniformMatrix3x4fvEXT __rglgen_glProgramUniformMatrix3x4fvEXT
-#define glProgramUniformMatrix4x3fvEXT __rglgen_glProgramUniformMatrix4x3fvEXT
-#define glFramebufferPixelLocalStorageSizeEXT __rglgen_glFramebufferPixelLocalStorageSizeEXT
-#define glGetFramebufferPixelLocalStorageSizeEXT __rglgen_glGetFramebufferPixelLocalStorageSizeEXT
-#define glClearPixelLocalStorageuiEXT __rglgen_glClearPixelLocalStorageuiEXT
-#define glTexPageCommitmentEXT __rglgen_glTexPageCommitmentEXT
-#define glPatchParameteriEXT __rglgen_glPatchParameteriEXT
-#define glTexParameterIivEXT __rglgen_glTexParameterIivEXT
-#define glTexParameterIuivEXT __rglgen_glTexParameterIuivEXT
-#define glGetTexParameterIivEXT __rglgen_glGetTexParameterIivEXT
-#define glGetTexParameterIuivEXT __rglgen_glGetTexParameterIuivEXT
-#define glSamplerParameterIivEXT __rglgen_glSamplerParameterIivEXT
-#define glSamplerParameterIuivEXT __rglgen_glSamplerParameterIuivEXT
-#define glGetSamplerParameterIivEXT __rglgen_glGetSamplerParameterIivEXT
-#define glGetSamplerParameterIuivEXT __rglgen_glGetSamplerParameterIuivEXT
-#define glTexBufferEXT __rglgen_glTexBufferEXT
-#define glTexBufferRangeEXT __rglgen_glTexBufferRangeEXT
-#define glTexStorage1DEXT __rglgen_glTexStorage1DEXT
-#define glTexStorage2DEXT __rglgen_glTexStorage2DEXT
-#define glTexStorage3DEXT __rglgen_glTexStorage3DEXT
-#define glTextureStorage1DEXT __rglgen_glTextureStorage1DEXT
-#define glTextureStorage2DEXT __rglgen_glTextureStorage2DEXT
-#define glTextureStorage3DEXT __rglgen_glTextureStorage3DEXT
-#define glTextureViewEXT __rglgen_glTextureViewEXT
-#define glesEXT __rglgen_glesEXT
-#define glFramebufferTextureMultiviewOVR __rglgen_glFramebufferTextureMultiviewOVR
-#define glFramebufferTextureMultisampleMultiviewOVR __rglgen_glFramebufferTextureMultisampleMultiviewOVR
-
-extern RGLSYMGLBLENDBARRIERKHRPROC __rglgen_glBlendBarrierKHR;
-extern RGLSYMGLDEBUGMESSAGECONTROLKHRPROC __rglgen_glDebugMessageControlKHR;
-extern RGLSYMGLDEBUGMESSAGEINSERTKHRPROC __rglgen_glDebugMessageInsertKHR;
-extern RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC __rglgen_glDebugMessageCallbackKHR;
-extern RGLSYMGLGETDEBUGMESSAGELOGKHRPROC __rglgen_glGetDebugMessageLogKHR;
-extern RGLSYMGLPUSHDEBUGGROUPKHRPROC __rglgen_glPushDebugGroupKHR;
-extern RGLSYMGLPOPDEBUGGROUPKHRPROC __rglgen_glPopDebugGroupKHR;
-extern RGLSYMGLOBJECTLABELKHRPROC __rglgen_glObjectLabelKHR;
-extern RGLSYMGLGETOBJECTLABELKHRPROC __rglgen_glGetObjectLabelKHR;
-extern RGLSYMGLOBJECTPTRLABELKHRPROC __rglgen_glObjectPtrLabelKHR;
-extern RGLSYMGLGETOBJECTPTRLABELKHRPROC __rglgen_glGetObjectPtrLabelKHR;
-extern RGLSYMGLGETPOINTERVKHRPROC __rglgen_glGetPointervKHR;
-extern RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC __rglgen_glGetGraphicsResetStatusKHR;
-extern RGLSYMGLREADNPIXELSKHRPROC __rglgen_glReadnPixelsKHR;
-extern RGLSYMGLGETNUNIFORMFVKHRPROC __rglgen_glGetnUniformfvKHR;
-extern RGLSYMGLGETNUNIFORMIVKHRPROC __rglgen_glGetnUniformivKHR;
-extern RGLSYMGLGETNUNIFORMUIVKHRPROC __rglgen_glGetnUniformuivKHR;
-extern RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC __rglgen_glEGLImageTargetTexture2DOES;
-extern RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC __rglgen_glEGLImageTargetRenderbufferStorageOES;
-extern RGLSYMGLCOPYIMAGESUBDATAOESPROC __rglgen_glCopyImageSubDataOES;
-extern RGLSYMGLENABLEIOESPROC __rglgen_glEnableiOES;
-extern RGLSYMGLDISABLEIOESPROC __rglgen_glDisableiOES;
-extern RGLSYMGLBLENDEQUATIONIOESPROC __rglgen_glBlendEquationiOES;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC __rglgen_glBlendEquationSeparateiOES;
-extern RGLSYMGLBLENDFUNCIOESPROC __rglgen_glBlendFunciOES;
-extern RGLSYMGLBLENDFUNCSEPARATEIOESPROC __rglgen_glBlendFuncSeparateiOES;
-extern RGLSYMGLCOLORMASKIOESPROC __rglgen_glColorMaskiOES;
-extern RGLSYMGLISENABLEDIOESPROC __rglgen_glIsEnablediOES;
-extern RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glDrawElementsBaseVertexOES;
-extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC __rglgen_glDrawRangeElementsBaseVertexOES;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC __rglgen_glDrawElementsInstancedBaseVertexOES;
-extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glMultiDrawElementsBaseVertexOES;
-extern RGLSYMGLFRAMEBUFFERTEXTUREOESPROC __rglgen_glFramebufferTextureOES;
-extern RGLSYMGLGETPROGRAMBINARYOESPROC __rglgen_glGetProgramBinaryOES;
-extern RGLSYMGLPROGRAMBINARYOESPROC __rglgen_glProgramBinaryOES;
-extern RGLSYMGLMAPBUFFEROESPROC __rglgen_glMapBufferOES;
-extern RGLSYMGLUNMAPBUFFEROESPROC __rglgen_glUnmapBufferOES;
-extern RGLSYMGLGETBUFFERPOINTERVOESPROC __rglgen_glGetBufferPointervOES;
-extern RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC __rglgen_glPrimitiveBoundingBoxOES;
-extern RGLSYMGLMINSAMPLESHADINGOESPROC __rglgen_glMinSampleShadingOES;
-extern RGLSYMGLPATCHPARAMETERIOESPROC __rglgen_glPatchParameteriOES;
-extern RGLSYMGLTEXIMAGE3DOESPROC __rglgen_glTexImage3DOES;
-extern RGLSYMGLTEXSUBIMAGE3DOESPROC __rglgen_glTexSubImage3DOES;
-extern RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC __rglgen_glCopyTexSubImage3DOES;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC __rglgen_glCompressedTexImage3DOES;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC __rglgen_glCompressedTexSubImage3DOES;
-extern RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC __rglgen_glFramebufferTexture3DOES;
-extern RGLSYMGLTEXPARAMETERIIVOESPROC __rglgen_glTexParameterIivOES;
-extern RGLSYMGLTEXPARAMETERIUIVOESPROC __rglgen_glTexParameterIuivOES;
-extern RGLSYMGLGETTEXPARAMETERIIVOESPROC __rglgen_glGetTexParameterIivOES;
-extern RGLSYMGLGETTEXPARAMETERIUIVOESPROC __rglgen_glGetTexParameterIuivOES;
-extern RGLSYMGLSAMPLERPARAMETERIIVOESPROC __rglgen_glSamplerParameterIivOES;
-extern RGLSYMGLSAMPLERPARAMETERIUIVOESPROC __rglgen_glSamplerParameterIuivOES;
-extern RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC __rglgen_glGetSamplerParameterIivOES;
-extern RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC __rglgen_glGetSamplerParameterIuivOES;
-extern RGLSYMGLTEXBUFFEROESPROC __rglgen_glTexBufferOES;
-extern RGLSYMGLTEXBUFFERRANGEOESPROC __rglgen_glTexBufferRangeOES;
-extern RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC __rglgen_glTexStorage3DMultisampleOES;
-extern RGLSYMGLTEXTUREVIEWOESPROC __rglgen_glTextureViewOES;
-extern RGLSYMGLBINDVERTEXARRAYOESPROC __rglgen_glBindVertexArrayOES;
-extern RGLSYMGLDELETEVERTEXARRAYSOESPROC __rglgen_glDeleteVertexArraysOES;
-extern RGLSYMGLGENVERTEXARRAYSOESPROC __rglgen_glGenVertexArraysOES;
-extern RGLSYMGLISVERTEXARRAYOESPROC __rglgen_glIsVertexArrayOES;
-extern RGLSYMGLVIEWPORTARRAYVOESPROC __rglgen_glViewportArrayvOES;
-extern RGLSYMGLVIEWPORTINDEXEDFOESPROC __rglgen_glViewportIndexedfOES;
-extern RGLSYMGLVIEWPORTINDEXEDFVOESPROC __rglgen_glViewportIndexedfvOES;
-extern RGLSYMGLSCISSORARRAYVOESPROC __rglgen_glScissorArrayvOES;
-extern RGLSYMGLSCISSORINDEXEDOESPROC __rglgen_glScissorIndexedOES;
-extern RGLSYMGLSCISSORINDEXEDVOESPROC __rglgen_glScissorIndexedvOES;
-extern RGLSYMGLDEPTHRANGEARRAYFVOESPROC __rglgen_glDepthRangeArrayfvOES;
-extern RGLSYMGLDEPTHRANGEINDEXEDFOESPROC __rglgen_glDepthRangeIndexedfOES;
-extern RGLSYMGLGETFLOATI_VOESPROC __rglgen_glGetFloati_vOES;
-extern RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawArraysInstancedBaseInstanceEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseInstanceEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT;
-extern RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __rglgen_glBindFragDataLocationIndexedEXT;
-extern RGLSYMGLBINDFRAGDATALOCATIONEXTPROC __rglgen_glBindFragDataLocationEXT;
-extern RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __rglgen_glGetProgramResourceLocationIndexEXT;
-extern RGLSYMGLGETFRAGDATAINDEXEXTPROC __rglgen_glGetFragDataIndexEXT;
-extern RGLSYMGLBUFFERSTORAGEEXTPROC __rglgen_glBufferStorageEXT;
-extern RGLSYMGLCLEARTEXIMAGEEXTPROC __rglgen_glClearTexImageEXT;
-extern RGLSYMGLCLEARTEXSUBIMAGEEXTPROC __rglgen_glClearTexSubImageEXT;
-extern RGLSYMGLCOPYIMAGESUBDATAEXTPROC __rglgen_glCopyImageSubDataEXT;
-extern RGLSYMGLLABELOBJECTEXTPROC __rglgen_glLabelObjectEXT;
-extern RGLSYMGLGETOBJECTLABELEXTPROC __rglgen_glGetObjectLabelEXT;
-extern RGLSYMGLINSERTEVENTMARKEREXTPROC __rglgen_glInsertEventMarkerEXT;
-extern RGLSYMGLPUSHGROUPMARKEREXTPROC __rglgen_glPushGroupMarkerEXT;
-extern RGLSYMGLPOPGROUPMARKEREXTPROC __rglgen_glPopGroupMarkerEXT;
-extern RGLSYMGLDISCARDFRAMEBUFFEREXTPROC __rglgen_glDiscardFramebufferEXT;
-extern RGLSYMGLGENQUERIESEXTPROC __rglgen_glGenQueriesEXT;
-extern RGLSYMGLDELETEQUERIESEXTPROC __rglgen_glDeleteQueriesEXT;
-extern RGLSYMGLISQUERYEXTPROC __rglgen_glIsQueryEXT;
-extern RGLSYMGLBEGINQUERYEXTPROC __rglgen_glBeginQueryEXT;
-extern RGLSYMGLENDQUERYEXTPROC __rglgen_glEndQueryEXT;
-extern RGLSYMGLQUERYCOUNTEREXTPROC __rglgen_glQueryCounterEXT;
-extern RGLSYMGLGETQUERYIVEXTPROC __rglgen_glGetQueryivEXT;
-extern RGLSYMGLGETQUERYOBJECTIVEXTPROC __rglgen_glGetQueryObjectivEXT;
-extern RGLSYMGLGETQUERYOBJECTUIVEXTPROC __rglgen_glGetQueryObjectuivEXT;
-extern RGLSYMGLGETQUERYOBJECTI64VEXTPROC __rglgen_glGetQueryObjecti64vEXT;
-extern RGLSYMGLGETQUERYOBJECTUI64VEXTPROC __rglgen_glGetQueryObjectui64vEXT;
-extern RGLSYMGLDRAWBUFFERSEXTPROC __rglgen_glDrawBuffersEXT;
-extern RGLSYMGLENABLEIEXTPROC __rglgen_glEnableiEXT;
-extern RGLSYMGLDISABLEIEXTPROC __rglgen_glDisableiEXT;
-extern RGLSYMGLBLENDEQUATIONIEXTPROC __rglgen_glBlendEquationiEXT;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC __rglgen_glBlendEquationSeparateiEXT;
-extern RGLSYMGLBLENDFUNCIEXTPROC __rglgen_glBlendFunciEXT;
-extern RGLSYMGLBLENDFUNCSEPARATEIEXTPROC __rglgen_glBlendFuncSeparateiEXT;
-extern RGLSYMGLCOLORMASKIEXTPROC __rglgen_glColorMaskiEXT;
-extern RGLSYMGLISENABLEDIEXTPROC __rglgen_glIsEnablediEXT;
-extern RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawElementsBaseVertexEXT;
-extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawRangeElementsBaseVertexEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __rglgen_glDrawElementsInstancedBaseVertexEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glMultiDrawElementsBaseVertexEXT;
-extern RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC __rglgen_glDrawArraysInstancedEXT;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC __rglgen_glDrawElementsInstancedEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC __rglgen_glFramebufferTextureEXT;
-extern RGLSYMGLVERTEXATTRIBDIVISOREXTPROC __rglgen_glVertexAttribDivisorEXT;
-extern RGLSYMGLMAPBUFFERRANGEEXTPROC __rglgen_glMapBufferRangeEXT;
-extern RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC __rglgen_glFlushMappedBufferRangeEXT;
-extern RGLSYMGLMULTIDRAWARRAYSEXTPROC __rglgen_glMultiDrawArraysEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSEXTPROC __rglgen_glMultiDrawElementsEXT;
-extern RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC __rglgen_glMultiDrawArraysIndirectEXT;
-extern RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC __rglgen_glMultiDrawElementsIndirectEXT;
-extern RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __rglgen_glRenderbufferStorageMultisampleEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __rglgen_glFramebufferTexture2DMultisampleEXT;
-extern RGLSYMGLREADBUFFERINDEXEDEXTPROC __rglgen_glReadBufferIndexedEXT;
-extern RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC __rglgen_glDrawBuffersIndexedEXT;
-extern RGLSYMGLGETINTEGERI_VEXTPROC __rglgen_glGetIntegeri_vEXT;
-extern RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC __rglgen_glPolygonOffsetClampEXT;
-extern RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC __rglgen_glPrimitiveBoundingBoxEXT;
-extern RGLSYMGLRASTERSAMPLESEXTPROC __rglgen_glRasterSamplesEXT;
-extern RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC __rglgen_glGetGraphicsResetStatusEXT;
-extern RGLSYMGLREADNPIXELSEXTPROC __rglgen_glReadnPixelsEXT;
-extern RGLSYMGLGETNUNIFORMFVEXTPROC __rglgen_glGetnUniformfvEXT;
-extern RGLSYMGLGETNUNIFORMIVEXTPROC __rglgen_glGetnUniformivEXT;
-extern RGLSYMGLACTIVESHADERPROGRAMEXTPROC __rglgen_glActiveShaderProgramEXT;
-extern RGLSYMGLBINDPROGRAMPIPELINEEXTPROC __rglgen_glBindProgramPipelineEXT;
-extern RGLSYMGLCREATESHADERPROGRAMVEXTPROC __rglgen_glCreateShaderProgramvEXT;
-extern RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC __rglgen_glDeleteProgramPipelinesEXT;
-extern RGLSYMGLGENPROGRAMPIPELINESEXTPROC __rglgen_glGenProgramPipelinesEXT;
-extern RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC __rglgen_glGetProgramPipelineInfoLogEXT;
-extern RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC __rglgen_glGetProgramPipelineivEXT;
-extern RGLSYMGLISPROGRAMPIPELINEEXTPROC __rglgen_glIsProgramPipelineEXT;
-extern RGLSYMGLPROGRAMPARAMETERIEXTPROC __rglgen_glProgramParameteriEXT;
-extern RGLSYMGLPROGRAMUNIFORM1FEXTPROC __rglgen_glProgramUniform1fEXT;
-extern RGLSYMGLPROGRAMUNIFORM1FVEXTPROC __rglgen_glProgramUniform1fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM1IEXTPROC __rglgen_glProgramUniform1iEXT;
-extern RGLSYMGLPROGRAMUNIFORM1IVEXTPROC __rglgen_glProgramUniform1ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM2FEXTPROC __rglgen_glProgramUniform2fEXT;
-extern RGLSYMGLPROGRAMUNIFORM2FVEXTPROC __rglgen_glProgramUniform2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM2IEXTPROC __rglgen_glProgramUniform2iEXT;
-extern RGLSYMGLPROGRAMUNIFORM2IVEXTPROC __rglgen_glProgramUniform2ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM3FEXTPROC __rglgen_glProgramUniform3fEXT;
-extern RGLSYMGLPROGRAMUNIFORM3FVEXTPROC __rglgen_glProgramUniform3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM3IEXTPROC __rglgen_glProgramUniform3iEXT;
-extern RGLSYMGLPROGRAMUNIFORM3IVEXTPROC __rglgen_glProgramUniform3ivEXT;
-extern RGLSYMGLPROGRAMUNIFORM4FEXTPROC __rglgen_glProgramUniform4fEXT;
-extern RGLSYMGLPROGRAMUNIFORM4FVEXTPROC __rglgen_glProgramUniform4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORM4IEXTPROC __rglgen_glProgramUniform4iEXT;
-extern RGLSYMGLPROGRAMUNIFORM4IVEXTPROC __rglgen_glProgramUniform4ivEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC __rglgen_glProgramUniformMatrix2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC __rglgen_glProgramUniformMatrix3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC __rglgen_glProgramUniformMatrix4fvEXT;
-extern RGLSYMGLUSEPROGRAMSTAGESEXTPROC __rglgen_glUseProgramStagesEXT;
-extern RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC __rglgen_glValidateProgramPipelineEXT;
-extern RGLSYMGLPROGRAMUNIFORM1UIEXTPROC __rglgen_glProgramUniform1uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM2UIEXTPROC __rglgen_glProgramUniform2uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM3UIEXTPROC __rglgen_glProgramUniform3uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM4UIEXTPROC __rglgen_glProgramUniform4uiEXT;
-extern RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC __rglgen_glProgramUniform1uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC __rglgen_glProgramUniform2uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC __rglgen_glProgramUniform3uivEXT;
-extern RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC __rglgen_glProgramUniform4uivEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __rglgen_glProgramUniformMatrix2x3fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __rglgen_glProgramUniformMatrix3x2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __rglgen_glProgramUniformMatrix2x4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __rglgen_glProgramUniformMatrix4x2fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __rglgen_glProgramUniformMatrix3x4fvEXT;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __rglgen_glProgramUniformMatrix4x3fvEXT;
-extern RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glFramebufferPixelLocalStorageSizeEXT;
-extern RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glGetFramebufferPixelLocalStorageSizeEXT;
-extern RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC __rglgen_glClearPixelLocalStorageuiEXT;
-extern RGLSYMGLTEXPAGECOMMITMENTEXTPROC __rglgen_glTexPageCommitmentEXT;
-extern RGLSYMGLPATCHPARAMETERIEXTPROC __rglgen_glPatchParameteriEXT;
-extern RGLSYMGLTEXPARAMETERIIVEXTPROC __rglgen_glTexParameterIivEXT;
-extern RGLSYMGLTEXPARAMETERIUIVEXTPROC __rglgen_glTexParameterIuivEXT;
-extern RGLSYMGLGETTEXPARAMETERIIVEXTPROC __rglgen_glGetTexParameterIivEXT;
-extern RGLSYMGLGETTEXPARAMETERIUIVEXTPROC __rglgen_glGetTexParameterIuivEXT;
-extern RGLSYMGLSAMPLERPARAMETERIIVEXTPROC __rglgen_glSamplerParameterIivEXT;
-extern RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC __rglgen_glSamplerParameterIuivEXT;
-extern RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC __rglgen_glGetSamplerParameterIivEXT;
-extern RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC __rglgen_glGetSamplerParameterIuivEXT;
-extern RGLSYMGLTEXBUFFEREXTPROC __rglgen_glTexBufferEXT;
-extern RGLSYMGLTEXBUFFERRANGEEXTPROC __rglgen_glTexBufferRangeEXT;
-extern RGLSYMGLTEXSTORAGE1DEXTPROC __rglgen_glTexStorage1DEXT;
-extern RGLSYMGLTEXSTORAGE2DEXTPROC __rglgen_glTexStorage2DEXT;
-extern RGLSYMGLTEXSTORAGE3DEXTPROC __rglgen_glTexStorage3DEXT;
-extern RGLSYMGLTEXTURESTORAGE1DEXTPROC __rglgen_glTextureStorage1DEXT;
-extern RGLSYMGLTEXTURESTORAGE2DEXTPROC __rglgen_glTextureStorage2DEXT;
-extern RGLSYMGLTEXTURESTORAGE3DEXTPROC __rglgen_glTextureStorage3DEXT;
-extern RGLSYMGLTEXTUREVIEWEXTPROC __rglgen_glTextureViewEXT;
-extern RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultiviewOVR;
-extern RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultisampleMultiviewOVR;
-
-struct rglgen_sym_map { const char *sym; void *ptr; };
-extern const struct rglgen_sym_map rglgen_symbol_map[];
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libretro-common/include/glsym/glsym_gl.h b/libretro-common/include/glsym/glsym_gl.h
deleted file mode 100644
index 9720c2e..0000000
--- a/libretro-common/include/glsym/glsym_gl.h
+++ /dev/null
@@ -1,3140 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef RGLGEN_DECL_H__
-#define RGLGEN_DECL_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef GL_APIENTRY
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (GL_APIENTRY *RGLGENGLDEBUGPROCKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#else
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-typedef void (APIENTRY *RGLGENGLDEBUGPROCARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-typedef void (APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);
-#endif
-#ifndef GL_OES_EGL_image
-typedef void *GLeglImageOES;
-#endif
-#if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2)
-typedef GLint GLfixed;
-#endif
-#if defined(__MACH__) && !defined(OS_TARGET_IPHONE) && !defined(MAC_OS_X_VERSION_10_7)
-typedef long long int GLint64;
-typedef unsigned long long int GLuint64;
-typedef unsigned long long int GLuint64EXT;
-typedef struct __GLsync *GLsync;
-#endif
-typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
-typedef void (APIENTRYP RGLSYMGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-typedef void (APIENTRYP RGLSYMGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-typedef void (APIENTRYP RGLSYMGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP RGLSYMGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
-typedef void (APIENTRYP RGLSYMGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP RGLSYMGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP RGLSYMGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP RGLSYMGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP RGLSYMGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP RGLSYMGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP RGLSYMGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP RGLSYMGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP RGLSYMGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP RGLSYMGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP RGLSYMGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP RGLSYMGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP RGLSYMGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP RGLSYMGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP RGLSYMGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP RGLSYMGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP RGLSYMGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
-typedef void (APIENTRYP RGLSYMGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
-typedef void *(APIENTRYP RGLSYMGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP RGLSYMGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void **params);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP RGLSYMGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP RGLSYMGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP RGLSYMGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
-typedef void (APIENTRYP RGLSYMGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP RGLSYMGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP RGLSYMGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP RGLSYMGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP RGLSYMGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP RGLSYMGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP RGLSYMGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP RGLSYMGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP RGLSYMGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP RGLSYMGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
-typedef GLint (APIENTRYP RGLSYMGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP RGLSYMGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP RGLSYMGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP RGLSYMGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
-typedef GLboolean (APIENTRYP RGLSYMGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP RGLSYMGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP RGLSYMGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP RGLSYMGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
-typedef void (APIENTRYP RGLSYMGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-typedef void (APIENTRYP RGLSYMGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
-typedef void (APIENTRYP RGLSYMGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
-typedef void (APIENTRYP RGLSYMGLENABLEIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP RGLSYMGLDISABLEIPROC) (GLenum target, GLuint index);
-typedef GLboolean (APIENTRYP RGLSYMGLISENABLEDIPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP RGLSYMGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
-typedef void (APIENTRYP RGLSYMGLENDTRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
-typedef void (APIENTRYP RGLSYMGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP RGLSYMGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
-typedef void (APIENTRYP RGLSYMGLENDCONDITIONALRENDERPROC) (void);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
-typedef GLint (APIENTRYP RGLSYMGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1UIPROC) (GLint location, GLuint v0);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP RGLSYMGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
-typedef void (APIENTRYP RGLSYMGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-typedef const GLubyte *(APIENTRYP RGLSYMGLGETSTRINGIPROC) (GLenum name, GLuint index);
-typedef GLboolean (APIENTRYP RGLSYMGLISRENDERBUFFERPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP RGLSYMGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP RGLSYMGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP RGLSYMGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP RGLSYMGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP RGLSYMGLISFRAMEBUFFERPROC) (GLuint framebuffer);
-typedef void (APIENTRYP RGLSYMGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP RGLSYMGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP RGLSYMGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP RGLSYMGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP RGLSYMGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGENERATEMIPMAPPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-typedef void (APIENTRYP RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void *(APIENTRYP RGLSYMGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-typedef void (APIENTRYP RGLSYMGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
-typedef void (APIENTRYP RGLSYMGLBINDVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP RGLSYMGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP RGLSYMGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
-typedef GLboolean (APIENTRYP RGLSYMGLISVERTEXARRAYPROC) (GLuint array);
-typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
-typedef void (APIENTRYP RGLSYMGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
-typedef void (APIENTRYP RGLSYMGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-typedef GLuint (APIENTRYP RGLSYMGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-typedef void (APIENTRYP RGLSYMGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (APIENTRYP RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
-typedef void (APIENTRYP RGLSYMGLPROVOKINGVERTEXPROC) (GLenum mode);
-typedef GLsync (APIENTRYP RGLSYMGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
-typedef GLboolean (APIENTRYP RGLSYMGLISSYNCPROC) (GLsync sync);
-typedef void (APIENTRYP RGLSYMGLDELETESYNCPROC) (GLsync sync);
-typedef GLenum (APIENTRYP RGLSYMGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP RGLSYMGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-typedef void (APIENTRYP RGLSYMGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
-typedef void (APIENTRYP RGLSYMGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-typedef void (APIENTRYP RGLSYMGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP RGLSYMGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
-typedef void (APIENTRYP RGLSYMGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
-typedef void (APIENTRYP RGLSYMGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-typedef GLint (APIENTRYP RGLSYMGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
-typedef void (APIENTRYP RGLSYMGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
-typedef GLboolean (APIENTRYP RGLSYMGLISSAMPLERPROC) (GLuint sampler);
-typedef void (APIENTRYP RGLSYMGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
-typedef void (APIENTRYP RGLSYMGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
-typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP2UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP3UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP4UIPROC) (GLenum type, GLuint value);
-typedef void (APIENTRYP RGLSYMGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLNORMALP3UIPROC) (GLenum type, GLuint coords);
-typedef void (APIENTRYP RGLSYMGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
-typedef void (APIENTRYP RGLSYMGLCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP RGLSYMGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP RGLSYMGLCOLORP4UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP RGLSYMGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
-typedef void (APIENTRYP RGLSYMGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
-typedef void (APIENTRYP RGLSYMGLMINSAMPLESHADINGPROC) (GLfloat value);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP RGLSYMGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1DPROC) (GLint location, GLdouble x);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
-typedef GLint (APIENTRYP RGLSYMGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef GLuint (APIENTRYP RGLSYMGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-typedef void (APIENTRYP RGLSYMGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-typedef void (APIENTRYP RGLSYMGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
-typedef void (APIENTRYP RGLSYMGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
-typedef void (APIENTRYP RGLSYMGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP RGLSYMGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
-typedef void (APIENTRYP RGLSYMGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
-typedef GLboolean (APIENTRYP RGLSYMGLISTRANSFORMFEEDBACKPROC) (GLuint id);
-typedef void (APIENTRYP RGLSYMGLPAUSETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP RGLSYMGLRESUMETRANSFORMFEEDBACKPROC) (void);
-typedef void (APIENTRYP RGLSYMGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
-typedef void (APIENTRYP RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
-typedef void (APIENTRYP RGLSYMGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
-typedef void (APIENTRYP RGLSYMGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
-typedef void (APIENTRYP RGLSYMGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLRELEASESHADERCOMPILERPROC) (void);
-typedef void (APIENTRYP RGLSYMGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
-typedef void (APIENTRYP RGLSYMGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-typedef void (APIENTRYP RGLSYMGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
-typedef void (APIENTRYP RGLSYMGLCLEARDEPTHFPROC) (GLfloat d);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-typedef void (APIENTRYP RGLSYMGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
-typedef void (APIENTRYP RGLSYMGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP RGLSYMGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
-typedef void (APIENTRYP RGLSYMGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
-typedef GLuint (APIENTRYP RGLSYMGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar *const*strings);
-typedef void (APIENTRYP RGLSYMGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP RGLSYMGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
-typedef void (APIENTRYP RGLSYMGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
-typedef GLboolean (APIENTRYP RGLSYMGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-typedef void (APIENTRYP RGLSYMGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-typedef void (APIENTRYP RGLSYMGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
-typedef void (APIENTRYP RGLSYMGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
-typedef void (APIENTRYP RGLSYMGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
-typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
-typedef void (APIENTRYP RGLSYMGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-typedef void (APIENTRYP RGLSYMGLMEMORYBARRIERPROC) (GLbitfield barriers);
-typedef void (APIENTRYP RGLSYMGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-typedef void (APIENTRYP RGLSYMGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (APIENTRYP RGLSYMGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount);
-typedef void (APIENTRYP RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP RGLSYMGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP RGLSYMGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-typedef void (APIENTRYP RGLSYMGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
-typedef void (APIENTRYP RGLSYMGLCOPYIMAGESUBDATAPROC) (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 srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
-typedef void (APIENTRYP RGLSYMGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
-typedef void (APIENTRYP RGLSYMGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
-typedef void (APIENTRYP RGLSYMGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
-typedef void (APIENTRYP RGLSYMGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
-typedef void (APIENTRYP RGLSYMGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
-typedef GLuint (APIENTRYP RGLSYMGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
-typedef GLint (APIENTRYP RGLSYMGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name);
-typedef GLint (APIENTRYP RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
-typedef void (APIENTRYP RGLSYMGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRYP RGLSYMGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP RGLSYMGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-typedef void (APIENTRYP RGLSYMGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-typedef void (APIENTRYP RGLSYMGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
-typedef void (APIENTRYP RGLSYMGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKPROC) (RGLGENGLDEBUGPROC callback, const void *userParam);
-typedef GLuint (APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (APIENTRYP RGLSYMGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (APIENTRYP RGLSYMGLPOPDEBUGGROUPPROC) (void);
-typedef void (APIENTRYP RGLSYMGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-typedef void (APIENTRYP RGLSYMGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (APIENTRYP RGLSYMGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
-typedef void (APIENTRYP RGLSYMGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-typedef void (APIENTRYP RGLSYMGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
-typedef void (APIENTRYP RGLSYMGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP RGLSYMGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
-typedef void (APIENTRYP RGLSYMGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
-typedef void (APIENTRYP RGLSYMGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint *samplers);
-typedef void (APIENTRYP RGLSYMGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
-typedef void (APIENTRYP RGLSYMGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
-typedef GLuint64 (APIENTRYP RGLSYMGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
-typedef GLuint64 (APIENTRYP RGLSYMGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
-typedef void (APIENTRYP RGLSYMGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
-typedef void (APIENTRYP RGLSYMGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
-typedef GLuint64 (APIENTRYP RGLSYMGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
-typedef void (APIENTRYP RGLSYMGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
-typedef void (APIENTRYP RGLSYMGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
-typedef void (APIENTRYP RGLSYMGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
-typedef void (APIENTRYP RGLSYMGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
-typedef GLboolean (APIENTRYP RGLSYMGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
-typedef GLboolean (APIENTRYP RGLSYMGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT *v);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
-#ifdef __APPLE__
-	struct _cl_context;
-	struct _cl_event;
-#endif
-typedef GLsync (APIENTRYP RGLSYMGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
-typedef void (APIENTRYP RGLSYMGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-typedef void (APIENTRYP RGLSYMGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKARBPROC) (RGLGENGLDEBUGPROCARB callback, const void *userParam);
-typedef GLuint (APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (APIENTRYP RGLSYMGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
-typedef void (APIENTRYP RGLSYMGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP RGLSYMGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
-typedef void (APIENTRYP RGLSYMGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-typedef void (APIENTRYP RGLSYMGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
-typedef void (APIENTRYP RGLSYMGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
-typedef void (APIENTRYP RGLSYMGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
-typedef void (APIENTRYP RGLSYMGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP RGLSYMGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP RGLSYMGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP RGLSYMGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP RGLSYMGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP RGLSYMGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
-typedef GLboolean (APIENTRYP RGLSYMGLISPROGRAMARBPROC) (GLuint program);
-typedef void (APIENTRYP RGLSYMGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-typedef void (APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
-typedef void (APIENTRYP RGLSYMGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
-typedef void (APIENTRYP RGLSYMGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP RGLSYMGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP RGLSYMGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
-typedef void (APIENTRYP RGLSYMGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP RGLSYMGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP RGLSYMGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP RGLSYMGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP RGLSYMGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
-typedef void (APIENTRYP RGLSYMGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
-typedef void (APIENTRYP RGLSYMGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
-typedef void (APIENTRYP RGLSYMGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
-typedef void (APIENTRYP RGLSYMGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
-typedef void (APIENTRYP RGLSYMGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP RGLSYMGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP RGLSYMGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
-typedef void (APIENTRYP RGLSYMGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
-typedef void (APIENTRYP RGLSYMGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP RGLSYMGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP RGLSYMGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP RGLSYMGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP RGLSYMGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
-typedef void (APIENTRYP RGLSYMGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP RGLSYMGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP RGLSYMGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP RGLSYMGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP RGLSYMGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP RGLSYMGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-typedef GLenum (APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC) (void);
-typedef void (APIENTRYP RGLSYMGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
-typedef void (APIENTRYP RGLSYMGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-typedef void (APIENTRYP RGLSYMGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void *img);
-typedef void (APIENTRYP RGLSYMGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-typedef void (APIENTRYP RGLSYMGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
-typedef void (APIENTRYP RGLSYMGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
-typedef void (APIENTRYP RGLSYMGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
-typedef void (APIENTRYP RGLSYMGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
-typedef void (APIENTRYP RGLSYMGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
-typedef void (APIENTRYP RGLSYMGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
-typedef void (APIENTRYP RGLSYMGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
-typedef void (APIENTRYP RGLSYMGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
-typedef void (APIENTRYP RGLSYMGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
-typedef void (APIENTRYP RGLSYMGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
-typedef void (APIENTRYP RGLSYMGLMINSAMPLESHADINGARBPROC) (GLfloat value);
-typedef void (APIENTRYP RGLSYMGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP RGLSYMGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP RGLSYMGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP RGLSYMGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP RGLSYMGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
-typedef void (APIENTRYP RGLSYMGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP RGLSYMGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP RGLSYMGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP RGLSYMGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP RGLSYMGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP RGLSYMGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP RGLSYMGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP RGLSYMGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP RGLSYMGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-typedef void (APIENTRYP RGLSYMGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
-typedef void (APIENTRYP RGLSYMGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
-typedef GLboolean (APIENTRYP RGLSYMGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
-typedef void (APIENTRYP RGLSYMGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
-typedef void (APIENTRYP RGLSYMGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident);
-typedef void (APIENTRYP RGLSYMGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
-typedef void (APIENTRYP RGLSYMGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
-typedef void (APIENTRYP RGLSYMGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP RGLSYMGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP RGLSYMGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP RGLSYMGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP RGLSYMGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP RGLSYMGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLVERTEXBLENDARBPROC) (GLint count);
-typedef void (APIENTRYP RGLSYMGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP RGLSYMGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP RGLSYMGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP RGLSYMGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
-typedef void (APIENTRYP RGLSYMGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
-typedef void *(APIENTRYP RGLSYMGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP RGLSYMGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void **params);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP RGLSYMGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
-typedef void (APIENTRYP RGLSYMGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP RGLSYMGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void **pointer);
-typedef void (APIENTRYP RGLSYMGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP RGLSYMGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP RGLSYMGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP RGLSYMGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD1BOESPROC) (GLbyte s);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD1BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD2BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD3BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD4BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLVERTEX2BOESPROC) (GLbyte x);
-typedef void (APIENTRYP RGLSYMGLVERTEX2BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLVERTEX3BOESPROC) (GLbyte x, GLbyte y);
-typedef void (APIENTRYP RGLSYMGLVERTEX3BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z);
-typedef void (APIENTRYP RGLSYMGLVERTEX4BVOESPROC) (const GLbyte *coords);
-typedef void (APIENTRYP RGLSYMGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
-typedef void (APIENTRYP RGLSYMGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-typedef void (APIENTRYP RGLSYMGLCLEARDEPTHXOESPROC) (GLfixed depth);
-typedef void (APIENTRYP RGLSYMGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
-typedef void (APIENTRYP RGLSYMGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-typedef void (APIENTRYP RGLSYMGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
-typedef void (APIENTRYP RGLSYMGLFOGXOESPROC) (GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
-typedef void (APIENTRYP RGLSYMGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
-typedef void (APIENTRYP RGLSYMGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
-typedef void (APIENTRYP RGLSYMGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
-typedef void (APIENTRYP RGLSYMGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLLINEWIDTHXOESPROC) (GLfixed width);
-typedef void (APIENTRYP RGLSYMGLLOADMATRIXXOESPROC) (const GLfixed *m);
-typedef void (APIENTRYP RGLSYMGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
-typedef void (APIENTRYP RGLSYMGLMULTMATRIXXOESPROC) (const GLfixed *m);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-typedef void (APIENTRYP RGLSYMGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
-typedef void (APIENTRYP RGLSYMGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
-typedef void (APIENTRYP RGLSYMGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLPOINTSIZEXOESPROC) (GLfixed size);
-typedef void (APIENTRYP RGLSYMGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
-typedef void (APIENTRYP RGLSYMGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-typedef void (APIENTRYP RGLSYMGLSAMPLECOVERAGEOESPROC) (GLfixed value, GLboolean invert);
-typedef void (APIENTRYP RGLSYMGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-typedef void (APIENTRYP RGLSYMGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-typedef void (APIENTRYP RGLSYMGLACCUMXOESPROC) (GLenum op, GLfixed value);
-typedef void (APIENTRYP RGLSYMGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
-typedef void (APIENTRYP RGLSYMGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-typedef void (APIENTRYP RGLSYMGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-typedef void (APIENTRYP RGLSYMGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue);
-typedef void (APIENTRYP RGLSYMGLCOLOR3XVOESPROC) (const GLfixed *components);
-typedef void (APIENTRYP RGLSYMGLCOLOR4XVOESPROC) (const GLfixed *components);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLEVALCOORD1XOESPROC) (GLfixed u);
-typedef void (APIENTRYP RGLSYMGLEVALCOORD1XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v);
-typedef void (APIENTRYP RGLSYMGLEVALCOORD2XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer);
-typedef void (APIENTRYP RGLSYMGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v);
-typedef void (APIENTRYP RGLSYMGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values);
-typedef void (APIENTRYP RGLSYMGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLINDEXXOESPROC) (GLfixed component);
-typedef void (APIENTRYP RGLSYMGLINDEXXVOESPROC) (const GLfixed *component);
-typedef void (APIENTRYP RGLSYMGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
-typedef void (APIENTRYP RGLSYMGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
-typedef void (APIENTRYP RGLSYMGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
-typedef void (APIENTRYP RGLSYMGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2);
-typedef void (APIENTRYP RGLSYMGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
-typedef void (APIENTRYP RGLSYMGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLNORMAL3XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLPASSTHROUGHXOESPROC) (GLfixed token);
-typedef void (APIENTRYP RGLSYMGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values);
-typedef void (APIENTRYP RGLSYMGLPIXELSTOREXPROC) (GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor);
-typedef void (APIENTRYP RGLSYMGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS2XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS3XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
-typedef void (APIENTRYP RGLSYMGLRASTERPOS4XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
-typedef void (APIENTRYP RGLSYMGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD1XOESPROC) (GLfixed s);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD1XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD2XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD3XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-typedef void (APIENTRYP RGLSYMGLTEXCOORD4XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
-typedef void (APIENTRYP RGLSYMGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
-typedef void (APIENTRYP RGLSYMGLVERTEX2XOESPROC) (GLfixed x);
-typedef void (APIENTRYP RGLSYMGLVERTEX2XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLVERTEX3XOESPROC) (GLfixed x, GLfixed y);
-typedef void (APIENTRYP RGLSYMGLVERTEX3XVOESPROC) (const GLfixed *coords);
-typedef void (APIENTRYP RGLSYMGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
-typedef void (APIENTRYP RGLSYMGLVERTEX4XVOESPROC) (const GLfixed *coords);
-typedef GLbitfield (APIENTRYP RGLSYMGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
-typedef void (APIENTRYP RGLSYMGLCLEARDEPTHFOESPROC) (GLclampf depth);
-typedef void (APIENTRYP RGLSYMGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
-typedef void (APIENTRYP RGLSYMGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
-typedef void (APIENTRYP RGLSYMGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
-typedef void (APIENTRYP RGLSYMGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
-typedef void (APIENTRYP RGLSYMGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
-typedef void (APIENTRYP RGLSYMGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP RGLSYMGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP RGLSYMGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP RGLSYMGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP RGLSYMGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP RGLSYMGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-
-#define glDrawRangeElements __rglgen_glDrawRangeElements
-#define glTexImage3D __rglgen_glTexImage3D
-#define glTexSubImage3D __rglgen_glTexSubImage3D
-#define glCopyTexSubImage3D __rglgen_glCopyTexSubImage3D
-#define glActiveTexture __rglgen_glActiveTexture
-#define glSampleCoverage __rglgen_glSampleCoverage
-#define glCompressedTexImage3D __rglgen_glCompressedTexImage3D
-#define glCompressedTexImage2D __rglgen_glCompressedTexImage2D
-#define glCompressedTexImage1D __rglgen_glCompressedTexImage1D
-#define glCompressedTexSubImage3D __rglgen_glCompressedTexSubImage3D
-#define glCompressedTexSubImage2D __rglgen_glCompressedTexSubImage2D
-#define glCompressedTexSubImage1D __rglgen_glCompressedTexSubImage1D
-#define glGetCompressedTexImage __rglgen_glGetCompressedTexImage
-#define glClientActiveTexture __rglgen_glClientActiveTexture
-#define glMultiTexCoord1d __rglgen_glMultiTexCoord1d
-#define glMultiTexCoord1dv __rglgen_glMultiTexCoord1dv
-#define glMultiTexCoord1f __rglgen_glMultiTexCoord1f
-#define glMultiTexCoord1fv __rglgen_glMultiTexCoord1fv
-#define glMultiTexCoord1i __rglgen_glMultiTexCoord1i
-#define glMultiTexCoord1iv __rglgen_glMultiTexCoord1iv
-#define glMultiTexCoord1s __rglgen_glMultiTexCoord1s
-#define glMultiTexCoord1sv __rglgen_glMultiTexCoord1sv
-#define glMultiTexCoord2d __rglgen_glMultiTexCoord2d
-#define glMultiTexCoord2dv __rglgen_glMultiTexCoord2dv
-#define glMultiTexCoord2f __rglgen_glMultiTexCoord2f
-#define glMultiTexCoord2fv __rglgen_glMultiTexCoord2fv
-#define glMultiTexCoord2i __rglgen_glMultiTexCoord2i
-#define glMultiTexCoord2iv __rglgen_glMultiTexCoord2iv
-#define glMultiTexCoord2s __rglgen_glMultiTexCoord2s
-#define glMultiTexCoord2sv __rglgen_glMultiTexCoord2sv
-#define glMultiTexCoord3d __rglgen_glMultiTexCoord3d
-#define glMultiTexCoord3dv __rglgen_glMultiTexCoord3dv
-#define glMultiTexCoord3f __rglgen_glMultiTexCoord3f
-#define glMultiTexCoord3fv __rglgen_glMultiTexCoord3fv
-#define glMultiTexCoord3i __rglgen_glMultiTexCoord3i
-#define glMultiTexCoord3iv __rglgen_glMultiTexCoord3iv
-#define glMultiTexCoord3s __rglgen_glMultiTexCoord3s
-#define glMultiTexCoord3sv __rglgen_glMultiTexCoord3sv
-#define glMultiTexCoord4d __rglgen_glMultiTexCoord4d
-#define glMultiTexCoord4dv __rglgen_glMultiTexCoord4dv
-#define glMultiTexCoord4f __rglgen_glMultiTexCoord4f
-#define glMultiTexCoord4fv __rglgen_glMultiTexCoord4fv
-#define glMultiTexCoord4i __rglgen_glMultiTexCoord4i
-#define glMultiTexCoord4iv __rglgen_glMultiTexCoord4iv
-#define glMultiTexCoord4s __rglgen_glMultiTexCoord4s
-#define glMultiTexCoord4sv __rglgen_glMultiTexCoord4sv
-#define glLoadTransposeMatrixf __rglgen_glLoadTransposeMatrixf
-#define glLoadTransposeMatrixd __rglgen_glLoadTransposeMatrixd
-#define glMultTransposeMatrixf __rglgen_glMultTransposeMatrixf
-#define glMultTransposeMatrixd __rglgen_glMultTransposeMatrixd
-#define glBlendFuncSeparate __rglgen_glBlendFuncSeparate
-#define glMultiDrawArrays __rglgen_glMultiDrawArrays
-#define glMultiDrawElements __rglgen_glMultiDrawElements
-#define glPointParameterf __rglgen_glPointParameterf
-#define glPointParameterfv __rglgen_glPointParameterfv
-#define glPointParameteri __rglgen_glPointParameteri
-#define glPointParameteriv __rglgen_glPointParameteriv
-#define glFogCoordf __rglgen_glFogCoordf
-#define glFogCoordfv __rglgen_glFogCoordfv
-#define glFogCoordd __rglgen_glFogCoordd
-#define glFogCoorddv __rglgen_glFogCoorddv
-#define glFogCoordPointer __rglgen_glFogCoordPointer
-#define glSecondaryColor3b __rglgen_glSecondaryColor3b
-#define glSecondaryColor3bv __rglgen_glSecondaryColor3bv
-#define glSecondaryColor3d __rglgen_glSecondaryColor3d
-#define glSecondaryColor3dv __rglgen_glSecondaryColor3dv
-#define glSecondaryColor3f __rglgen_glSecondaryColor3f
-#define glSecondaryColor3fv __rglgen_glSecondaryColor3fv
-#define glSecondaryColor3i __rglgen_glSecondaryColor3i
-#define glSecondaryColor3iv __rglgen_glSecondaryColor3iv
-#define glSecondaryColor3s __rglgen_glSecondaryColor3s
-#define glSecondaryColor3sv __rglgen_glSecondaryColor3sv
-#define glSecondaryColor3ub __rglgen_glSecondaryColor3ub
-#define glSecondaryColor3ubv __rglgen_glSecondaryColor3ubv
-#define glSecondaryColor3ui __rglgen_glSecondaryColor3ui
-#define glSecondaryColor3uiv __rglgen_glSecondaryColor3uiv
-#define glSecondaryColor3us __rglgen_glSecondaryColor3us
-#define glSecondaryColor3usv __rglgen_glSecondaryColor3usv
-#define glSecondaryColorPointer __rglgen_glSecondaryColorPointer
-#define glWindowPos2d __rglgen_glWindowPos2d
-#define glWindowPos2dv __rglgen_glWindowPos2dv
-#define glWindowPos2f __rglgen_glWindowPos2f
-#define glWindowPos2fv __rglgen_glWindowPos2fv
-#define glWindowPos2i __rglgen_glWindowPos2i
-#define glWindowPos2iv __rglgen_glWindowPos2iv
-#define glWindowPos2s __rglgen_glWindowPos2s
-#define glWindowPos2sv __rglgen_glWindowPos2sv
-#define glWindowPos3d __rglgen_glWindowPos3d
-#define glWindowPos3dv __rglgen_glWindowPos3dv
-#define glWindowPos3f __rglgen_glWindowPos3f
-#define glWindowPos3fv __rglgen_glWindowPos3fv
-#define glWindowPos3i __rglgen_glWindowPos3i
-#define glWindowPos3iv __rglgen_glWindowPos3iv
-#define glWindowPos3s __rglgen_glWindowPos3s
-#define glWindowPos3sv __rglgen_glWindowPos3sv
-#define glBlendColor __rglgen_glBlendColor
-#define glBlendEquation __rglgen_glBlendEquation
-#define glGenQueries __rglgen_glGenQueries
-#define glDeleteQueries __rglgen_glDeleteQueries
-#define glIsQuery __rglgen_glIsQuery
-#define glBeginQuery __rglgen_glBeginQuery
-#define glEndQuery __rglgen_glEndQuery
-#define glGetQueryiv __rglgen_glGetQueryiv
-#define glGetQueryObjectiv __rglgen_glGetQueryObjectiv
-#define glGetQueryObjectuiv __rglgen_glGetQueryObjectuiv
-#define glBindBuffer __rglgen_glBindBuffer
-#define glDeleteBuffers __rglgen_glDeleteBuffers
-#define glGenBuffers __rglgen_glGenBuffers
-#define glIsBuffer __rglgen_glIsBuffer
-#define glBufferData __rglgen_glBufferData
-#define glBufferSubData __rglgen_glBufferSubData
-#define glGetBufferSubData __rglgen_glGetBufferSubData
-#define glMapBuffer __rglgen_glMapBuffer
-#define glUnmapBuffer __rglgen_glUnmapBuffer
-#define glGetBufferParameteriv __rglgen_glGetBufferParameteriv
-#define glGetBufferPointerv __rglgen_glGetBufferPointerv
-#define glBlendEquationSeparate __rglgen_glBlendEquationSeparate
-#define glDrawBuffers __rglgen_glDrawBuffers
-#define glStencilOpSeparate __rglgen_glStencilOpSeparate
-#define glStencilFuncSeparate __rglgen_glStencilFuncSeparate
-#define glStencilMaskSeparate __rglgen_glStencilMaskSeparate
-#define glAttachShader __rglgen_glAttachShader
-#define glBindAttribLocation __rglgen_glBindAttribLocation
-#define glCompileShader __rglgen_glCompileShader
-#define glCreateProgram __rglgen_glCreateProgram
-#define glCreateShader __rglgen_glCreateShader
-#define glDeleteProgram __rglgen_glDeleteProgram
-#define glDeleteShader __rglgen_glDeleteShader
-#define glDetachShader __rglgen_glDetachShader
-#define glDisableVertexAttribArray __rglgen_glDisableVertexAttribArray
-#define glEnableVertexAttribArray __rglgen_glEnableVertexAttribArray
-#define glGetActiveAttrib __rglgen_glGetActiveAttrib
-#define glGetActiveUniform __rglgen_glGetActiveUniform
-#define glGetAttachedShaders __rglgen_glGetAttachedShaders
-#define glGetAttribLocation __rglgen_glGetAttribLocation
-#define glGetProgramiv __rglgen_glGetProgramiv
-#define glGetProgramInfoLog __rglgen_glGetProgramInfoLog
-#define glGetShaderiv __rglgen_glGetShaderiv
-#define glGetShaderInfoLog __rglgen_glGetShaderInfoLog
-#define glGetShaderSource __rglgen_glGetShaderSource
-#define glGetUniformLocation __rglgen_glGetUniformLocation
-#define glGetUniformfv __rglgen_glGetUniformfv
-#define glGetUniformiv __rglgen_glGetUniformiv
-#define glGetVertexAttribdv __rglgen_glGetVertexAttribdv
-#define glGetVertexAttribfv __rglgen_glGetVertexAttribfv
-#define glGetVertexAttribiv __rglgen_glGetVertexAttribiv
-#define glGetVertexAttribPointerv __rglgen_glGetVertexAttribPointerv
-#define glIsProgram __rglgen_glIsProgram
-#define glIsShader __rglgen_glIsShader
-#define glLinkProgram __rglgen_glLinkProgram
-#define glShaderSource __rglgen_glShaderSource
-#define glUseProgram __rglgen_glUseProgram
-#define glUniform1f __rglgen_glUniform1f
-#define glUniform2f __rglgen_glUniform2f
-#define glUniform3f __rglgen_glUniform3f
-#define glUniform4f __rglgen_glUniform4f
-#define glUniform1i __rglgen_glUniform1i
-#define glUniform2i __rglgen_glUniform2i
-#define glUniform3i __rglgen_glUniform3i
-#define glUniform4i __rglgen_glUniform4i
-#define glUniform1fv __rglgen_glUniform1fv
-#define glUniform2fv __rglgen_glUniform2fv
-#define glUniform3fv __rglgen_glUniform3fv
-#define glUniform4fv __rglgen_glUniform4fv
-#define glUniform1iv __rglgen_glUniform1iv
-#define glUniform2iv __rglgen_glUniform2iv
-#define glUniform3iv __rglgen_glUniform3iv
-#define glUniform4iv __rglgen_glUniform4iv
-#define glUniformMatrix2fv __rglgen_glUniformMatrix2fv
-#define glUniformMatrix3fv __rglgen_glUniformMatrix3fv
-#define glUniformMatrix4fv __rglgen_glUniformMatrix4fv
-#define glValidateProgram __rglgen_glValidateProgram
-#define glVertexAttrib1d __rglgen_glVertexAttrib1d
-#define glVertexAttrib1dv __rglgen_glVertexAttrib1dv
-#define glVertexAttrib1f __rglgen_glVertexAttrib1f
-#define glVertexAttrib1fv __rglgen_glVertexAttrib1fv
-#define glVertexAttrib1s __rglgen_glVertexAttrib1s
-#define glVertexAttrib1sv __rglgen_glVertexAttrib1sv
-#define glVertexAttrib2d __rglgen_glVertexAttrib2d
-#define glVertexAttrib2dv __rglgen_glVertexAttrib2dv
-#define glVertexAttrib2f __rglgen_glVertexAttrib2f
-#define glVertexAttrib2fv __rglgen_glVertexAttrib2fv
-#define glVertexAttrib2s __rglgen_glVertexAttrib2s
-#define glVertexAttrib2sv __rglgen_glVertexAttrib2sv
-#define glVertexAttrib3d __rglgen_glVertexAttrib3d
-#define glVertexAttrib3dv __rglgen_glVertexAttrib3dv
-#define glVertexAttrib3f __rglgen_glVertexAttrib3f
-#define glVertexAttrib3fv __rglgen_glVertexAttrib3fv
-#define glVertexAttrib3s __rglgen_glVertexAttrib3s
-#define glVertexAttrib3sv __rglgen_glVertexAttrib3sv
-#define glVertexAttrib4Nbv __rglgen_glVertexAttrib4Nbv
-#define glVertexAttrib4Niv __rglgen_glVertexAttrib4Niv
-#define glVertexAttrib4Nsv __rglgen_glVertexAttrib4Nsv
-#define glVertexAttrib4Nub __rglgen_glVertexAttrib4Nub
-#define glVertexAttrib4Nubv __rglgen_glVertexAttrib4Nubv
-#define glVertexAttrib4Nuiv __rglgen_glVertexAttrib4Nuiv
-#define glVertexAttrib4Nusv __rglgen_glVertexAttrib4Nusv
-#define glVertexAttrib4bv __rglgen_glVertexAttrib4bv
-#define glVertexAttrib4d __rglgen_glVertexAttrib4d
-#define glVertexAttrib4dv __rglgen_glVertexAttrib4dv
-#define glVertexAttrib4f __rglgen_glVertexAttrib4f
-#define glVertexAttrib4fv __rglgen_glVertexAttrib4fv
-#define glVertexAttrib4iv __rglgen_glVertexAttrib4iv
-#define glVertexAttrib4s __rglgen_glVertexAttrib4s
-#define glVertexAttrib4sv __rglgen_glVertexAttrib4sv
-#define glVertexAttrib4ubv __rglgen_glVertexAttrib4ubv
-#define glVertexAttrib4uiv __rglgen_glVertexAttrib4uiv
-#define glVertexAttrib4usv __rglgen_glVertexAttrib4usv
-#define glVertexAttribPointer __rglgen_glVertexAttribPointer
-#define glUniformMatrix2x3fv __rglgen_glUniformMatrix2x3fv
-#define glUniformMatrix3x2fv __rglgen_glUniformMatrix3x2fv
-#define glUniformMatrix2x4fv __rglgen_glUniformMatrix2x4fv
-#define glUniformMatrix4x2fv __rglgen_glUniformMatrix4x2fv
-#define glUniformMatrix3x4fv __rglgen_glUniformMatrix3x4fv
-#define glUniformMatrix4x3fv __rglgen_glUniformMatrix4x3fv
-#define glColorMaski __rglgen_glColorMaski
-#define glGetBooleani_v __rglgen_glGetBooleani_v
-#define glGetIntegeri_v __rglgen_glGetIntegeri_v
-#define glEnablei __rglgen_glEnablei
-#define glDisablei __rglgen_glDisablei
-#define glIsEnabledi __rglgen_glIsEnabledi
-#define glBeginTransformFeedback __rglgen_glBeginTransformFeedback
-#define glEndTransformFeedback __rglgen_glEndTransformFeedback
-#define glBindBufferRange __rglgen_glBindBufferRange
-#define glBindBufferBase __rglgen_glBindBufferBase
-#define glTransformFeedbackVaryings __rglgen_glTransformFeedbackVaryings
-#define glGetTransformFeedbackVarying __rglgen_glGetTransformFeedbackVarying
-#define glClampColor __rglgen_glClampColor
-#define glBeginConditionalRender __rglgen_glBeginConditionalRender
-#define glEndConditionalRender __rglgen_glEndConditionalRender
-#define glVertexAttribIPointer __rglgen_glVertexAttribIPointer
-#define glGetVertexAttribIiv __rglgen_glGetVertexAttribIiv
-#define glGetVertexAttribIuiv __rglgen_glGetVertexAttribIuiv
-#define glVertexAttribI1i __rglgen_glVertexAttribI1i
-#define glVertexAttribI2i __rglgen_glVertexAttribI2i
-#define glVertexAttribI3i __rglgen_glVertexAttribI3i
-#define glVertexAttribI4i __rglgen_glVertexAttribI4i
-#define glVertexAttribI1ui __rglgen_glVertexAttribI1ui
-#define glVertexAttribI2ui __rglgen_glVertexAttribI2ui
-#define glVertexAttribI3ui __rglgen_glVertexAttribI3ui
-#define glVertexAttribI4ui __rglgen_glVertexAttribI4ui
-#define glVertexAttribI1iv __rglgen_glVertexAttribI1iv
-#define glVertexAttribI2iv __rglgen_glVertexAttribI2iv
-#define glVertexAttribI3iv __rglgen_glVertexAttribI3iv
-#define glVertexAttribI4iv __rglgen_glVertexAttribI4iv
-#define glVertexAttribI1uiv __rglgen_glVertexAttribI1uiv
-#define glVertexAttribI2uiv __rglgen_glVertexAttribI2uiv
-#define glVertexAttribI3uiv __rglgen_glVertexAttribI3uiv
-#define glVertexAttribI4uiv __rglgen_glVertexAttribI4uiv
-#define glVertexAttribI4bv __rglgen_glVertexAttribI4bv
-#define glVertexAttribI4sv __rglgen_glVertexAttribI4sv
-#define glVertexAttribI4ubv __rglgen_glVertexAttribI4ubv
-#define glVertexAttribI4usv __rglgen_glVertexAttribI4usv
-#define glGetUniformuiv __rglgen_glGetUniformuiv
-#define glBindFragDataLocation __rglgen_glBindFragDataLocation
-#define glGetFragDataLocation __rglgen_glGetFragDataLocation
-#define glUniform1ui __rglgen_glUniform1ui
-#define glUniform2ui __rglgen_glUniform2ui
-#define glUniform3ui __rglgen_glUniform3ui
-#define glUniform4ui __rglgen_glUniform4ui
-#define glUniform1uiv __rglgen_glUniform1uiv
-#define glUniform2uiv __rglgen_glUniform2uiv
-#define glUniform3uiv __rglgen_glUniform3uiv
-#define glUniform4uiv __rglgen_glUniform4uiv
-#define glTexParameterIiv __rglgen_glTexParameterIiv
-#define glTexParameterIuiv __rglgen_glTexParameterIuiv
-#define glGetTexParameterIiv __rglgen_glGetTexParameterIiv
-#define glGetTexParameterIuiv __rglgen_glGetTexParameterIuiv
-#define glClearBufferiv __rglgen_glClearBufferiv
-#define glClearBufferuiv __rglgen_glClearBufferuiv
-#define glClearBufferfv __rglgen_glClearBufferfv
-#define glClearBufferfi __rglgen_glClearBufferfi
-#define glGetStringi __rglgen_glGetStringi
-#define glIsRenderbuffer __rglgen_glIsRenderbuffer
-#define glBindRenderbuffer __rglgen_glBindRenderbuffer
-#define glDeleteRenderbuffers __rglgen_glDeleteRenderbuffers
-#define glGenRenderbuffers __rglgen_glGenRenderbuffers
-#define glRenderbufferStorage __rglgen_glRenderbufferStorage
-#define glGetRenderbufferParameteriv __rglgen_glGetRenderbufferParameteriv
-#define glIsFramebuffer __rglgen_glIsFramebuffer
-#define glBindFramebuffer __rglgen_glBindFramebuffer
-#define glDeleteFramebuffers __rglgen_glDeleteFramebuffers
-#define glGenFramebuffers __rglgen_glGenFramebuffers
-#define glCheckFramebufferStatus __rglgen_glCheckFramebufferStatus
-#define glFramebufferTexture1D __rglgen_glFramebufferTexture1D
-#define glFramebufferTexture2D __rglgen_glFramebufferTexture2D
-#define glFramebufferTexture3D __rglgen_glFramebufferTexture3D
-#define glFramebufferRenderbuffer __rglgen_glFramebufferRenderbuffer
-#define glGetFramebufferAttachmentParameteriv __rglgen_glGetFramebufferAttachmentParameteriv
-#define glGenerateMipmap __rglgen_glGenerateMipmap
-#define glBlitFramebuffer __rglgen_glBlitFramebuffer
-#define glRenderbufferStorageMultisample __rglgen_glRenderbufferStorageMultisample
-#define glFramebufferTextureLayer __rglgen_glFramebufferTextureLayer
-#define glMapBufferRange __rglgen_glMapBufferRange
-#define glFlushMappedBufferRange __rglgen_glFlushMappedBufferRange
-#define glBindVertexArray __rglgen_glBindVertexArray
-#define glDeleteVertexArrays __rglgen_glDeleteVertexArrays
-#define glGenVertexArrays __rglgen_glGenVertexArrays
-#define glIsVertexArray __rglgen_glIsVertexArray
-#define glDrawArraysInstanced __rglgen_glDrawArraysInstanced
-#define glDrawElementsInstanced __rglgen_glDrawElementsInstanced
-#define glTexBuffer __rglgen_glTexBuffer
-#define glPrimitiveRestartIndex __rglgen_glPrimitiveRestartIndex
-#define glCopyBufferSubData __rglgen_glCopyBufferSubData
-#define glGetUniformIndices __rglgen_glGetUniformIndices
-#define glGetActiveUniformsiv __rglgen_glGetActiveUniformsiv
-#define glGetActiveUniformName __rglgen_glGetActiveUniformName
-#define glGetUniformBlockIndex __rglgen_glGetUniformBlockIndex
-#define glGetActiveUniformBlockiv __rglgen_glGetActiveUniformBlockiv
-#define glGetActiveUniformBlockName __rglgen_glGetActiveUniformBlockName
-#define glUniformBlockBinding __rglgen_glUniformBlockBinding
-#define glDrawElementsBaseVertex __rglgen_glDrawElementsBaseVertex
-#define glDrawRangeElementsBaseVertex __rglgen_glDrawRangeElementsBaseVertex
-#define glDrawElementsInstancedBaseVertex __rglgen_glDrawElementsInstancedBaseVertex
-#define glMultiDrawElementsBaseVertex __rglgen_glMultiDrawElementsBaseVertex
-#define glProvokingVertex __rglgen_glProvokingVertex
-#define glFenceSync __rglgen_glFenceSync
-#define glIsSync __rglgen_glIsSync
-#define glDeleteSync __rglgen_glDeleteSync
-#define glClientWaitSync __rglgen_glClientWaitSync
-#define glWaitSync __rglgen_glWaitSync
-#define glGetInteger64v __rglgen_glGetInteger64v
-#define glGetSynciv __rglgen_glGetSynciv
-#define glGetInteger64i_v __rglgen_glGetInteger64i_v
-#define glGetBufferParameteri64v __rglgen_glGetBufferParameteri64v
-#define glFramebufferTexture __rglgen_glFramebufferTexture
-#define glTexImage2DMultisample __rglgen_glTexImage2DMultisample
-#define glTexImage3DMultisample __rglgen_glTexImage3DMultisample
-#define glGetMultisamplefv __rglgen_glGetMultisamplefv
-#define glSampleMaski __rglgen_glSampleMaski
-#define glBindFragDataLocationIndexed __rglgen_glBindFragDataLocationIndexed
-#define glGetFragDataIndex __rglgen_glGetFragDataIndex
-#define glGenSamplers __rglgen_glGenSamplers
-#define glDeleteSamplers __rglgen_glDeleteSamplers
-#define glIsSampler __rglgen_glIsSampler
-#define glBindSampler __rglgen_glBindSampler
-#define glSamplerParameteri __rglgen_glSamplerParameteri
-#define glSamplerParameteriv __rglgen_glSamplerParameteriv
-#define glSamplerParameterf __rglgen_glSamplerParameterf
-#define glSamplerParameterfv __rglgen_glSamplerParameterfv
-#define glSamplerParameterIiv __rglgen_glSamplerParameterIiv
-#define glSamplerParameterIuiv __rglgen_glSamplerParameterIuiv
-#define glGetSamplerParameteriv __rglgen_glGetSamplerParameteriv
-#define glGetSamplerParameterIiv __rglgen_glGetSamplerParameterIiv
-#define glGetSamplerParameterfv __rglgen_glGetSamplerParameterfv
-#define glGetSamplerParameterIuiv __rglgen_glGetSamplerParameterIuiv
-#define glQueryCounter __rglgen_glQueryCounter
-#define glGetQueryObjecti64v __rglgen_glGetQueryObjecti64v
-#define glGetQueryObjectui64v __rglgen_glGetQueryObjectui64v
-#define glVertexAttribDivisor __rglgen_glVertexAttribDivisor
-#define glVertexAttribP1ui __rglgen_glVertexAttribP1ui
-#define glVertexAttribP1uiv __rglgen_glVertexAttribP1uiv
-#define glVertexAttribP2ui __rglgen_glVertexAttribP2ui
-#define glVertexAttribP2uiv __rglgen_glVertexAttribP2uiv
-#define glVertexAttribP3ui __rglgen_glVertexAttribP3ui
-#define glVertexAttribP3uiv __rglgen_glVertexAttribP3uiv
-#define glVertexAttribP4ui __rglgen_glVertexAttribP4ui
-#define glVertexAttribP4uiv __rglgen_glVertexAttribP4uiv
-#define glVertexP2ui __rglgen_glVertexP2ui
-#define glVertexP2uiv __rglgen_glVertexP2uiv
-#define glVertexP3ui __rglgen_glVertexP3ui
-#define glVertexP3uiv __rglgen_glVertexP3uiv
-#define glVertexP4ui __rglgen_glVertexP4ui
-#define glVertexP4uiv __rglgen_glVertexP4uiv
-#define glTexCoordP1ui __rglgen_glTexCoordP1ui
-#define glTexCoordP1uiv __rglgen_glTexCoordP1uiv
-#define glTexCoordP2ui __rglgen_glTexCoordP2ui
-#define glTexCoordP2uiv __rglgen_glTexCoordP2uiv
-#define glTexCoordP3ui __rglgen_glTexCoordP3ui
-#define glTexCoordP3uiv __rglgen_glTexCoordP3uiv
-#define glTexCoordP4ui __rglgen_glTexCoordP4ui
-#define glTexCoordP4uiv __rglgen_glTexCoordP4uiv
-#define glMultiTexCoordP1ui __rglgen_glMultiTexCoordP1ui
-#define glMultiTexCoordP1uiv __rglgen_glMultiTexCoordP1uiv
-#define glMultiTexCoordP2ui __rglgen_glMultiTexCoordP2ui
-#define glMultiTexCoordP2uiv __rglgen_glMultiTexCoordP2uiv
-#define glMultiTexCoordP3ui __rglgen_glMultiTexCoordP3ui
-#define glMultiTexCoordP3uiv __rglgen_glMultiTexCoordP3uiv
-#define glMultiTexCoordP4ui __rglgen_glMultiTexCoordP4ui
-#define glMultiTexCoordP4uiv __rglgen_glMultiTexCoordP4uiv
-#define glNormalP3ui __rglgen_glNormalP3ui
-#define glNormalP3uiv __rglgen_glNormalP3uiv
-#define glColorP3ui __rglgen_glColorP3ui
-#define glColorP3uiv __rglgen_glColorP3uiv
-#define glColorP4ui __rglgen_glColorP4ui
-#define glColorP4uiv __rglgen_glColorP4uiv
-#define glSecondaryColorP3ui __rglgen_glSecondaryColorP3ui
-#define glSecondaryColorP3uiv __rglgen_glSecondaryColorP3uiv
-#define glMinSampleShading __rglgen_glMinSampleShading
-#define glBlendEquationi __rglgen_glBlendEquationi
-#define glBlendEquationSeparatei __rglgen_glBlendEquationSeparatei
-#define glBlendFunci __rglgen_glBlendFunci
-#define glBlendFuncSeparatei __rglgen_glBlendFuncSeparatei
-#define glDrawArraysIndirect __rglgen_glDrawArraysIndirect
-#define glDrawElementsIndirect __rglgen_glDrawElementsIndirect
-#define glUniform1d __rglgen_glUniform1d
-#define glUniform2d __rglgen_glUniform2d
-#define glUniform3d __rglgen_glUniform3d
-#define glUniform4d __rglgen_glUniform4d
-#define glUniform1dv __rglgen_glUniform1dv
-#define glUniform2dv __rglgen_glUniform2dv
-#define glUniform3dv __rglgen_glUniform3dv
-#define glUniform4dv __rglgen_glUniform4dv
-#define glUniformMatrix2dv __rglgen_glUniformMatrix2dv
-#define glUniformMatrix3dv __rglgen_glUniformMatrix3dv
-#define glUniformMatrix4dv __rglgen_glUniformMatrix4dv
-#define glUniformMatrix2x3dv __rglgen_glUniformMatrix2x3dv
-#define glUniformMatrix2x4dv __rglgen_glUniformMatrix2x4dv
-#define glUniformMatrix3x2dv __rglgen_glUniformMatrix3x2dv
-#define glUniformMatrix3x4dv __rglgen_glUniformMatrix3x4dv
-#define glUniformMatrix4x2dv __rglgen_glUniformMatrix4x2dv
-#define glUniformMatrix4x3dv __rglgen_glUniformMatrix4x3dv
-#define glGetUniformdv __rglgen_glGetUniformdv
-#define glGetSubroutineUniformLocation __rglgen_glGetSubroutineUniformLocation
-#define glGetSubroutineIndex __rglgen_glGetSubroutineIndex
-#define glGetActiveSubroutineUniformiv __rglgen_glGetActiveSubroutineUniformiv
-#define glGetActiveSubroutineUniformName __rglgen_glGetActiveSubroutineUniformName
-#define glGetActiveSubroutineName __rglgen_glGetActiveSubroutineName
-#define glUniformSubroutinesuiv __rglgen_glUniformSubroutinesuiv
-#define glGetUniformSubroutineuiv __rglgen_glGetUniformSubroutineuiv
-#define glGetProgramStageiv __rglgen_glGetProgramStageiv
-#define glPatchParameteri __rglgen_glPatchParameteri
-#define glPatchParameterfv __rglgen_glPatchParameterfv
-#define glBindTransformFeedback __rglgen_glBindTransformFeedback
-#define glDeleteTransformFeedbacks __rglgen_glDeleteTransformFeedbacks
-#define glGenTransformFeedbacks __rglgen_glGenTransformFeedbacks
-#define glIsTransformFeedback __rglgen_glIsTransformFeedback
-#define glPauseTransformFeedback __rglgen_glPauseTransformFeedback
-#define glResumeTransformFeedback __rglgen_glResumeTransformFeedback
-#define glDrawTransformFeedback __rglgen_glDrawTransformFeedback
-#define glDrawTransformFeedbackStream __rglgen_glDrawTransformFeedbackStream
-#define glBeginQueryIndexed __rglgen_glBeginQueryIndexed
-#define glEndQueryIndexed __rglgen_glEndQueryIndexed
-#define glGetQueryIndexediv __rglgen_glGetQueryIndexediv
-#define glReleaseShaderCompiler __rglgen_glReleaseShaderCompiler
-#define glShaderBinary __rglgen_glShaderBinary
-#define glGetShaderPrecisionFormat __rglgen_glGetShaderPrecisionFormat
-#define glDepthRangef __rglgen_glDepthRangef
-#define glClearDepthf __rglgen_glClearDepthf
-#define glGetProgramBinary __rglgen_glGetProgramBinary
-#define glProgramBinary __rglgen_glProgramBinary
-#define glProgramParameteri __rglgen_glProgramParameteri
-#define glUseProgramStages __rglgen_glUseProgramStages
-#define glActiveShaderProgram __rglgen_glActiveShaderProgram
-#define glCreateShaderProgramv __rglgen_glCreateShaderProgramv
-#define glBindProgramPipeline __rglgen_glBindProgramPipeline
-#define glDeleteProgramPipelines __rglgen_glDeleteProgramPipelines
-#define glGenProgramPipelines __rglgen_glGenProgramPipelines
-#define glIsProgramPipeline __rglgen_glIsProgramPipeline
-#define glGetProgramPipelineiv __rglgen_glGetProgramPipelineiv
-#define glProgramUniform1i __rglgen_glProgramUniform1i
-#define glProgramUniform1iv __rglgen_glProgramUniform1iv
-#define glProgramUniform1f __rglgen_glProgramUniform1f
-#define glProgramUniform1fv __rglgen_glProgramUniform1fv
-#define glProgramUniform1d __rglgen_glProgramUniform1d
-#define glProgramUniform1dv __rglgen_glProgramUniform1dv
-#define glProgramUniform1ui __rglgen_glProgramUniform1ui
-#define glProgramUniform1uiv __rglgen_glProgramUniform1uiv
-#define glProgramUniform2i __rglgen_glProgramUniform2i
-#define glProgramUniform2iv __rglgen_glProgramUniform2iv
-#define glProgramUniform2f __rglgen_glProgramUniform2f
-#define glProgramUniform2fv __rglgen_glProgramUniform2fv
-#define glProgramUniform2d __rglgen_glProgramUniform2d
-#define glProgramUniform2dv __rglgen_glProgramUniform2dv
-#define glProgramUniform2ui __rglgen_glProgramUniform2ui
-#define glProgramUniform2uiv __rglgen_glProgramUniform2uiv
-#define glProgramUniform3i __rglgen_glProgramUniform3i
-#define glProgramUniform3iv __rglgen_glProgramUniform3iv
-#define glProgramUniform3f __rglgen_glProgramUniform3f
-#define glProgramUniform3fv __rglgen_glProgramUniform3fv
-#define glProgramUniform3d __rglgen_glProgramUniform3d
-#define glProgramUniform3dv __rglgen_glProgramUniform3dv
-#define glProgramUniform3ui __rglgen_glProgramUniform3ui
-#define glProgramUniform3uiv __rglgen_glProgramUniform3uiv
-#define glProgramUniform4i __rglgen_glProgramUniform4i
-#define glProgramUniform4iv __rglgen_glProgramUniform4iv
-#define glProgramUniform4f __rglgen_glProgramUniform4f
-#define glProgramUniform4fv __rglgen_glProgramUniform4fv
-#define glProgramUniform4d __rglgen_glProgramUniform4d
-#define glProgramUniform4dv __rglgen_glProgramUniform4dv
-#define glProgramUniform4ui __rglgen_glProgramUniform4ui
-#define glProgramUniform4uiv __rglgen_glProgramUniform4uiv
-#define glProgramUniformMatrix2fv __rglgen_glProgramUniformMatrix2fv
-#define glProgramUniformMatrix3fv __rglgen_glProgramUniformMatrix3fv
-#define glProgramUniformMatrix4fv __rglgen_glProgramUniformMatrix4fv
-#define glProgramUniformMatrix2dv __rglgen_glProgramUniformMatrix2dv
-#define glProgramUniformMatrix3dv __rglgen_glProgramUniformMatrix3dv
-#define glProgramUniformMatrix4dv __rglgen_glProgramUniformMatrix4dv
-#define glProgramUniformMatrix2x3fv __rglgen_glProgramUniformMatrix2x3fv
-#define glProgramUniformMatrix3x2fv __rglgen_glProgramUniformMatrix3x2fv
-#define glProgramUniformMatrix2x4fv __rglgen_glProgramUniformMatrix2x4fv
-#define glProgramUniformMatrix4x2fv __rglgen_glProgramUniformMatrix4x2fv
-#define glProgramUniformMatrix3x4fv __rglgen_glProgramUniformMatrix3x4fv
-#define glProgramUniformMatrix4x3fv __rglgen_glProgramUniformMatrix4x3fv
-#define glProgramUniformMatrix2x3dv __rglgen_glProgramUniformMatrix2x3dv
-#define glProgramUniformMatrix3x2dv __rglgen_glProgramUniformMatrix3x2dv
-#define glProgramUniformMatrix2x4dv __rglgen_glProgramUniformMatrix2x4dv
-#define glProgramUniformMatrix4x2dv __rglgen_glProgramUniformMatrix4x2dv
-#define glProgramUniformMatrix3x4dv __rglgen_glProgramUniformMatrix3x4dv
-#define glProgramUniformMatrix4x3dv __rglgen_glProgramUniformMatrix4x3dv
-#define glValidateProgramPipeline __rglgen_glValidateProgramPipeline
-#define glGetProgramPipelineInfoLog __rglgen_glGetProgramPipelineInfoLog
-#define glVertexAttribL1d __rglgen_glVertexAttribL1d
-#define glVertexAttribL2d __rglgen_glVertexAttribL2d
-#define glVertexAttribL3d __rglgen_glVertexAttribL3d
-#define glVertexAttribL4d __rglgen_glVertexAttribL4d
-#define glVertexAttribL1dv __rglgen_glVertexAttribL1dv
-#define glVertexAttribL2dv __rglgen_glVertexAttribL2dv
-#define glVertexAttribL3dv __rglgen_glVertexAttribL3dv
-#define glVertexAttribL4dv __rglgen_glVertexAttribL4dv
-#define glVertexAttribLPointer __rglgen_glVertexAttribLPointer
-#define glGetVertexAttribLdv __rglgen_glGetVertexAttribLdv
-#define glViewportArrayv __rglgen_glViewportArrayv
-#define glViewportIndexedf __rglgen_glViewportIndexedf
-#define glViewportIndexedfv __rglgen_glViewportIndexedfv
-#define glScissorArrayv __rglgen_glScissorArrayv
-#define glScissorIndexed __rglgen_glScissorIndexed
-#define glScissorIndexedv __rglgen_glScissorIndexedv
-#define glDepthRangeArrayv __rglgen_glDepthRangeArrayv
-#define glDepthRangeIndexed __rglgen_glDepthRangeIndexed
-#define glGetFloati_v __rglgen_glGetFloati_v
-#define glGetDoublei_v __rglgen_glGetDoublei_v
-#define glDrawArraysInstancedBaseInstance __rglgen_glDrawArraysInstancedBaseInstance
-#define glDrawElementsInstancedBaseInstance __rglgen_glDrawElementsInstancedBaseInstance
-#define glDrawElementsInstancedBaseVertexBaseInstance __rglgen_glDrawElementsInstancedBaseVertexBaseInstance
-#define glGetInternalformativ __rglgen_glGetInternalformativ
-#define glGetActiveAtomicCounterBufferiv __rglgen_glGetActiveAtomicCounterBufferiv
-#define glBindImageTexture __rglgen_glBindImageTexture
-#define glMemoryBarrier __rglgen_glMemoryBarrier
-#define glTexStorage1D __rglgen_glTexStorage1D
-#define glTexStorage2D __rglgen_glTexStorage2D
-#define glTexStorage3D __rglgen_glTexStorage3D
-#define glDrawTransformFeedbackInstanced __rglgen_glDrawTransformFeedbackInstanced
-#define glDrawTransformFeedbackStreamInstanced __rglgen_glDrawTransformFeedbackStreamInstanced
-#define glClearBufferData __rglgen_glClearBufferData
-#define glClearBufferSubData __rglgen_glClearBufferSubData
-#define glDispatchCompute __rglgen_glDispatchCompute
-#define glDispatchComputeIndirect __rglgen_glDispatchComputeIndirect
-#define glCopyImageSubData __rglgen_glCopyImageSubData
-#define glFramebufferParameteri __rglgen_glFramebufferParameteri
-#define glGetFramebufferParameteriv __rglgen_glGetFramebufferParameteriv
-#define glGetInternalformati64v __rglgen_glGetInternalformati64v
-#define glInvalidateTexSubImage __rglgen_glInvalidateTexSubImage
-#define glInvalidateTexImage __rglgen_glInvalidateTexImage
-#define glInvalidateBufferSubData __rglgen_glInvalidateBufferSubData
-#define glInvalidateBufferData __rglgen_glInvalidateBufferData
-#define glInvalidateFramebuffer __rglgen_glInvalidateFramebuffer
-#define glInvalidateSubFramebuffer __rglgen_glInvalidateSubFramebuffer
-#define glMultiDrawArraysIndirect __rglgen_glMultiDrawArraysIndirect
-#define glMultiDrawElementsIndirect __rglgen_glMultiDrawElementsIndirect
-#define glGetProgramInterfaceiv __rglgen_glGetProgramInterfaceiv
-#define glGetProgramResourceIndex __rglgen_glGetProgramResourceIndex
-#define glGetProgramResourceName __rglgen_glGetProgramResourceName
-#define glGetProgramResourceiv __rglgen_glGetProgramResourceiv
-#define glGetProgramResourceLocation __rglgen_glGetProgramResourceLocation
-#define glGetProgramResourceLocationIndex __rglgen_glGetProgramResourceLocationIndex
-#define glShaderStorageBlockBinding __rglgen_glShaderStorageBlockBinding
-#define glTexBufferRange __rglgen_glTexBufferRange
-#define glTexStorage2DMultisample __rglgen_glTexStorage2DMultisample
-#define glTexStorage3DMultisample __rglgen_glTexStorage3DMultisample
-#define glTextureView __rglgen_glTextureView
-#define glBindVertexBuffer __rglgen_glBindVertexBuffer
-#define glVertexAttribFormat __rglgen_glVertexAttribFormat
-#define glVertexAttribIFormat __rglgen_glVertexAttribIFormat
-#define glVertexAttribLFormat __rglgen_glVertexAttribLFormat
-#define glVertexAttribBinding __rglgen_glVertexAttribBinding
-#define glVertexBindingDivisor __rglgen_glVertexBindingDivisor
-#define glDebugMessageControl __rglgen_glDebugMessageControl
-#define glDebugMessageInsert __rglgen_glDebugMessageInsert
-#define glDebugMessageCallback __rglgen_glDebugMessageCallback
-#define glGetDebugMessageLog __rglgen_glGetDebugMessageLog
-#define glPushDebugGroup __rglgen_glPushDebugGroup
-#define glPopDebugGroup __rglgen_glPopDebugGroup
-#define glObjectLabel __rglgen_glObjectLabel
-#define glGetObjectLabel __rglgen_glGetObjectLabel
-#define glObjectPtrLabel __rglgen_glObjectPtrLabel
-#define glGetObjectPtrLabel __rglgen_glGetObjectPtrLabel
-#define glBufferStorage __rglgen_glBufferStorage
-#define glClearTexImage __rglgen_glClearTexImage
-#define glClearTexSubImage __rglgen_glClearTexSubImage
-#define glBindBuffersBase __rglgen_glBindBuffersBase
-#define glBindBuffersRange __rglgen_glBindBuffersRange
-#define glBindTextures __rglgen_glBindTextures
-#define glBindSamplers __rglgen_glBindSamplers
-#define glBindImageTextures __rglgen_glBindImageTextures
-#define glBindVertexBuffers __rglgen_glBindVertexBuffers
-#define glGetTextureHandleARB __rglgen_glGetTextureHandleARB
-#define glGetTextureSamplerHandleARB __rglgen_glGetTextureSamplerHandleARB
-#define glMakeTextureHandleResidentARB __rglgen_glMakeTextureHandleResidentARB
-#define glMakeTextureHandleNonResidentARB __rglgen_glMakeTextureHandleNonResidentARB
-#define glGetImageHandleARB __rglgen_glGetImageHandleARB
-#define glMakeImageHandleResidentARB __rglgen_glMakeImageHandleResidentARB
-#define glMakeImageHandleNonResidentARB __rglgen_glMakeImageHandleNonResidentARB
-#define glUniformHandleui64ARB __rglgen_glUniformHandleui64ARB
-#define glUniformHandleui64vARB __rglgen_glUniformHandleui64vARB
-#define glProgramUniformHandleui64ARB __rglgen_glProgramUniformHandleui64ARB
-#define glProgramUniformHandleui64vARB __rglgen_glProgramUniformHandleui64vARB
-#define glIsTextureHandleResidentARB __rglgen_glIsTextureHandleResidentARB
-#define glIsImageHandleResidentARB __rglgen_glIsImageHandleResidentARB
-#define glVertexAttribL1ui64ARB __rglgen_glVertexAttribL1ui64ARB
-#define glVertexAttribL1ui64vARB __rglgen_glVertexAttribL1ui64vARB
-#define glGetVertexAttribLui64vARB __rglgen_glGetVertexAttribLui64vARB
-#define glCreateSyncFromCLeventARB __rglgen_glCreateSyncFromCLeventARB
-#define glClampColorARB __rglgen_glClampColorARB
-#define glDispatchComputeGroupSizeARB __rglgen_glDispatchComputeGroupSizeARB
-#define glDebugMessageControlARB __rglgen_glDebugMessageControlARB
-#define glDebugMessageInsertARB __rglgen_glDebugMessageInsertARB
-#define glDebugMessageCallbackARB __rglgen_glDebugMessageCallbackARB
-#define glGetDebugMessageLogARB __rglgen_glGetDebugMessageLogARB
-#define glDrawBuffersARB __rglgen_glDrawBuffersARB
-#define glBlendEquationiARB __rglgen_glBlendEquationiARB
-#define glBlendEquationSeparateiARB __rglgen_glBlendEquationSeparateiARB
-#define glBlendFunciARB __rglgen_glBlendFunciARB
-#define glBlendFuncSeparateiARB __rglgen_glBlendFuncSeparateiARB
-#define glDrawArraysInstancedARB __rglgen_glDrawArraysInstancedARB
-#define glDrawElementsInstancedARB __rglgen_glDrawElementsInstancedARB
-#define glProgramStringARB __rglgen_glProgramStringARB
-#define glBindProgramARB __rglgen_glBindProgramARB
-#define glDeleteProgramsARB __rglgen_glDeleteProgramsARB
-#define glGenProgramsARB __rglgen_glGenProgramsARB
-#define glProgramEnvParameter4dARB __rglgen_glProgramEnvParameter4dARB
-#define glProgramEnvParameter4dvARB __rglgen_glProgramEnvParameter4dvARB
-#define glProgramEnvParameter4fARB __rglgen_glProgramEnvParameter4fARB
-#define glProgramEnvParameter4fvARB __rglgen_glProgramEnvParameter4fvARB
-#define glProgramLocalParameter4dARB __rglgen_glProgramLocalParameter4dARB
-#define glProgramLocalParameter4dvARB __rglgen_glProgramLocalParameter4dvARB
-#define glProgramLocalParameter4fARB __rglgen_glProgramLocalParameter4fARB
-#define glProgramLocalParameter4fvARB __rglgen_glProgramLocalParameter4fvARB
-#define glGetProgramEnvParameterdvARB __rglgen_glGetProgramEnvParameterdvARB
-#define glGetProgramEnvParameterfvARB __rglgen_glGetProgramEnvParameterfvARB
-#define glGetProgramLocalParameterdvARB __rglgen_glGetProgramLocalParameterdvARB
-#define glGetProgramLocalParameterfvARB __rglgen_glGetProgramLocalParameterfvARB
-#define glGetProgramivARB __rglgen_glGetProgramivARB
-#define glGetProgramStringARB __rglgen_glGetProgramStringARB
-#define glIsProgramARB __rglgen_glIsProgramARB
-#define glProgramParameteriARB __rglgen_glProgramParameteriARB
-#define glFramebufferTextureARB __rglgen_glFramebufferTextureARB
-#define glFramebufferTextureLayerARB __rglgen_glFramebufferTextureLayerARB
-#define glFramebufferTextureFaceARB __rglgen_glFramebufferTextureFaceARB
-#define glColorTable __rglgen_glColorTable
-#define glColorTableParameterfv __rglgen_glColorTableParameterfv
-#define glColorTableParameteriv __rglgen_glColorTableParameteriv
-#define glCopyColorTable __rglgen_glCopyColorTable
-#define glGetColorTable __rglgen_glGetColorTable
-#define glGetColorTableParameterfv __rglgen_glGetColorTableParameterfv
-#define glGetColorTableParameteriv __rglgen_glGetColorTableParameteriv
-#define glColorSubTable __rglgen_glColorSubTable
-#define glCopyColorSubTable __rglgen_glCopyColorSubTable
-#define glConvolutionFilter1D __rglgen_glConvolutionFilter1D
-#define glConvolutionFilter2D __rglgen_glConvolutionFilter2D
-#define glConvolutionParameterf __rglgen_glConvolutionParameterf
-#define glConvolutionParameterfv __rglgen_glConvolutionParameterfv
-#define glConvolutionParameteri __rglgen_glConvolutionParameteri
-#define glConvolutionParameteriv __rglgen_glConvolutionParameteriv
-#define glCopyConvolutionFilter1D __rglgen_glCopyConvolutionFilter1D
-#define glCopyConvolutionFilter2D __rglgen_glCopyConvolutionFilter2D
-#define glGetConvolutionFilter __rglgen_glGetConvolutionFilter
-#define glGetConvolutionParameterfv __rglgen_glGetConvolutionParameterfv
-#define glGetConvolutionParameteriv __rglgen_glGetConvolutionParameteriv
-#define glGetSeparableFilter __rglgen_glGetSeparableFilter
-#define glSeparableFilter2D __rglgen_glSeparableFilter2D
-#define glGetHistogram __rglgen_glGetHistogram
-#define glGetHistogramParameterfv __rglgen_glGetHistogramParameterfv
-#define glGetHistogramParameteriv __rglgen_glGetHistogramParameteriv
-#define glGetMinmax __rglgen_glGetMinmax
-#define glGetMinmaxParameterfv __rglgen_glGetMinmaxParameterfv
-#define glGetMinmaxParameteriv __rglgen_glGetMinmaxParameteriv
-#define glHistogram __rglgen_glHistogram
-#define glMinmax __rglgen_glMinmax
-#define glResetHistogram __rglgen_glResetHistogram
-#define glResetMinmax __rglgen_glResetMinmax
-#define glMultiDrawArraysIndirectCountARB __rglgen_glMultiDrawArraysIndirectCountARB
-#define glMultiDrawElementsIndirectCountARB __rglgen_glMultiDrawElementsIndirectCountARB
-#define glVertexAttribDivisorARB __rglgen_glVertexAttribDivisorARB
-#define glCurrentPaletteMatrixARB __rglgen_glCurrentPaletteMatrixARB
-#define glMatrixIndexubvARB __rglgen_glMatrixIndexubvARB
-#define glMatrixIndexusvARB __rglgen_glMatrixIndexusvARB
-#define glMatrixIndexuivARB __rglgen_glMatrixIndexuivARB
-#define glMatrixIndexPointerARB __rglgen_glMatrixIndexPointerARB
-#define glSampleCoverageARB __rglgen_glSampleCoverageARB
-#define glActiveTextureARB __rglgen_glActiveTextureARB
-#define glClientActiveTextureARB __rglgen_glClientActiveTextureARB
-#define glMultiTexCoord1dARB __rglgen_glMultiTexCoord1dARB
-#define glMultiTexCoord1dvARB __rglgen_glMultiTexCoord1dvARB
-#define glMultiTexCoord1fARB __rglgen_glMultiTexCoord1fARB
-#define glMultiTexCoord1fvARB __rglgen_glMultiTexCoord1fvARB
-#define glMultiTexCoord1iARB __rglgen_glMultiTexCoord1iARB
-#define glMultiTexCoord1ivARB __rglgen_glMultiTexCoord1ivARB
-#define glMultiTexCoord1sARB __rglgen_glMultiTexCoord1sARB
-#define glMultiTexCoord1svARB __rglgen_glMultiTexCoord1svARB
-#define glMultiTexCoord2dARB __rglgen_glMultiTexCoord2dARB
-#define glMultiTexCoord2dvARB __rglgen_glMultiTexCoord2dvARB
-#define glMultiTexCoord2fARB __rglgen_glMultiTexCoord2fARB
-#define glMultiTexCoord2fvARB __rglgen_glMultiTexCoord2fvARB
-#define glMultiTexCoord2iARB __rglgen_glMultiTexCoord2iARB
-#define glMultiTexCoord2ivARB __rglgen_glMultiTexCoord2ivARB
-#define glMultiTexCoord2sARB __rglgen_glMultiTexCoord2sARB
-#define glMultiTexCoord2svARB __rglgen_glMultiTexCoord2svARB
-#define glMultiTexCoord3dARB __rglgen_glMultiTexCoord3dARB
-#define glMultiTexCoord3dvARB __rglgen_glMultiTexCoord3dvARB
-#define glMultiTexCoord3fARB __rglgen_glMultiTexCoord3fARB
-#define glMultiTexCoord3fvARB __rglgen_glMultiTexCoord3fvARB
-#define glMultiTexCoord3iARB __rglgen_glMultiTexCoord3iARB
-#define glMultiTexCoord3ivARB __rglgen_glMultiTexCoord3ivARB
-#define glMultiTexCoord3sARB __rglgen_glMultiTexCoord3sARB
-#define glMultiTexCoord3svARB __rglgen_glMultiTexCoord3svARB
-#define glMultiTexCoord4dARB __rglgen_glMultiTexCoord4dARB
-#define glMultiTexCoord4dvARB __rglgen_glMultiTexCoord4dvARB
-#define glMultiTexCoord4fARB __rglgen_glMultiTexCoord4fARB
-#define glMultiTexCoord4fvARB __rglgen_glMultiTexCoord4fvARB
-#define glMultiTexCoord4iARB __rglgen_glMultiTexCoord4iARB
-#define glMultiTexCoord4ivARB __rglgen_glMultiTexCoord4ivARB
-#define glMultiTexCoord4sARB __rglgen_glMultiTexCoord4sARB
-#define glMultiTexCoord4svARB __rglgen_glMultiTexCoord4svARB
-#define glGenQueriesARB __rglgen_glGenQueriesARB
-#define glDeleteQueriesARB __rglgen_glDeleteQueriesARB
-#define glIsQueryARB __rglgen_glIsQueryARB
-#define glBeginQueryARB __rglgen_glBeginQueryARB
-#define glEndQueryARB __rglgen_glEndQueryARB
-#define glGetQueryivARB __rglgen_glGetQueryivARB
-#define glGetQueryObjectivARB __rglgen_glGetQueryObjectivARB
-#define glGetQueryObjectuivARB __rglgen_glGetQueryObjectuivARB
-#define glPointParameterfARB __rglgen_glPointParameterfARB
-#define glPointParameterfvARB __rglgen_glPointParameterfvARB
-#define glGetGraphicsResetStatusARB __rglgen_glGetGraphicsResetStatusARB
-#define glGetnTexImageARB __rglgen_glGetnTexImageARB
-#define glReadnPixelsARB __rglgen_glReadnPixelsARB
-#define glGetnCompressedTexImageARB __rglgen_glGetnCompressedTexImageARB
-#define glGetnUniformfvARB __rglgen_glGetnUniformfvARB
-#define glGetnUniformivARB __rglgen_glGetnUniformivARB
-#define glGetnUniformuivARB __rglgen_glGetnUniformuivARB
-#define glGetnUniformdvARB __rglgen_glGetnUniformdvARB
-#define glGetnMapdvARB __rglgen_glGetnMapdvARB
-#define glGetnMapfvARB __rglgen_glGetnMapfvARB
-#define glGetnMapivARB __rglgen_glGetnMapivARB
-#define glGetnPixelMapfvARB __rglgen_glGetnPixelMapfvARB
-#define glGetnPixelMapuivARB __rglgen_glGetnPixelMapuivARB
-#define glGetnPixelMapusvARB __rglgen_glGetnPixelMapusvARB
-#define glGetnPolygonStippleARB __rglgen_glGetnPolygonStippleARB
-#define glGetnColorTableARB __rglgen_glGetnColorTableARB
-#define glGetnConvolutionFilterARB __rglgen_glGetnConvolutionFilterARB
-#define glGetnSeparableFilterARB __rglgen_glGetnSeparableFilterARB
-#define glGetnHistogramARB __rglgen_glGetnHistogramARB
-#define glGetnMinmaxARB __rglgen_glGetnMinmaxARB
-#define glMinSampleShadingARB __rglgen_glMinSampleShadingARB
-#define glDeleteObjectARB __rglgen_glDeleteObjectARB
-#define glGetHandleARB __rglgen_glGetHandleARB
-#define glDetachObjectARB __rglgen_glDetachObjectARB
-#define glCreateShaderObjectARB __rglgen_glCreateShaderObjectARB
-#define glShaderSourceARB __rglgen_glShaderSourceARB
-#define glCompileShaderARB __rglgen_glCompileShaderARB
-#define glCreateProgramObjectARB __rglgen_glCreateProgramObjectARB
-#define glAttachObjectARB __rglgen_glAttachObjectARB
-#define glLinkProgramARB __rglgen_glLinkProgramARB
-#define glUseProgramObjectARB __rglgen_glUseProgramObjectARB
-#define glValidateProgramARB __rglgen_glValidateProgramARB
-#define glUniform1fARB __rglgen_glUniform1fARB
-#define glUniform2fARB __rglgen_glUniform2fARB
-#define glUniform3fARB __rglgen_glUniform3fARB
-#define glUniform4fARB __rglgen_glUniform4fARB
-#define glUniform1iARB __rglgen_glUniform1iARB
-#define glUniform2iARB __rglgen_glUniform2iARB
-#define glUniform3iARB __rglgen_glUniform3iARB
-#define glUniform4iARB __rglgen_glUniform4iARB
-#define glUniform1fvARB __rglgen_glUniform1fvARB
-#define glUniform2fvARB __rglgen_glUniform2fvARB
-#define glUniform3fvARB __rglgen_glUniform3fvARB
-#define glUniform4fvARB __rglgen_glUniform4fvARB
-#define glUniform1ivARB __rglgen_glUniform1ivARB
-#define glUniform2ivARB __rglgen_glUniform2ivARB
-#define glUniform3ivARB __rglgen_glUniform3ivARB
-#define glUniform4ivARB __rglgen_glUniform4ivARB
-#define glUniformMatrix2fvARB __rglgen_glUniformMatrix2fvARB
-#define glUniformMatrix3fvARB __rglgen_glUniformMatrix3fvARB
-#define glUniformMatrix4fvARB __rglgen_glUniformMatrix4fvARB
-#define glGetObjectParameterfvARB __rglgen_glGetObjectParameterfvARB
-#define glGetObjectParameterivARB __rglgen_glGetObjectParameterivARB
-#define glGetInfoLogARB __rglgen_glGetInfoLogARB
-#define glGetAttachedObjectsARB __rglgen_glGetAttachedObjectsARB
-#define glGetUniformLocationARB __rglgen_glGetUniformLocationARB
-#define glGetActiveUniformARB __rglgen_glGetActiveUniformARB
-#define glGetUniformfvARB __rglgen_glGetUniformfvARB
-#define glGetUniformivARB __rglgen_glGetUniformivARB
-#define glGetShaderSourceARB __rglgen_glGetShaderSourceARB
-#define glNamedStringARB __rglgen_glNamedStringARB
-#define glDeleteNamedStringARB __rglgen_glDeleteNamedStringARB
-#define glCompileShaderIncludeARB __rglgen_glCompileShaderIncludeARB
-#define glIsNamedStringARB __rglgen_glIsNamedStringARB
-#define glGetNamedStringARB __rglgen_glGetNamedStringARB
-#define glGetNamedStringivARB __rglgen_glGetNamedStringivARB
-#define glTexPageCommitmentARB __rglgen_glTexPageCommitmentARB
-#define glTexBufferARB __rglgen_glTexBufferARB
-#define glCompressedTexImage3DARB __rglgen_glCompressedTexImage3DARB
-#define glCompressedTexImage2DARB __rglgen_glCompressedTexImage2DARB
-#define glCompressedTexImage1DARB __rglgen_glCompressedTexImage1DARB
-#define glCompressedTexSubImage3DARB __rglgen_glCompressedTexSubImage3DARB
-#define glCompressedTexSubImage2DARB __rglgen_glCompressedTexSubImage2DARB
-#define glCompressedTexSubImage1DARB __rglgen_glCompressedTexSubImage1DARB
-#define glGetCompressedTexImageARB __rglgen_glGetCompressedTexImageARB
-#define glLoadTransposeMatrixfARB __rglgen_glLoadTransposeMatrixfARB
-#define glLoadTransposeMatrixdARB __rglgen_glLoadTransposeMatrixdARB
-#define glMultTransposeMatrixfARB __rglgen_glMultTransposeMatrixfARB
-#define glMultTransposeMatrixdARB __rglgen_glMultTransposeMatrixdARB
-#define glWeightbvARB __rglgen_glWeightbvARB
-#define glWeightsvARB __rglgen_glWeightsvARB
-#define glWeightivARB __rglgen_glWeightivARB
-#define glWeightfvARB __rglgen_glWeightfvARB
-#define glWeightdvARB __rglgen_glWeightdvARB
-#define glWeightubvARB __rglgen_glWeightubvARB
-#define glWeightusvARB __rglgen_glWeightusvARB
-#define glWeightuivARB __rglgen_glWeightuivARB
-#define glWeightPointerARB __rglgen_glWeightPointerARB
-#define glVertexBlendARB __rglgen_glVertexBlendARB
-#define glBindBufferARB __rglgen_glBindBufferARB
-#define glDeleteBuffersARB __rglgen_glDeleteBuffersARB
-#define glGenBuffersARB __rglgen_glGenBuffersARB
-#define glIsBufferARB __rglgen_glIsBufferARB
-#define glBufferDataARB __rglgen_glBufferDataARB
-#define glBufferSubDataARB __rglgen_glBufferSubDataARB
-#define glGetBufferSubDataARB __rglgen_glGetBufferSubDataARB
-#define glMapBufferARB __rglgen_glMapBufferARB
-#define glUnmapBufferARB __rglgen_glUnmapBufferARB
-#define glGetBufferParameterivARB __rglgen_glGetBufferParameterivARB
-#define glGetBufferPointervARB __rglgen_glGetBufferPointervARB
-#define glVertexAttrib1dARB __rglgen_glVertexAttrib1dARB
-#define glVertexAttrib1dvARB __rglgen_glVertexAttrib1dvARB
-#define glVertexAttrib1fARB __rglgen_glVertexAttrib1fARB
-#define glVertexAttrib1fvARB __rglgen_glVertexAttrib1fvARB
-#define glVertexAttrib1sARB __rglgen_glVertexAttrib1sARB
-#define glVertexAttrib1svARB __rglgen_glVertexAttrib1svARB
-#define glVertexAttrib2dARB __rglgen_glVertexAttrib2dARB
-#define glVertexAttrib2dvARB __rglgen_glVertexAttrib2dvARB
-#define glVertexAttrib2fARB __rglgen_glVertexAttrib2fARB
-#define glVertexAttrib2fvARB __rglgen_glVertexAttrib2fvARB
-#define glVertexAttrib2sARB __rglgen_glVertexAttrib2sARB
-#define glVertexAttrib2svARB __rglgen_glVertexAttrib2svARB
-#define glVertexAttrib3dARB __rglgen_glVertexAttrib3dARB
-#define glVertexAttrib3dvARB __rglgen_glVertexAttrib3dvARB
-#define glVertexAttrib3fARB __rglgen_glVertexAttrib3fARB
-#define glVertexAttrib3fvARB __rglgen_glVertexAttrib3fvARB
-#define glVertexAttrib3sARB __rglgen_glVertexAttrib3sARB
-#define glVertexAttrib3svARB __rglgen_glVertexAttrib3svARB
-#define glVertexAttrib4NbvARB __rglgen_glVertexAttrib4NbvARB
-#define glVertexAttrib4NivARB __rglgen_glVertexAttrib4NivARB
-#define glVertexAttrib4NsvARB __rglgen_glVertexAttrib4NsvARB
-#define glVertexAttrib4NubARB __rglgen_glVertexAttrib4NubARB
-#define glVertexAttrib4NubvARB __rglgen_glVertexAttrib4NubvARB
-#define glVertexAttrib4NuivARB __rglgen_glVertexAttrib4NuivARB
-#define glVertexAttrib4NusvARB __rglgen_glVertexAttrib4NusvARB
-#define glVertexAttrib4bvARB __rglgen_glVertexAttrib4bvARB
-#define glVertexAttrib4dARB __rglgen_glVertexAttrib4dARB
-#define glVertexAttrib4dvARB __rglgen_glVertexAttrib4dvARB
-#define glVertexAttrib4fARB __rglgen_glVertexAttrib4fARB
-#define glVertexAttrib4fvARB __rglgen_glVertexAttrib4fvARB
-#define glVertexAttrib4ivARB __rglgen_glVertexAttrib4ivARB
-#define glVertexAttrib4sARB __rglgen_glVertexAttrib4sARB
-#define glVertexAttrib4svARB __rglgen_glVertexAttrib4svARB
-#define glVertexAttrib4ubvARB __rglgen_glVertexAttrib4ubvARB
-#define glVertexAttrib4uivARB __rglgen_glVertexAttrib4uivARB
-#define glVertexAttrib4usvARB __rglgen_glVertexAttrib4usvARB
-#define glVertexAttribPointerARB __rglgen_glVertexAttribPointerARB
-#define glEnableVertexAttribArrayARB __rglgen_glEnableVertexAttribArrayARB
-#define glDisableVertexAttribArrayARB __rglgen_glDisableVertexAttribArrayARB
-#define glGetVertexAttribdvARB __rglgen_glGetVertexAttribdvARB
-#define glGetVertexAttribfvARB __rglgen_glGetVertexAttribfvARB
-#define glGetVertexAttribivARB __rglgen_glGetVertexAttribivARB
-#define glGetVertexAttribPointervARB __rglgen_glGetVertexAttribPointervARB
-#define glBindAttribLocationARB __rglgen_glBindAttribLocationARB
-#define glGetActiveAttribARB __rglgen_glGetActiveAttribARB
-#define glGetAttribLocationARB __rglgen_glGetAttribLocationARB
-#define glWindowPos2dARB __rglgen_glWindowPos2dARB
-#define glWindowPos2dvARB __rglgen_glWindowPos2dvARB
-#define glWindowPos2fARB __rglgen_glWindowPos2fARB
-#define glWindowPos2fvARB __rglgen_glWindowPos2fvARB
-#define glWindowPos2iARB __rglgen_glWindowPos2iARB
-#define glWindowPos2ivARB __rglgen_glWindowPos2ivARB
-#define glWindowPos2sARB __rglgen_glWindowPos2sARB
-#define glWindowPos2svARB __rglgen_glWindowPos2svARB
-#define glWindowPos3dARB __rglgen_glWindowPos3dARB
-#define glWindowPos3dvARB __rglgen_glWindowPos3dvARB
-#define glWindowPos3fARB __rglgen_glWindowPos3fARB
-#define glWindowPos3fvARB __rglgen_glWindowPos3fvARB
-#define glWindowPos3iARB __rglgen_glWindowPos3iARB
-#define glWindowPos3ivARB __rglgen_glWindowPos3ivARB
-#define glWindowPos3sARB __rglgen_glWindowPos3sARB
-#define glWindowPos3svARB __rglgen_glWindowPos3svARB
-#define glMultiTexCoord1bOES __rglgen_glMultiTexCoord1bOES
-#define glMultiTexCoord1bvOES __rglgen_glMultiTexCoord1bvOES
-#define glMultiTexCoord2bOES __rglgen_glMultiTexCoord2bOES
-#define glMultiTexCoord2bvOES __rglgen_glMultiTexCoord2bvOES
-#define glMultiTexCoord3bOES __rglgen_glMultiTexCoord3bOES
-#define glMultiTexCoord3bvOES __rglgen_glMultiTexCoord3bvOES
-#define glMultiTexCoord4bOES __rglgen_glMultiTexCoord4bOES
-#define glMultiTexCoord4bvOES __rglgen_glMultiTexCoord4bvOES
-#define glTexCoord1bOES __rglgen_glTexCoord1bOES
-#define glTexCoord1bvOES __rglgen_glTexCoord1bvOES
-#define glTexCoord2bOES __rglgen_glTexCoord2bOES
-#define glTexCoord2bvOES __rglgen_glTexCoord2bvOES
-#define glTexCoord3bOES __rglgen_glTexCoord3bOES
-#define glTexCoord3bvOES __rglgen_glTexCoord3bvOES
-#define glTexCoord4bOES __rglgen_glTexCoord4bOES
-#define glTexCoord4bvOES __rglgen_glTexCoord4bvOES
-#define glVertex2bOES __rglgen_glVertex2bOES
-#define glVertex2bvOES __rglgen_glVertex2bvOES
-#define glVertex3bOES __rglgen_glVertex3bOES
-#define glVertex3bvOES __rglgen_glVertex3bvOES
-#define glVertex4bOES __rglgen_glVertex4bOES
-#define glVertex4bvOES __rglgen_glVertex4bvOES
-#define glAlphaFuncxOES __rglgen_glAlphaFuncxOES
-#define glClearColorxOES __rglgen_glClearColorxOES
-#define glClearDepthxOES __rglgen_glClearDepthxOES
-#define glClipPlanexOES __rglgen_glClipPlanexOES
-#define glColor4xOES __rglgen_glColor4xOES
-#define glDepthRangexOES __rglgen_glDepthRangexOES
-#define glFogxOES __rglgen_glFogxOES
-#define glFogxvOES __rglgen_glFogxvOES
-#define glFrustumxOES __rglgen_glFrustumxOES
-#define glGetClipPlanexOES __rglgen_glGetClipPlanexOES
-#define glGetFixedvOES __rglgen_glGetFixedvOES
-#define glGetTexEnvxvOES __rglgen_glGetTexEnvxvOES
-#define glGetTexParameterxvOES __rglgen_glGetTexParameterxvOES
-#define glLightModelxOES __rglgen_glLightModelxOES
-#define glLightModelxvOES __rglgen_glLightModelxvOES
-#define glLightxOES __rglgen_glLightxOES
-#define glLightxvOES __rglgen_glLightxvOES
-#define glLineWidthxOES __rglgen_glLineWidthxOES
-#define glLoadMatrixxOES __rglgen_glLoadMatrixxOES
-#define glMaterialxOES __rglgen_glMaterialxOES
-#define glMaterialxvOES __rglgen_glMaterialxvOES
-#define glMultMatrixxOES __rglgen_glMultMatrixxOES
-#define glMultiTexCoord4xOES __rglgen_glMultiTexCoord4xOES
-#define glNormal3xOES __rglgen_glNormal3xOES
-#define glOrthoxOES __rglgen_glOrthoxOES
-#define glPointParameterxvOES __rglgen_glPointParameterxvOES
-#define glPointSizexOES __rglgen_glPointSizexOES
-#define glPolygonOffsetxOES __rglgen_glPolygonOffsetxOES
-#define glRotatexOES __rglgen_glRotatexOES
-#define glSampleCoverageOES __rglgen_glSampleCoverageOES
-#define glScalexOES __rglgen_glScalexOES
-#define glTexEnvxOES __rglgen_glTexEnvxOES
-#define glTexEnvxvOES __rglgen_glTexEnvxvOES
-#define glTexParameterxOES __rglgen_glTexParameterxOES
-#define glTexParameterxvOES __rglgen_glTexParameterxvOES
-#define glTranslatexOES __rglgen_glTranslatexOES
-#define glAccumxOES __rglgen_glAccumxOES
-#define glBitmapxOES __rglgen_glBitmapxOES
-#define glBlendColorxOES __rglgen_glBlendColorxOES
-#define glClearAccumxOES __rglgen_glClearAccumxOES
-#define glColor3xOES __rglgen_glColor3xOES
-#define glColor3xvOES __rglgen_glColor3xvOES
-#define glColor4xvOES __rglgen_glColor4xvOES
-#define glConvolutionParameterxOES __rglgen_glConvolutionParameterxOES
-#define glConvolutionParameterxvOES __rglgen_glConvolutionParameterxvOES
-#define glEvalCoord1xOES __rglgen_glEvalCoord1xOES
-#define glEvalCoord1xvOES __rglgen_glEvalCoord1xvOES
-#define glEvalCoord2xOES __rglgen_glEvalCoord2xOES
-#define glEvalCoord2xvOES __rglgen_glEvalCoord2xvOES
-#define glFeedbackBufferxOES __rglgen_glFeedbackBufferxOES
-#define glGetConvolutionParameterxvOES __rglgen_glGetConvolutionParameterxvOES
-#define glGetHistogramParameterxvOES __rglgen_glGetHistogramParameterxvOES
-#define glGetLightxOES __rglgen_glGetLightxOES
-#define glGetMapxvOES __rglgen_glGetMapxvOES
-#define glGetMaterialxOES __rglgen_glGetMaterialxOES
-#define glGetPixelMapxv __rglgen_glGetPixelMapxv
-#define glGetTexGenxvOES __rglgen_glGetTexGenxvOES
-#define glGetTexLevelParameterxvOES __rglgen_glGetTexLevelParameterxvOES
-#define glIndexxOES __rglgen_glIndexxOES
-#define glIndexxvOES __rglgen_glIndexxvOES
-#define glLoadTransposeMatrixxOES __rglgen_glLoadTransposeMatrixxOES
-#define glMap1xOES __rglgen_glMap1xOES
-#define glMap2xOES __rglgen_glMap2xOES
-#define glMapGrid1xOES __rglgen_glMapGrid1xOES
-#define glMapGrid2xOES __rglgen_glMapGrid2xOES
-#define glMultTransposeMatrixxOES __rglgen_glMultTransposeMatrixxOES
-#define glMultiTexCoord1xOES __rglgen_glMultiTexCoord1xOES
-#define glMultiTexCoord1xvOES __rglgen_glMultiTexCoord1xvOES
-#define glMultiTexCoord2xOES __rglgen_glMultiTexCoord2xOES
-#define glMultiTexCoord2xvOES __rglgen_glMultiTexCoord2xvOES
-#define glMultiTexCoord3xOES __rglgen_glMultiTexCoord3xOES
-#define glMultiTexCoord3xvOES __rglgen_glMultiTexCoord3xvOES
-#define glMultiTexCoord4xvOES __rglgen_glMultiTexCoord4xvOES
-#define glNormal3xvOES __rglgen_glNormal3xvOES
-#define glPassThroughxOES __rglgen_glPassThroughxOES
-#define glPixelMapx __rglgen_glPixelMapx
-#define glPixelStorex __rglgen_glPixelStorex
-#define glPixelTransferxOES __rglgen_glPixelTransferxOES
-#define glPixelZoomxOES __rglgen_glPixelZoomxOES
-#define glPrioritizeTexturesxOES __rglgen_glPrioritizeTexturesxOES
-#define glRasterPos2xOES __rglgen_glRasterPos2xOES
-#define glRasterPos2xvOES __rglgen_glRasterPos2xvOES
-#define glRasterPos3xOES __rglgen_glRasterPos3xOES
-#define glRasterPos3xvOES __rglgen_glRasterPos3xvOES
-#define glRasterPos4xOES __rglgen_glRasterPos4xOES
-#define glRasterPos4xvOES __rglgen_glRasterPos4xvOES
-#define glRectxOES __rglgen_glRectxOES
-#define glRectxvOES __rglgen_glRectxvOES
-#define glTexCoord1xOES __rglgen_glTexCoord1xOES
-#define glTexCoord1xvOES __rglgen_glTexCoord1xvOES
-#define glTexCoord2xOES __rglgen_glTexCoord2xOES
-#define glTexCoord2xvOES __rglgen_glTexCoord2xvOES
-#define glTexCoord3xOES __rglgen_glTexCoord3xOES
-#define glTexCoord3xvOES __rglgen_glTexCoord3xvOES
-#define glTexCoord4xOES __rglgen_glTexCoord4xOES
-#define glTexCoord4xvOES __rglgen_glTexCoord4xvOES
-#define glTexGenxOES __rglgen_glTexGenxOES
-#define glTexGenxvOES __rglgen_glTexGenxvOES
-#define glVertex2xOES __rglgen_glVertex2xOES
-#define glVertex2xvOES __rglgen_glVertex2xvOES
-#define glVertex3xOES __rglgen_glVertex3xOES
-#define glVertex3xvOES __rglgen_glVertex3xvOES
-#define glVertex4xOES __rglgen_glVertex4xOES
-#define glVertex4xvOES __rglgen_glVertex4xvOES
-#define glQueryMatrixxOES __rglgen_glQueryMatrixxOES
-#define glClearDepthfOES __rglgen_glClearDepthfOES
-#define glClipPlanefOES __rglgen_glClipPlanefOES
-#define glDepthRangefOES __rglgen_glDepthRangefOES
-#define glFrustumfOES __rglgen_glFrustumfOES
-#define glGetClipPlanefOES __rglgen_glGetClipPlanefOES
-#define glOrthofOES __rglgen_glOrthofOES
-#define glImageTransformParameteriHP __rglgen_glImageTransformParameteriHP
-#define glImageTransformParameterfHP __rglgen_glImageTransformParameterfHP
-#define glImageTransformParameterivHP __rglgen_glImageTransformParameterivHP
-#define glImageTransformParameterfvHP __rglgen_glImageTransformParameterfvHP
-#define glGetImageTransformParameterivHP __rglgen_glGetImageTransformParameterivHP
-#define glGetImageTransformParameterfvHP __rglgen_glGetImageTransformParameterfvHP
-
-extern RGLSYMGLDRAWRANGEELEMENTSPROC __rglgen_glDrawRangeElements;
-extern RGLSYMGLTEXIMAGE3DPROC __rglgen_glTexImage3D;
-extern RGLSYMGLTEXSUBIMAGE3DPROC __rglgen_glTexSubImage3D;
-extern RGLSYMGLCOPYTEXSUBIMAGE3DPROC __rglgen_glCopyTexSubImage3D;
-extern RGLSYMGLACTIVETEXTUREPROC __rglgen_glActiveTexture;
-extern RGLSYMGLSAMPLECOVERAGEPROC __rglgen_glSampleCoverage;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE3DPROC __rglgen_glCompressedTexImage3D;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE2DPROC __rglgen_glCompressedTexImage2D;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE1DPROC __rglgen_glCompressedTexImage1D;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DPROC __rglgen_glCompressedTexSubImage3D;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DPROC __rglgen_glCompressedTexSubImage2D;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DPROC __rglgen_glCompressedTexSubImage1D;
-extern RGLSYMGLGETCOMPRESSEDTEXIMAGEPROC __rglgen_glGetCompressedTexImage;
-extern RGLSYMGLCLIENTACTIVETEXTUREPROC __rglgen_glClientActiveTexture;
-extern RGLSYMGLMULTITEXCOORD1DPROC __rglgen_glMultiTexCoord1d;
-extern RGLSYMGLMULTITEXCOORD1DVPROC __rglgen_glMultiTexCoord1dv;
-extern RGLSYMGLMULTITEXCOORD1FPROC __rglgen_glMultiTexCoord1f;
-extern RGLSYMGLMULTITEXCOORD1FVPROC __rglgen_glMultiTexCoord1fv;
-extern RGLSYMGLMULTITEXCOORD1IPROC __rglgen_glMultiTexCoord1i;
-extern RGLSYMGLMULTITEXCOORD1IVPROC __rglgen_glMultiTexCoord1iv;
-extern RGLSYMGLMULTITEXCOORD1SPROC __rglgen_glMultiTexCoord1s;
-extern RGLSYMGLMULTITEXCOORD1SVPROC __rglgen_glMultiTexCoord1sv;
-extern RGLSYMGLMULTITEXCOORD2DPROC __rglgen_glMultiTexCoord2d;
-extern RGLSYMGLMULTITEXCOORD2DVPROC __rglgen_glMultiTexCoord2dv;
-extern RGLSYMGLMULTITEXCOORD2FPROC __rglgen_glMultiTexCoord2f;
-extern RGLSYMGLMULTITEXCOORD2FVPROC __rglgen_glMultiTexCoord2fv;
-extern RGLSYMGLMULTITEXCOORD2IPROC __rglgen_glMultiTexCoord2i;
-extern RGLSYMGLMULTITEXCOORD2IVPROC __rglgen_glMultiTexCoord2iv;
-extern RGLSYMGLMULTITEXCOORD2SPROC __rglgen_glMultiTexCoord2s;
-extern RGLSYMGLMULTITEXCOORD2SVPROC __rglgen_glMultiTexCoord2sv;
-extern RGLSYMGLMULTITEXCOORD3DPROC __rglgen_glMultiTexCoord3d;
-extern RGLSYMGLMULTITEXCOORD3DVPROC __rglgen_glMultiTexCoord3dv;
-extern RGLSYMGLMULTITEXCOORD3FPROC __rglgen_glMultiTexCoord3f;
-extern RGLSYMGLMULTITEXCOORD3FVPROC __rglgen_glMultiTexCoord3fv;
-extern RGLSYMGLMULTITEXCOORD3IPROC __rglgen_glMultiTexCoord3i;
-extern RGLSYMGLMULTITEXCOORD3IVPROC __rglgen_glMultiTexCoord3iv;
-extern RGLSYMGLMULTITEXCOORD3SPROC __rglgen_glMultiTexCoord3s;
-extern RGLSYMGLMULTITEXCOORD3SVPROC __rglgen_glMultiTexCoord3sv;
-extern RGLSYMGLMULTITEXCOORD4DPROC __rglgen_glMultiTexCoord4d;
-extern RGLSYMGLMULTITEXCOORD4DVPROC __rglgen_glMultiTexCoord4dv;
-extern RGLSYMGLMULTITEXCOORD4FPROC __rglgen_glMultiTexCoord4f;
-extern RGLSYMGLMULTITEXCOORD4FVPROC __rglgen_glMultiTexCoord4fv;
-extern RGLSYMGLMULTITEXCOORD4IPROC __rglgen_glMultiTexCoord4i;
-extern RGLSYMGLMULTITEXCOORD4IVPROC __rglgen_glMultiTexCoord4iv;
-extern RGLSYMGLMULTITEXCOORD4SPROC __rglgen_glMultiTexCoord4s;
-extern RGLSYMGLMULTITEXCOORD4SVPROC __rglgen_glMultiTexCoord4sv;
-extern RGLSYMGLLOADTRANSPOSEMATRIXFPROC __rglgen_glLoadTransposeMatrixf;
-extern RGLSYMGLLOADTRANSPOSEMATRIXDPROC __rglgen_glLoadTransposeMatrixd;
-extern RGLSYMGLMULTTRANSPOSEMATRIXFPROC __rglgen_glMultTransposeMatrixf;
-extern RGLSYMGLMULTTRANSPOSEMATRIXDPROC __rglgen_glMultTransposeMatrixd;
-extern RGLSYMGLBLENDFUNCSEPARATEPROC __rglgen_glBlendFuncSeparate;
-extern RGLSYMGLMULTIDRAWARRAYSPROC __rglgen_glMultiDrawArrays;
-extern RGLSYMGLMULTIDRAWELEMENTSPROC __rglgen_glMultiDrawElements;
-extern RGLSYMGLPOINTPARAMETERFPROC __rglgen_glPointParameterf;
-extern RGLSYMGLPOINTPARAMETERFVPROC __rglgen_glPointParameterfv;
-extern RGLSYMGLPOINTPARAMETERIPROC __rglgen_glPointParameteri;
-extern RGLSYMGLPOINTPARAMETERIVPROC __rglgen_glPointParameteriv;
-extern RGLSYMGLFOGCOORDFPROC __rglgen_glFogCoordf;
-extern RGLSYMGLFOGCOORDFVPROC __rglgen_glFogCoordfv;
-extern RGLSYMGLFOGCOORDDPROC __rglgen_glFogCoordd;
-extern RGLSYMGLFOGCOORDDVPROC __rglgen_glFogCoorddv;
-extern RGLSYMGLFOGCOORDPOINTERPROC __rglgen_glFogCoordPointer;
-extern RGLSYMGLSECONDARYCOLOR3BPROC __rglgen_glSecondaryColor3b;
-extern RGLSYMGLSECONDARYCOLOR3BVPROC __rglgen_glSecondaryColor3bv;
-extern RGLSYMGLSECONDARYCOLOR3DPROC __rglgen_glSecondaryColor3d;
-extern RGLSYMGLSECONDARYCOLOR3DVPROC __rglgen_glSecondaryColor3dv;
-extern RGLSYMGLSECONDARYCOLOR3FPROC __rglgen_glSecondaryColor3f;
-extern RGLSYMGLSECONDARYCOLOR3FVPROC __rglgen_glSecondaryColor3fv;
-extern RGLSYMGLSECONDARYCOLOR3IPROC __rglgen_glSecondaryColor3i;
-extern RGLSYMGLSECONDARYCOLOR3IVPROC __rglgen_glSecondaryColor3iv;
-extern RGLSYMGLSECONDARYCOLOR3SPROC __rglgen_glSecondaryColor3s;
-extern RGLSYMGLSECONDARYCOLOR3SVPROC __rglgen_glSecondaryColor3sv;
-extern RGLSYMGLSECONDARYCOLOR3UBPROC __rglgen_glSecondaryColor3ub;
-extern RGLSYMGLSECONDARYCOLOR3UBVPROC __rglgen_glSecondaryColor3ubv;
-extern RGLSYMGLSECONDARYCOLOR3UIPROC __rglgen_glSecondaryColor3ui;
-extern RGLSYMGLSECONDARYCOLOR3UIVPROC __rglgen_glSecondaryColor3uiv;
-extern RGLSYMGLSECONDARYCOLOR3USPROC __rglgen_glSecondaryColor3us;
-extern RGLSYMGLSECONDARYCOLOR3USVPROC __rglgen_glSecondaryColor3usv;
-extern RGLSYMGLSECONDARYCOLORPOINTERPROC __rglgen_glSecondaryColorPointer;
-extern RGLSYMGLWINDOWPOS2DPROC __rglgen_glWindowPos2d;
-extern RGLSYMGLWINDOWPOS2DVPROC __rglgen_glWindowPos2dv;
-extern RGLSYMGLWINDOWPOS2FPROC __rglgen_glWindowPos2f;
-extern RGLSYMGLWINDOWPOS2FVPROC __rglgen_glWindowPos2fv;
-extern RGLSYMGLWINDOWPOS2IPROC __rglgen_glWindowPos2i;
-extern RGLSYMGLWINDOWPOS2IVPROC __rglgen_glWindowPos2iv;
-extern RGLSYMGLWINDOWPOS2SPROC __rglgen_glWindowPos2s;
-extern RGLSYMGLWINDOWPOS2SVPROC __rglgen_glWindowPos2sv;
-extern RGLSYMGLWINDOWPOS3DPROC __rglgen_glWindowPos3d;
-extern RGLSYMGLWINDOWPOS3DVPROC __rglgen_glWindowPos3dv;
-extern RGLSYMGLWINDOWPOS3FPROC __rglgen_glWindowPos3f;
-extern RGLSYMGLWINDOWPOS3FVPROC __rglgen_glWindowPos3fv;
-extern RGLSYMGLWINDOWPOS3IPROC __rglgen_glWindowPos3i;
-extern RGLSYMGLWINDOWPOS3IVPROC __rglgen_glWindowPos3iv;
-extern RGLSYMGLWINDOWPOS3SPROC __rglgen_glWindowPos3s;
-extern RGLSYMGLWINDOWPOS3SVPROC __rglgen_glWindowPos3sv;
-extern RGLSYMGLBLENDCOLORPROC __rglgen_glBlendColor;
-extern RGLSYMGLBLENDEQUATIONPROC __rglgen_glBlendEquation;
-extern RGLSYMGLGENQUERIESPROC __rglgen_glGenQueries;
-extern RGLSYMGLDELETEQUERIESPROC __rglgen_glDeleteQueries;
-extern RGLSYMGLISQUERYPROC __rglgen_glIsQuery;
-extern RGLSYMGLBEGINQUERYPROC __rglgen_glBeginQuery;
-extern RGLSYMGLENDQUERYPROC __rglgen_glEndQuery;
-extern RGLSYMGLGETQUERYIVPROC __rglgen_glGetQueryiv;
-extern RGLSYMGLGETQUERYOBJECTIVPROC __rglgen_glGetQueryObjectiv;
-extern RGLSYMGLGETQUERYOBJECTUIVPROC __rglgen_glGetQueryObjectuiv;
-extern RGLSYMGLBINDBUFFERPROC __rglgen_glBindBuffer;
-extern RGLSYMGLDELETEBUFFERSPROC __rglgen_glDeleteBuffers;
-extern RGLSYMGLGENBUFFERSPROC __rglgen_glGenBuffers;
-extern RGLSYMGLISBUFFERPROC __rglgen_glIsBuffer;
-extern RGLSYMGLBUFFERDATAPROC __rglgen_glBufferData;
-extern RGLSYMGLBUFFERSUBDATAPROC __rglgen_glBufferSubData;
-extern RGLSYMGLGETBUFFERSUBDATAPROC __rglgen_glGetBufferSubData;
-extern RGLSYMGLMAPBUFFERPROC __rglgen_glMapBuffer;
-extern RGLSYMGLUNMAPBUFFERPROC __rglgen_glUnmapBuffer;
-extern RGLSYMGLGETBUFFERPARAMETERIVPROC __rglgen_glGetBufferParameteriv;
-extern RGLSYMGLGETBUFFERPOINTERVPROC __rglgen_glGetBufferPointerv;
-extern RGLSYMGLBLENDEQUATIONSEPARATEPROC __rglgen_glBlendEquationSeparate;
-extern RGLSYMGLDRAWBUFFERSPROC __rglgen_glDrawBuffers;
-extern RGLSYMGLSTENCILOPSEPARATEPROC __rglgen_glStencilOpSeparate;
-extern RGLSYMGLSTENCILFUNCSEPARATEPROC __rglgen_glStencilFuncSeparate;
-extern RGLSYMGLSTENCILMASKSEPARATEPROC __rglgen_glStencilMaskSeparate;
-extern RGLSYMGLATTACHSHADERPROC __rglgen_glAttachShader;
-extern RGLSYMGLBINDATTRIBLOCATIONPROC __rglgen_glBindAttribLocation;
-extern RGLSYMGLCOMPILESHADERPROC __rglgen_glCompileShader;
-extern RGLSYMGLCREATEPROGRAMPROC __rglgen_glCreateProgram;
-extern RGLSYMGLCREATESHADERPROC __rglgen_glCreateShader;
-extern RGLSYMGLDELETEPROGRAMPROC __rglgen_glDeleteProgram;
-extern RGLSYMGLDELETESHADERPROC __rglgen_glDeleteShader;
-extern RGLSYMGLDETACHSHADERPROC __rglgen_glDetachShader;
-extern RGLSYMGLDISABLEVERTEXATTRIBARRAYPROC __rglgen_glDisableVertexAttribArray;
-extern RGLSYMGLENABLEVERTEXATTRIBARRAYPROC __rglgen_glEnableVertexAttribArray;
-extern RGLSYMGLGETACTIVEATTRIBPROC __rglgen_glGetActiveAttrib;
-extern RGLSYMGLGETACTIVEUNIFORMPROC __rglgen_glGetActiveUniform;
-extern RGLSYMGLGETATTACHEDSHADERSPROC __rglgen_glGetAttachedShaders;
-extern RGLSYMGLGETATTRIBLOCATIONPROC __rglgen_glGetAttribLocation;
-extern RGLSYMGLGETPROGRAMIVPROC __rglgen_glGetProgramiv;
-extern RGLSYMGLGETPROGRAMINFOLOGPROC __rglgen_glGetProgramInfoLog;
-extern RGLSYMGLGETSHADERIVPROC __rglgen_glGetShaderiv;
-extern RGLSYMGLGETSHADERINFOLOGPROC __rglgen_glGetShaderInfoLog;
-extern RGLSYMGLGETSHADERSOURCEPROC __rglgen_glGetShaderSource;
-extern RGLSYMGLGETUNIFORMLOCATIONPROC __rglgen_glGetUniformLocation;
-extern RGLSYMGLGETUNIFORMFVPROC __rglgen_glGetUniformfv;
-extern RGLSYMGLGETUNIFORMIVPROC __rglgen_glGetUniformiv;
-extern RGLSYMGLGETVERTEXATTRIBDVPROC __rglgen_glGetVertexAttribdv;
-extern RGLSYMGLGETVERTEXATTRIBFVPROC __rglgen_glGetVertexAttribfv;
-extern RGLSYMGLGETVERTEXATTRIBIVPROC __rglgen_glGetVertexAttribiv;
-extern RGLSYMGLGETVERTEXATTRIBPOINTERVPROC __rglgen_glGetVertexAttribPointerv;
-extern RGLSYMGLISPROGRAMPROC __rglgen_glIsProgram;
-extern RGLSYMGLISSHADERPROC __rglgen_glIsShader;
-extern RGLSYMGLLINKPROGRAMPROC __rglgen_glLinkProgram;
-extern RGLSYMGLSHADERSOURCEPROC __rglgen_glShaderSource;
-extern RGLSYMGLUSEPROGRAMPROC __rglgen_glUseProgram;
-extern RGLSYMGLUNIFORM1FPROC __rglgen_glUniform1f;
-extern RGLSYMGLUNIFORM2FPROC __rglgen_glUniform2f;
-extern RGLSYMGLUNIFORM3FPROC __rglgen_glUniform3f;
-extern RGLSYMGLUNIFORM4FPROC __rglgen_glUniform4f;
-extern RGLSYMGLUNIFORM1IPROC __rglgen_glUniform1i;
-extern RGLSYMGLUNIFORM2IPROC __rglgen_glUniform2i;
-extern RGLSYMGLUNIFORM3IPROC __rglgen_glUniform3i;
-extern RGLSYMGLUNIFORM4IPROC __rglgen_glUniform4i;
-extern RGLSYMGLUNIFORM1FVPROC __rglgen_glUniform1fv;
-extern RGLSYMGLUNIFORM2FVPROC __rglgen_glUniform2fv;
-extern RGLSYMGLUNIFORM3FVPROC __rglgen_glUniform3fv;
-extern RGLSYMGLUNIFORM4FVPROC __rglgen_glUniform4fv;
-extern RGLSYMGLUNIFORM1IVPROC __rglgen_glUniform1iv;
-extern RGLSYMGLUNIFORM2IVPROC __rglgen_glUniform2iv;
-extern RGLSYMGLUNIFORM3IVPROC __rglgen_glUniform3iv;
-extern RGLSYMGLUNIFORM4IVPROC __rglgen_glUniform4iv;
-extern RGLSYMGLUNIFORMMATRIX2FVPROC __rglgen_glUniformMatrix2fv;
-extern RGLSYMGLUNIFORMMATRIX3FVPROC __rglgen_glUniformMatrix3fv;
-extern RGLSYMGLUNIFORMMATRIX4FVPROC __rglgen_glUniformMatrix4fv;
-extern RGLSYMGLVALIDATEPROGRAMPROC __rglgen_glValidateProgram;
-extern RGLSYMGLVERTEXATTRIB1DPROC __rglgen_glVertexAttrib1d;
-extern RGLSYMGLVERTEXATTRIB1DVPROC __rglgen_glVertexAttrib1dv;
-extern RGLSYMGLVERTEXATTRIB1FPROC __rglgen_glVertexAttrib1f;
-extern RGLSYMGLVERTEXATTRIB1FVPROC __rglgen_glVertexAttrib1fv;
-extern RGLSYMGLVERTEXATTRIB1SPROC __rglgen_glVertexAttrib1s;
-extern RGLSYMGLVERTEXATTRIB1SVPROC __rglgen_glVertexAttrib1sv;
-extern RGLSYMGLVERTEXATTRIB2DPROC __rglgen_glVertexAttrib2d;
-extern RGLSYMGLVERTEXATTRIB2DVPROC __rglgen_glVertexAttrib2dv;
-extern RGLSYMGLVERTEXATTRIB2FPROC __rglgen_glVertexAttrib2f;
-extern RGLSYMGLVERTEXATTRIB2FVPROC __rglgen_glVertexAttrib2fv;
-extern RGLSYMGLVERTEXATTRIB2SPROC __rglgen_glVertexAttrib2s;
-extern RGLSYMGLVERTEXATTRIB2SVPROC __rglgen_glVertexAttrib2sv;
-extern RGLSYMGLVERTEXATTRIB3DPROC __rglgen_glVertexAttrib3d;
-extern RGLSYMGLVERTEXATTRIB3DVPROC __rglgen_glVertexAttrib3dv;
-extern RGLSYMGLVERTEXATTRIB3FPROC __rglgen_glVertexAttrib3f;
-extern RGLSYMGLVERTEXATTRIB3FVPROC __rglgen_glVertexAttrib3fv;
-extern RGLSYMGLVERTEXATTRIB3SPROC __rglgen_glVertexAttrib3s;
-extern RGLSYMGLVERTEXATTRIB3SVPROC __rglgen_glVertexAttrib3sv;
-extern RGLSYMGLVERTEXATTRIB4NBVPROC __rglgen_glVertexAttrib4Nbv;
-extern RGLSYMGLVERTEXATTRIB4NIVPROC __rglgen_glVertexAttrib4Niv;
-extern RGLSYMGLVERTEXATTRIB4NSVPROC __rglgen_glVertexAttrib4Nsv;
-extern RGLSYMGLVERTEXATTRIB4NUBPROC __rglgen_glVertexAttrib4Nub;
-extern RGLSYMGLVERTEXATTRIB4NUBVPROC __rglgen_glVertexAttrib4Nubv;
-extern RGLSYMGLVERTEXATTRIB4NUIVPROC __rglgen_glVertexAttrib4Nuiv;
-extern RGLSYMGLVERTEXATTRIB4NUSVPROC __rglgen_glVertexAttrib4Nusv;
-extern RGLSYMGLVERTEXATTRIB4BVPROC __rglgen_glVertexAttrib4bv;
-extern RGLSYMGLVERTEXATTRIB4DPROC __rglgen_glVertexAttrib4d;
-extern RGLSYMGLVERTEXATTRIB4DVPROC __rglgen_glVertexAttrib4dv;
-extern RGLSYMGLVERTEXATTRIB4FPROC __rglgen_glVertexAttrib4f;
-extern RGLSYMGLVERTEXATTRIB4FVPROC __rglgen_glVertexAttrib4fv;
-extern RGLSYMGLVERTEXATTRIB4IVPROC __rglgen_glVertexAttrib4iv;
-extern RGLSYMGLVERTEXATTRIB4SPROC __rglgen_glVertexAttrib4s;
-extern RGLSYMGLVERTEXATTRIB4SVPROC __rglgen_glVertexAttrib4sv;
-extern RGLSYMGLVERTEXATTRIB4UBVPROC __rglgen_glVertexAttrib4ubv;
-extern RGLSYMGLVERTEXATTRIB4UIVPROC __rglgen_glVertexAttrib4uiv;
-extern RGLSYMGLVERTEXATTRIB4USVPROC __rglgen_glVertexAttrib4usv;
-extern RGLSYMGLVERTEXATTRIBPOINTERPROC __rglgen_glVertexAttribPointer;
-extern RGLSYMGLUNIFORMMATRIX2X3FVPROC __rglgen_glUniformMatrix2x3fv;
-extern RGLSYMGLUNIFORMMATRIX3X2FVPROC __rglgen_glUniformMatrix3x2fv;
-extern RGLSYMGLUNIFORMMATRIX2X4FVPROC __rglgen_glUniformMatrix2x4fv;
-extern RGLSYMGLUNIFORMMATRIX4X2FVPROC __rglgen_glUniformMatrix4x2fv;
-extern RGLSYMGLUNIFORMMATRIX3X4FVPROC __rglgen_glUniformMatrix3x4fv;
-extern RGLSYMGLUNIFORMMATRIX4X3FVPROC __rglgen_glUniformMatrix4x3fv;
-extern RGLSYMGLCOLORMASKIPROC __rglgen_glColorMaski;
-extern RGLSYMGLGETBOOLEANI_VPROC __rglgen_glGetBooleani_v;
-extern RGLSYMGLGETINTEGERI_VPROC __rglgen_glGetIntegeri_v;
-extern RGLSYMGLENABLEIPROC __rglgen_glEnablei;
-extern RGLSYMGLDISABLEIPROC __rglgen_glDisablei;
-extern RGLSYMGLISENABLEDIPROC __rglgen_glIsEnabledi;
-extern RGLSYMGLBEGINTRANSFORMFEEDBACKPROC __rglgen_glBeginTransformFeedback;
-extern RGLSYMGLENDTRANSFORMFEEDBACKPROC __rglgen_glEndTransformFeedback;
-extern RGLSYMGLBINDBUFFERRANGEPROC __rglgen_glBindBufferRange;
-extern RGLSYMGLBINDBUFFERBASEPROC __rglgen_glBindBufferBase;
-extern RGLSYMGLTRANSFORMFEEDBACKVARYINGSPROC __rglgen_glTransformFeedbackVaryings;
-extern RGLSYMGLGETTRANSFORMFEEDBACKVARYINGPROC __rglgen_glGetTransformFeedbackVarying;
-extern RGLSYMGLCLAMPCOLORPROC __rglgen_glClampColor;
-extern RGLSYMGLBEGINCONDITIONALRENDERPROC __rglgen_glBeginConditionalRender;
-extern RGLSYMGLENDCONDITIONALRENDERPROC __rglgen_glEndConditionalRender;
-extern RGLSYMGLVERTEXATTRIBIPOINTERPROC __rglgen_glVertexAttribIPointer;
-extern RGLSYMGLGETVERTEXATTRIBIIVPROC __rglgen_glGetVertexAttribIiv;
-extern RGLSYMGLGETVERTEXATTRIBIUIVPROC __rglgen_glGetVertexAttribIuiv;
-extern RGLSYMGLVERTEXATTRIBI1IPROC __rglgen_glVertexAttribI1i;
-extern RGLSYMGLVERTEXATTRIBI2IPROC __rglgen_glVertexAttribI2i;
-extern RGLSYMGLVERTEXATTRIBI3IPROC __rglgen_glVertexAttribI3i;
-extern RGLSYMGLVERTEXATTRIBI4IPROC __rglgen_glVertexAttribI4i;
-extern RGLSYMGLVERTEXATTRIBI1UIPROC __rglgen_glVertexAttribI1ui;
-extern RGLSYMGLVERTEXATTRIBI2UIPROC __rglgen_glVertexAttribI2ui;
-extern RGLSYMGLVERTEXATTRIBI3UIPROC __rglgen_glVertexAttribI3ui;
-extern RGLSYMGLVERTEXATTRIBI4UIPROC __rglgen_glVertexAttribI4ui;
-extern RGLSYMGLVERTEXATTRIBI1IVPROC __rglgen_glVertexAttribI1iv;
-extern RGLSYMGLVERTEXATTRIBI2IVPROC __rglgen_glVertexAttribI2iv;
-extern RGLSYMGLVERTEXATTRIBI3IVPROC __rglgen_glVertexAttribI3iv;
-extern RGLSYMGLVERTEXATTRIBI4IVPROC __rglgen_glVertexAttribI4iv;
-extern RGLSYMGLVERTEXATTRIBI1UIVPROC __rglgen_glVertexAttribI1uiv;
-extern RGLSYMGLVERTEXATTRIBI2UIVPROC __rglgen_glVertexAttribI2uiv;
-extern RGLSYMGLVERTEXATTRIBI3UIVPROC __rglgen_glVertexAttribI3uiv;
-extern RGLSYMGLVERTEXATTRIBI4UIVPROC __rglgen_glVertexAttribI4uiv;
-extern RGLSYMGLVERTEXATTRIBI4BVPROC __rglgen_glVertexAttribI4bv;
-extern RGLSYMGLVERTEXATTRIBI4SVPROC __rglgen_glVertexAttribI4sv;
-extern RGLSYMGLVERTEXATTRIBI4UBVPROC __rglgen_glVertexAttribI4ubv;
-extern RGLSYMGLVERTEXATTRIBI4USVPROC __rglgen_glVertexAttribI4usv;
-extern RGLSYMGLGETUNIFORMUIVPROC __rglgen_glGetUniformuiv;
-extern RGLSYMGLBINDFRAGDATALOCATIONPROC __rglgen_glBindFragDataLocation;
-extern RGLSYMGLGETFRAGDATALOCATIONPROC __rglgen_glGetFragDataLocation;
-extern RGLSYMGLUNIFORM1UIPROC __rglgen_glUniform1ui;
-extern RGLSYMGLUNIFORM2UIPROC __rglgen_glUniform2ui;
-extern RGLSYMGLUNIFORM3UIPROC __rglgen_glUniform3ui;
-extern RGLSYMGLUNIFORM4UIPROC __rglgen_glUniform4ui;
-extern RGLSYMGLUNIFORM1UIVPROC __rglgen_glUniform1uiv;
-extern RGLSYMGLUNIFORM2UIVPROC __rglgen_glUniform2uiv;
-extern RGLSYMGLUNIFORM3UIVPROC __rglgen_glUniform3uiv;
-extern RGLSYMGLUNIFORM4UIVPROC __rglgen_glUniform4uiv;
-extern RGLSYMGLTEXPARAMETERIIVPROC __rglgen_glTexParameterIiv;
-extern RGLSYMGLTEXPARAMETERIUIVPROC __rglgen_glTexParameterIuiv;
-extern RGLSYMGLGETTEXPARAMETERIIVPROC __rglgen_glGetTexParameterIiv;
-extern RGLSYMGLGETTEXPARAMETERIUIVPROC __rglgen_glGetTexParameterIuiv;
-extern RGLSYMGLCLEARBUFFERIVPROC __rglgen_glClearBufferiv;
-extern RGLSYMGLCLEARBUFFERUIVPROC __rglgen_glClearBufferuiv;
-extern RGLSYMGLCLEARBUFFERFVPROC __rglgen_glClearBufferfv;
-extern RGLSYMGLCLEARBUFFERFIPROC __rglgen_glClearBufferfi;
-extern RGLSYMGLGETSTRINGIPROC __rglgen_glGetStringi;
-extern RGLSYMGLISRENDERBUFFERPROC __rglgen_glIsRenderbuffer;
-extern RGLSYMGLBINDRENDERBUFFERPROC __rglgen_glBindRenderbuffer;
-extern RGLSYMGLDELETERENDERBUFFERSPROC __rglgen_glDeleteRenderbuffers;
-extern RGLSYMGLGENRENDERBUFFERSPROC __rglgen_glGenRenderbuffers;
-extern RGLSYMGLRENDERBUFFERSTORAGEPROC __rglgen_glRenderbufferStorage;
-extern RGLSYMGLGETRENDERBUFFERPARAMETERIVPROC __rglgen_glGetRenderbufferParameteriv;
-extern RGLSYMGLISFRAMEBUFFERPROC __rglgen_glIsFramebuffer;
-extern RGLSYMGLBINDFRAMEBUFFERPROC __rglgen_glBindFramebuffer;
-extern RGLSYMGLDELETEFRAMEBUFFERSPROC __rglgen_glDeleteFramebuffers;
-extern RGLSYMGLGENFRAMEBUFFERSPROC __rglgen_glGenFramebuffers;
-extern RGLSYMGLCHECKFRAMEBUFFERSTATUSPROC __rglgen_glCheckFramebufferStatus;
-extern RGLSYMGLFRAMEBUFFERTEXTURE1DPROC __rglgen_glFramebufferTexture1D;
-extern RGLSYMGLFRAMEBUFFERTEXTURE2DPROC __rglgen_glFramebufferTexture2D;
-extern RGLSYMGLFRAMEBUFFERTEXTURE3DPROC __rglgen_glFramebufferTexture3D;
-extern RGLSYMGLFRAMEBUFFERRENDERBUFFERPROC __rglgen_glFramebufferRenderbuffer;
-extern RGLSYMGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __rglgen_glGetFramebufferAttachmentParameteriv;
-extern RGLSYMGLGENERATEMIPMAPPROC __rglgen_glGenerateMipmap;
-extern RGLSYMGLBLITFRAMEBUFFERPROC __rglgen_glBlitFramebuffer;
-extern RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __rglgen_glRenderbufferStorageMultisample;
-extern RGLSYMGLFRAMEBUFFERTEXTURELAYERPROC __rglgen_glFramebufferTextureLayer;
-extern RGLSYMGLMAPBUFFERRANGEPROC __rglgen_glMapBufferRange;
-extern RGLSYMGLFLUSHMAPPEDBUFFERRANGEPROC __rglgen_glFlushMappedBufferRange;
-extern RGLSYMGLBINDVERTEXARRAYPROC __rglgen_glBindVertexArray;
-extern RGLSYMGLDELETEVERTEXARRAYSPROC __rglgen_glDeleteVertexArrays;
-extern RGLSYMGLGENVERTEXARRAYSPROC __rglgen_glGenVertexArrays;
-extern RGLSYMGLISVERTEXARRAYPROC __rglgen_glIsVertexArray;
-extern RGLSYMGLDRAWARRAYSINSTANCEDPROC __rglgen_glDrawArraysInstanced;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDPROC __rglgen_glDrawElementsInstanced;
-extern RGLSYMGLTEXBUFFERPROC __rglgen_glTexBuffer;
-extern RGLSYMGLPRIMITIVERESTARTINDEXPROC __rglgen_glPrimitiveRestartIndex;
-extern RGLSYMGLCOPYBUFFERSUBDATAPROC __rglgen_glCopyBufferSubData;
-extern RGLSYMGLGETUNIFORMINDICESPROC __rglgen_glGetUniformIndices;
-extern RGLSYMGLGETACTIVEUNIFORMSIVPROC __rglgen_glGetActiveUniformsiv;
-extern RGLSYMGLGETACTIVEUNIFORMNAMEPROC __rglgen_glGetActiveUniformName;
-extern RGLSYMGLGETUNIFORMBLOCKINDEXPROC __rglgen_glGetUniformBlockIndex;
-extern RGLSYMGLGETACTIVEUNIFORMBLOCKIVPROC __rglgen_glGetActiveUniformBlockiv;
-extern RGLSYMGLGETACTIVEUNIFORMBLOCKNAMEPROC __rglgen_glGetActiveUniformBlockName;
-extern RGLSYMGLUNIFORMBLOCKBINDINGPROC __rglgen_glUniformBlockBinding;
-extern RGLSYMGLDRAWELEMENTSBASEVERTEXPROC __rglgen_glDrawElementsBaseVertex;
-extern RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC __rglgen_glDrawRangeElementsBaseVertex;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __rglgen_glDrawElementsInstancedBaseVertex;
-extern RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC __rglgen_glMultiDrawElementsBaseVertex;
-extern RGLSYMGLPROVOKINGVERTEXPROC __rglgen_glProvokingVertex;
-extern RGLSYMGLFENCESYNCPROC __rglgen_glFenceSync;
-extern RGLSYMGLISSYNCPROC __rglgen_glIsSync;
-extern RGLSYMGLDELETESYNCPROC __rglgen_glDeleteSync;
-extern RGLSYMGLCLIENTWAITSYNCPROC __rglgen_glClientWaitSync;
-extern RGLSYMGLWAITSYNCPROC __rglgen_glWaitSync;
-extern RGLSYMGLGETINTEGER64VPROC __rglgen_glGetInteger64v;
-extern RGLSYMGLGETSYNCIVPROC __rglgen_glGetSynciv;
-extern RGLSYMGLGETINTEGER64I_VPROC __rglgen_glGetInteger64i_v;
-extern RGLSYMGLGETBUFFERPARAMETERI64VPROC __rglgen_glGetBufferParameteri64v;
-extern RGLSYMGLFRAMEBUFFERTEXTUREPROC __rglgen_glFramebufferTexture;
-extern RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC __rglgen_glTexImage2DMultisample;
-extern RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC __rglgen_glTexImage3DMultisample;
-extern RGLSYMGLGETMULTISAMPLEFVPROC __rglgen_glGetMultisamplefv;
-extern RGLSYMGLSAMPLEMASKIPROC __rglgen_glSampleMaski;
-extern RGLSYMGLBINDFRAGDATALOCATIONINDEXEDPROC __rglgen_glBindFragDataLocationIndexed;
-extern RGLSYMGLGETFRAGDATAINDEXPROC __rglgen_glGetFragDataIndex;
-extern RGLSYMGLGENSAMPLERSPROC __rglgen_glGenSamplers;
-extern RGLSYMGLDELETESAMPLERSPROC __rglgen_glDeleteSamplers;
-extern RGLSYMGLISSAMPLERPROC __rglgen_glIsSampler;
-extern RGLSYMGLBINDSAMPLERPROC __rglgen_glBindSampler;
-extern RGLSYMGLSAMPLERPARAMETERIPROC __rglgen_glSamplerParameteri;
-extern RGLSYMGLSAMPLERPARAMETERIVPROC __rglgen_glSamplerParameteriv;
-extern RGLSYMGLSAMPLERPARAMETERFPROC __rglgen_glSamplerParameterf;
-extern RGLSYMGLSAMPLERPARAMETERFVPROC __rglgen_glSamplerParameterfv;
-extern RGLSYMGLSAMPLERPARAMETERIIVPROC __rglgen_glSamplerParameterIiv;
-extern RGLSYMGLSAMPLERPARAMETERIUIVPROC __rglgen_glSamplerParameterIuiv;
-extern RGLSYMGLGETSAMPLERPARAMETERIVPROC __rglgen_glGetSamplerParameteriv;
-extern RGLSYMGLGETSAMPLERPARAMETERIIVPROC __rglgen_glGetSamplerParameterIiv;
-extern RGLSYMGLGETSAMPLERPARAMETERFVPROC __rglgen_glGetSamplerParameterfv;
-extern RGLSYMGLGETSAMPLERPARAMETERIUIVPROC __rglgen_glGetSamplerParameterIuiv;
-extern RGLSYMGLQUERYCOUNTERPROC __rglgen_glQueryCounter;
-extern RGLSYMGLGETQUERYOBJECTI64VPROC __rglgen_glGetQueryObjecti64v;
-extern RGLSYMGLGETQUERYOBJECTUI64VPROC __rglgen_glGetQueryObjectui64v;
-extern RGLSYMGLVERTEXATTRIBDIVISORPROC __rglgen_glVertexAttribDivisor;
-extern RGLSYMGLVERTEXATTRIBP1UIPROC __rglgen_glVertexAttribP1ui;
-extern RGLSYMGLVERTEXATTRIBP1UIVPROC __rglgen_glVertexAttribP1uiv;
-extern RGLSYMGLVERTEXATTRIBP2UIPROC __rglgen_glVertexAttribP2ui;
-extern RGLSYMGLVERTEXATTRIBP2UIVPROC __rglgen_glVertexAttribP2uiv;
-extern RGLSYMGLVERTEXATTRIBP3UIPROC __rglgen_glVertexAttribP3ui;
-extern RGLSYMGLVERTEXATTRIBP3UIVPROC __rglgen_glVertexAttribP3uiv;
-extern RGLSYMGLVERTEXATTRIBP4UIPROC __rglgen_glVertexAttribP4ui;
-extern RGLSYMGLVERTEXATTRIBP4UIVPROC __rglgen_glVertexAttribP4uiv;
-extern RGLSYMGLVERTEXP2UIPROC __rglgen_glVertexP2ui;
-extern RGLSYMGLVERTEXP2UIVPROC __rglgen_glVertexP2uiv;
-extern RGLSYMGLVERTEXP3UIPROC __rglgen_glVertexP3ui;
-extern RGLSYMGLVERTEXP3UIVPROC __rglgen_glVertexP3uiv;
-extern RGLSYMGLVERTEXP4UIPROC __rglgen_glVertexP4ui;
-extern RGLSYMGLVERTEXP4UIVPROC __rglgen_glVertexP4uiv;
-extern RGLSYMGLTEXCOORDP1UIPROC __rglgen_glTexCoordP1ui;
-extern RGLSYMGLTEXCOORDP1UIVPROC __rglgen_glTexCoordP1uiv;
-extern RGLSYMGLTEXCOORDP2UIPROC __rglgen_glTexCoordP2ui;
-extern RGLSYMGLTEXCOORDP2UIVPROC __rglgen_glTexCoordP2uiv;
-extern RGLSYMGLTEXCOORDP3UIPROC __rglgen_glTexCoordP3ui;
-extern RGLSYMGLTEXCOORDP3UIVPROC __rglgen_glTexCoordP3uiv;
-extern RGLSYMGLTEXCOORDP4UIPROC __rglgen_glTexCoordP4ui;
-extern RGLSYMGLTEXCOORDP4UIVPROC __rglgen_glTexCoordP4uiv;
-extern RGLSYMGLMULTITEXCOORDP1UIPROC __rglgen_glMultiTexCoordP1ui;
-extern RGLSYMGLMULTITEXCOORDP1UIVPROC __rglgen_glMultiTexCoordP1uiv;
-extern RGLSYMGLMULTITEXCOORDP2UIPROC __rglgen_glMultiTexCoordP2ui;
-extern RGLSYMGLMULTITEXCOORDP2UIVPROC __rglgen_glMultiTexCoordP2uiv;
-extern RGLSYMGLMULTITEXCOORDP3UIPROC __rglgen_glMultiTexCoordP3ui;
-extern RGLSYMGLMULTITEXCOORDP3UIVPROC __rglgen_glMultiTexCoordP3uiv;
-extern RGLSYMGLMULTITEXCOORDP4UIPROC __rglgen_glMultiTexCoordP4ui;
-extern RGLSYMGLMULTITEXCOORDP4UIVPROC __rglgen_glMultiTexCoordP4uiv;
-extern RGLSYMGLNORMALP3UIPROC __rglgen_glNormalP3ui;
-extern RGLSYMGLNORMALP3UIVPROC __rglgen_glNormalP3uiv;
-extern RGLSYMGLCOLORP3UIPROC __rglgen_glColorP3ui;
-extern RGLSYMGLCOLORP3UIVPROC __rglgen_glColorP3uiv;
-extern RGLSYMGLCOLORP4UIPROC __rglgen_glColorP4ui;
-extern RGLSYMGLCOLORP4UIVPROC __rglgen_glColorP4uiv;
-extern RGLSYMGLSECONDARYCOLORP3UIPROC __rglgen_glSecondaryColorP3ui;
-extern RGLSYMGLSECONDARYCOLORP3UIVPROC __rglgen_glSecondaryColorP3uiv;
-extern RGLSYMGLMINSAMPLESHADINGPROC __rglgen_glMinSampleShading;
-extern RGLSYMGLBLENDEQUATIONIPROC __rglgen_glBlendEquationi;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIPROC __rglgen_glBlendEquationSeparatei;
-extern RGLSYMGLBLENDFUNCIPROC __rglgen_glBlendFunci;
-extern RGLSYMGLBLENDFUNCSEPARATEIPROC __rglgen_glBlendFuncSeparatei;
-extern RGLSYMGLDRAWARRAYSINDIRECTPROC __rglgen_glDrawArraysIndirect;
-extern RGLSYMGLDRAWELEMENTSINDIRECTPROC __rglgen_glDrawElementsIndirect;
-extern RGLSYMGLUNIFORM1DPROC __rglgen_glUniform1d;
-extern RGLSYMGLUNIFORM2DPROC __rglgen_glUniform2d;
-extern RGLSYMGLUNIFORM3DPROC __rglgen_glUniform3d;
-extern RGLSYMGLUNIFORM4DPROC __rglgen_glUniform4d;
-extern RGLSYMGLUNIFORM1DVPROC __rglgen_glUniform1dv;
-extern RGLSYMGLUNIFORM2DVPROC __rglgen_glUniform2dv;
-extern RGLSYMGLUNIFORM3DVPROC __rglgen_glUniform3dv;
-extern RGLSYMGLUNIFORM4DVPROC __rglgen_glUniform4dv;
-extern RGLSYMGLUNIFORMMATRIX2DVPROC __rglgen_glUniformMatrix2dv;
-extern RGLSYMGLUNIFORMMATRIX3DVPROC __rglgen_glUniformMatrix3dv;
-extern RGLSYMGLUNIFORMMATRIX4DVPROC __rglgen_glUniformMatrix4dv;
-extern RGLSYMGLUNIFORMMATRIX2X3DVPROC __rglgen_glUniformMatrix2x3dv;
-extern RGLSYMGLUNIFORMMATRIX2X4DVPROC __rglgen_glUniformMatrix2x4dv;
-extern RGLSYMGLUNIFORMMATRIX3X2DVPROC __rglgen_glUniformMatrix3x2dv;
-extern RGLSYMGLUNIFORMMATRIX3X4DVPROC __rglgen_glUniformMatrix3x4dv;
-extern RGLSYMGLUNIFORMMATRIX4X2DVPROC __rglgen_glUniformMatrix4x2dv;
-extern RGLSYMGLUNIFORMMATRIX4X3DVPROC __rglgen_glUniformMatrix4x3dv;
-extern RGLSYMGLGETUNIFORMDVPROC __rglgen_glGetUniformdv;
-extern RGLSYMGLGETSUBROUTINEUNIFORMLOCATIONPROC __rglgen_glGetSubroutineUniformLocation;
-extern RGLSYMGLGETSUBROUTINEINDEXPROC __rglgen_glGetSubroutineIndex;
-extern RGLSYMGLGETACTIVESUBROUTINEUNIFORMIVPROC __rglgen_glGetActiveSubroutineUniformiv;
-extern RGLSYMGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __rglgen_glGetActiveSubroutineUniformName;
-extern RGLSYMGLGETACTIVESUBROUTINENAMEPROC __rglgen_glGetActiveSubroutineName;
-extern RGLSYMGLUNIFORMSUBROUTINESUIVPROC __rglgen_glUniformSubroutinesuiv;
-extern RGLSYMGLGETUNIFORMSUBROUTINEUIVPROC __rglgen_glGetUniformSubroutineuiv;
-extern RGLSYMGLGETPROGRAMSTAGEIVPROC __rglgen_glGetProgramStageiv;
-extern RGLSYMGLPATCHPARAMETERIPROC __rglgen_glPatchParameteri;
-extern RGLSYMGLPATCHPARAMETERFVPROC __rglgen_glPatchParameterfv;
-extern RGLSYMGLBINDTRANSFORMFEEDBACKPROC __rglgen_glBindTransformFeedback;
-extern RGLSYMGLDELETETRANSFORMFEEDBACKSPROC __rglgen_glDeleteTransformFeedbacks;
-extern RGLSYMGLGENTRANSFORMFEEDBACKSPROC __rglgen_glGenTransformFeedbacks;
-extern RGLSYMGLISTRANSFORMFEEDBACKPROC __rglgen_glIsTransformFeedback;
-extern RGLSYMGLPAUSETRANSFORMFEEDBACKPROC __rglgen_glPauseTransformFeedback;
-extern RGLSYMGLRESUMETRANSFORMFEEDBACKPROC __rglgen_glResumeTransformFeedback;
-extern RGLSYMGLDRAWTRANSFORMFEEDBACKPROC __rglgen_glDrawTransformFeedback;
-extern RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMPROC __rglgen_glDrawTransformFeedbackStream;
-extern RGLSYMGLBEGINQUERYINDEXEDPROC __rglgen_glBeginQueryIndexed;
-extern RGLSYMGLENDQUERYINDEXEDPROC __rglgen_glEndQueryIndexed;
-extern RGLSYMGLGETQUERYINDEXEDIVPROC __rglgen_glGetQueryIndexediv;
-extern RGLSYMGLRELEASESHADERCOMPILERPROC __rglgen_glReleaseShaderCompiler;
-extern RGLSYMGLSHADERBINARYPROC __rglgen_glShaderBinary;
-extern RGLSYMGLGETSHADERPRECISIONFORMATPROC __rglgen_glGetShaderPrecisionFormat;
-extern RGLSYMGLDEPTHRANGEFPROC __rglgen_glDepthRangef;
-extern RGLSYMGLCLEARDEPTHFPROC __rglgen_glClearDepthf;
-extern RGLSYMGLGETPROGRAMBINARYPROC __rglgen_glGetProgramBinary;
-extern RGLSYMGLPROGRAMBINARYPROC __rglgen_glProgramBinary;
-extern RGLSYMGLPROGRAMPARAMETERIPROC __rglgen_glProgramParameteri;
-extern RGLSYMGLUSEPROGRAMSTAGESPROC __rglgen_glUseProgramStages;
-extern RGLSYMGLACTIVESHADERPROGRAMPROC __rglgen_glActiveShaderProgram;
-extern RGLSYMGLCREATESHADERPROGRAMVPROC __rglgen_glCreateShaderProgramv;
-extern RGLSYMGLBINDPROGRAMPIPELINEPROC __rglgen_glBindProgramPipeline;
-extern RGLSYMGLDELETEPROGRAMPIPELINESPROC __rglgen_glDeleteProgramPipelines;
-extern RGLSYMGLGENPROGRAMPIPELINESPROC __rglgen_glGenProgramPipelines;
-extern RGLSYMGLISPROGRAMPIPELINEPROC __rglgen_glIsProgramPipeline;
-extern RGLSYMGLGETPROGRAMPIPELINEIVPROC __rglgen_glGetProgramPipelineiv;
-extern RGLSYMGLPROGRAMUNIFORM1IPROC __rglgen_glProgramUniform1i;
-extern RGLSYMGLPROGRAMUNIFORM1IVPROC __rglgen_glProgramUniform1iv;
-extern RGLSYMGLPROGRAMUNIFORM1FPROC __rglgen_glProgramUniform1f;
-extern RGLSYMGLPROGRAMUNIFORM1FVPROC __rglgen_glProgramUniform1fv;
-extern RGLSYMGLPROGRAMUNIFORM1DPROC __rglgen_glProgramUniform1d;
-extern RGLSYMGLPROGRAMUNIFORM1DVPROC __rglgen_glProgramUniform1dv;
-extern RGLSYMGLPROGRAMUNIFORM1UIPROC __rglgen_glProgramUniform1ui;
-extern RGLSYMGLPROGRAMUNIFORM1UIVPROC __rglgen_glProgramUniform1uiv;
-extern RGLSYMGLPROGRAMUNIFORM2IPROC __rglgen_glProgramUniform2i;
-extern RGLSYMGLPROGRAMUNIFORM2IVPROC __rglgen_glProgramUniform2iv;
-extern RGLSYMGLPROGRAMUNIFORM2FPROC __rglgen_glProgramUniform2f;
-extern RGLSYMGLPROGRAMUNIFORM2FVPROC __rglgen_glProgramUniform2fv;
-extern RGLSYMGLPROGRAMUNIFORM2DPROC __rglgen_glProgramUniform2d;
-extern RGLSYMGLPROGRAMUNIFORM2DVPROC __rglgen_glProgramUniform2dv;
-extern RGLSYMGLPROGRAMUNIFORM2UIPROC __rglgen_glProgramUniform2ui;
-extern RGLSYMGLPROGRAMUNIFORM2UIVPROC __rglgen_glProgramUniform2uiv;
-extern RGLSYMGLPROGRAMUNIFORM3IPROC __rglgen_glProgramUniform3i;
-extern RGLSYMGLPROGRAMUNIFORM3IVPROC __rglgen_glProgramUniform3iv;
-extern RGLSYMGLPROGRAMUNIFORM3FPROC __rglgen_glProgramUniform3f;
-extern RGLSYMGLPROGRAMUNIFORM3FVPROC __rglgen_glProgramUniform3fv;
-extern RGLSYMGLPROGRAMUNIFORM3DPROC __rglgen_glProgramUniform3d;
-extern RGLSYMGLPROGRAMUNIFORM3DVPROC __rglgen_glProgramUniform3dv;
-extern RGLSYMGLPROGRAMUNIFORM3UIPROC __rglgen_glProgramUniform3ui;
-extern RGLSYMGLPROGRAMUNIFORM3UIVPROC __rglgen_glProgramUniform3uiv;
-extern RGLSYMGLPROGRAMUNIFORM4IPROC __rglgen_glProgramUniform4i;
-extern RGLSYMGLPROGRAMUNIFORM4IVPROC __rglgen_glProgramUniform4iv;
-extern RGLSYMGLPROGRAMUNIFORM4FPROC __rglgen_glProgramUniform4f;
-extern RGLSYMGLPROGRAMUNIFORM4FVPROC __rglgen_glProgramUniform4fv;
-extern RGLSYMGLPROGRAMUNIFORM4DPROC __rglgen_glProgramUniform4d;
-extern RGLSYMGLPROGRAMUNIFORM4DVPROC __rglgen_glProgramUniform4dv;
-extern RGLSYMGLPROGRAMUNIFORM4UIPROC __rglgen_glProgramUniform4ui;
-extern RGLSYMGLPROGRAMUNIFORM4UIVPROC __rglgen_glProgramUniform4uiv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2FVPROC __rglgen_glProgramUniformMatrix2fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3FVPROC __rglgen_glProgramUniformMatrix3fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4FVPROC __rglgen_glProgramUniformMatrix4fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2DVPROC __rglgen_glProgramUniformMatrix2dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3DVPROC __rglgen_glProgramUniformMatrix3dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4DVPROC __rglgen_glProgramUniformMatrix4dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVPROC __rglgen_glProgramUniformMatrix2x3fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVPROC __rglgen_glProgramUniformMatrix3x2fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVPROC __rglgen_glProgramUniformMatrix2x4fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVPROC __rglgen_glProgramUniformMatrix4x2fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVPROC __rglgen_glProgramUniformMatrix3x4fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVPROC __rglgen_glProgramUniformMatrix4x3fv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X3DVPROC __rglgen_glProgramUniformMatrix2x3dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X2DVPROC __rglgen_glProgramUniformMatrix3x2dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX2X4DVPROC __rglgen_glProgramUniformMatrix2x4dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X2DVPROC __rglgen_glProgramUniformMatrix4x2dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX3X4DVPROC __rglgen_glProgramUniformMatrix3x4dv;
-extern RGLSYMGLPROGRAMUNIFORMMATRIX4X3DVPROC __rglgen_glProgramUniformMatrix4x3dv;
-extern RGLSYMGLVALIDATEPROGRAMPIPELINEPROC __rglgen_glValidateProgramPipeline;
-extern RGLSYMGLGETPROGRAMPIPELINEINFOLOGPROC __rglgen_glGetProgramPipelineInfoLog;
-extern RGLSYMGLVERTEXATTRIBL1DPROC __rglgen_glVertexAttribL1d;
-extern RGLSYMGLVERTEXATTRIBL2DPROC __rglgen_glVertexAttribL2d;
-extern RGLSYMGLVERTEXATTRIBL3DPROC __rglgen_glVertexAttribL3d;
-extern RGLSYMGLVERTEXATTRIBL4DPROC __rglgen_glVertexAttribL4d;
-extern RGLSYMGLVERTEXATTRIBL1DVPROC __rglgen_glVertexAttribL1dv;
-extern RGLSYMGLVERTEXATTRIBL2DVPROC __rglgen_glVertexAttribL2dv;
-extern RGLSYMGLVERTEXATTRIBL3DVPROC __rglgen_glVertexAttribL3dv;
-extern RGLSYMGLVERTEXATTRIBL4DVPROC __rglgen_glVertexAttribL4dv;
-extern RGLSYMGLVERTEXATTRIBLPOINTERPROC __rglgen_glVertexAttribLPointer;
-extern RGLSYMGLGETVERTEXATTRIBLDVPROC __rglgen_glGetVertexAttribLdv;
-extern RGLSYMGLVIEWPORTARRAYVPROC __rglgen_glViewportArrayv;
-extern RGLSYMGLVIEWPORTINDEXEDFPROC __rglgen_glViewportIndexedf;
-extern RGLSYMGLVIEWPORTINDEXEDFVPROC __rglgen_glViewportIndexedfv;
-extern RGLSYMGLSCISSORARRAYVPROC __rglgen_glScissorArrayv;
-extern RGLSYMGLSCISSORINDEXEDPROC __rglgen_glScissorIndexed;
-extern RGLSYMGLSCISSORINDEXEDVPROC __rglgen_glScissorIndexedv;
-extern RGLSYMGLDEPTHRANGEARRAYVPROC __rglgen_glDepthRangeArrayv;
-extern RGLSYMGLDEPTHRANGEINDEXEDPROC __rglgen_glDepthRangeIndexed;
-extern RGLSYMGLGETFLOATI_VPROC __rglgen_glGetFloati_v;
-extern RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v;
-extern RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __rglgen_glDrawArraysInstancedBaseInstance;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __rglgen_glDrawElementsInstancedBaseInstance;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstance;
-extern RGLSYMGLGETINTERNALFORMATIVPROC __rglgen_glGetInternalformativ;
-extern RGLSYMGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __rglgen_glGetActiveAtomicCounterBufferiv;
-extern RGLSYMGLBINDIMAGETEXTUREPROC __rglgen_glBindImageTexture;
-extern RGLSYMGLMEMORYBARRIERPROC __rglgen_glMemoryBarrier;
-extern RGLSYMGLTEXSTORAGE1DPROC __rglgen_glTexStorage1D;
-extern RGLSYMGLTEXSTORAGE2DPROC __rglgen_glTexStorage2D;
-extern RGLSYMGLTEXSTORAGE3DPROC __rglgen_glTexStorage3D;
-extern RGLSYMGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __rglgen_glDrawTransformFeedbackInstanced;
-extern RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __rglgen_glDrawTransformFeedbackStreamInstanced;
-extern RGLSYMGLCLEARBUFFERDATAPROC __rglgen_glClearBufferData;
-extern RGLSYMGLCLEARBUFFERSUBDATAPROC __rglgen_glClearBufferSubData;
-extern RGLSYMGLDISPATCHCOMPUTEPROC __rglgen_glDispatchCompute;
-extern RGLSYMGLDISPATCHCOMPUTEINDIRECTPROC __rglgen_glDispatchComputeIndirect;
-extern RGLSYMGLCOPYIMAGESUBDATAPROC __rglgen_glCopyImageSubData;
-extern RGLSYMGLFRAMEBUFFERPARAMETERIPROC __rglgen_glFramebufferParameteri;
-extern RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC __rglgen_glGetFramebufferParameteriv;
-extern RGLSYMGLGETINTERNALFORMATI64VPROC __rglgen_glGetInternalformati64v;
-extern RGLSYMGLINVALIDATETEXSUBIMAGEPROC __rglgen_glInvalidateTexSubImage;
-extern RGLSYMGLINVALIDATETEXIMAGEPROC __rglgen_glInvalidateTexImage;
-extern RGLSYMGLINVALIDATEBUFFERSUBDATAPROC __rglgen_glInvalidateBufferSubData;
-extern RGLSYMGLINVALIDATEBUFFERDATAPROC __rglgen_glInvalidateBufferData;
-extern RGLSYMGLINVALIDATEFRAMEBUFFERPROC __rglgen_glInvalidateFramebuffer;
-extern RGLSYMGLINVALIDATESUBFRAMEBUFFERPROC __rglgen_glInvalidateSubFramebuffer;
-extern RGLSYMGLMULTIDRAWARRAYSINDIRECTPROC __rglgen_glMultiDrawArraysIndirect;
-extern RGLSYMGLMULTIDRAWELEMENTSINDIRECTPROC __rglgen_glMultiDrawElementsIndirect;
-extern RGLSYMGLGETPROGRAMINTERFACEIVPROC __rglgen_glGetProgramInterfaceiv;
-extern RGLSYMGLGETPROGRAMRESOURCEINDEXPROC __rglgen_glGetProgramResourceIndex;
-extern RGLSYMGLGETPROGRAMRESOURCENAMEPROC __rglgen_glGetProgramResourceName;
-extern RGLSYMGLGETPROGRAMRESOURCEIVPROC __rglgen_glGetProgramResourceiv;
-extern RGLSYMGLGETPROGRAMRESOURCELOCATIONPROC __rglgen_glGetProgramResourceLocation;
-extern RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXPROC __rglgen_glGetProgramResourceLocationIndex;
-extern RGLSYMGLSHADERSTORAGEBLOCKBINDINGPROC __rglgen_glShaderStorageBlockBinding;
-extern RGLSYMGLTEXBUFFERRANGEPROC __rglgen_glTexBufferRange;
-extern RGLSYMGLTEXSTORAGE2DMULTISAMPLEPROC __rglgen_glTexStorage2DMultisample;
-extern RGLSYMGLTEXSTORAGE3DMULTISAMPLEPROC __rglgen_glTexStorage3DMultisample;
-extern RGLSYMGLTEXTUREVIEWPROC __rglgen_glTextureView;
-extern RGLSYMGLBINDVERTEXBUFFERPROC __rglgen_glBindVertexBuffer;
-extern RGLSYMGLVERTEXATTRIBFORMATPROC __rglgen_glVertexAttribFormat;
-extern RGLSYMGLVERTEXATTRIBIFORMATPROC __rglgen_glVertexAttribIFormat;
-extern RGLSYMGLVERTEXATTRIBLFORMATPROC __rglgen_glVertexAttribLFormat;
-extern RGLSYMGLVERTEXATTRIBBINDINGPROC __rglgen_glVertexAttribBinding;
-extern RGLSYMGLVERTEXBINDINGDIVISORPROC __rglgen_glVertexBindingDivisor;
-extern RGLSYMGLDEBUGMESSAGECONTROLPROC __rglgen_glDebugMessageControl;
-extern RGLSYMGLDEBUGMESSAGEINSERTPROC __rglgen_glDebugMessageInsert;
-extern RGLSYMGLDEBUGMESSAGECALLBACKPROC __rglgen_glDebugMessageCallback;
-extern RGLSYMGLGETDEBUGMESSAGELOGPROC __rglgen_glGetDebugMessageLog;
-extern RGLSYMGLPUSHDEBUGGROUPPROC __rglgen_glPushDebugGroup;
-extern RGLSYMGLPOPDEBUGGROUPPROC __rglgen_glPopDebugGroup;
-extern RGLSYMGLOBJECTLABELPROC __rglgen_glObjectLabel;
-extern RGLSYMGLGETOBJECTLABELPROC __rglgen_glGetObjectLabel;
-extern RGLSYMGLOBJECTPTRLABELPROC __rglgen_glObjectPtrLabel;
-extern RGLSYMGLGETOBJECTPTRLABELPROC __rglgen_glGetObjectPtrLabel;
-extern RGLSYMGLBUFFERSTORAGEPROC __rglgen_glBufferStorage;
-extern RGLSYMGLCLEARTEXIMAGEPROC __rglgen_glClearTexImage;
-extern RGLSYMGLCLEARTEXSUBIMAGEPROC __rglgen_glClearTexSubImage;
-extern RGLSYMGLBINDBUFFERSBASEPROC __rglgen_glBindBuffersBase;
-extern RGLSYMGLBINDBUFFERSRANGEPROC __rglgen_glBindBuffersRange;
-extern RGLSYMGLBINDTEXTURESPROC __rglgen_glBindTextures;
-extern RGLSYMGLBINDSAMPLERSPROC __rglgen_glBindSamplers;
-extern RGLSYMGLBINDIMAGETEXTURESPROC __rglgen_glBindImageTextures;
-extern RGLSYMGLBINDVERTEXBUFFERSPROC __rglgen_glBindVertexBuffers;
-extern RGLSYMGLGETTEXTUREHANDLEARBPROC __rglgen_glGetTextureHandleARB;
-extern RGLSYMGLGETTEXTURESAMPLERHANDLEARBPROC __rglgen_glGetTextureSamplerHandleARB;
-extern RGLSYMGLMAKETEXTUREHANDLERESIDENTARBPROC __rglgen_glMakeTextureHandleResidentARB;
-extern RGLSYMGLMAKETEXTUREHANDLENONRESIDENTARBPROC __rglgen_glMakeTextureHandleNonResidentARB;
-extern RGLSYMGLGETIMAGEHANDLEARBPROC __rglgen_glGetImageHandleARB;
-extern RGLSYMGLMAKEIMAGEHANDLERESIDENTARBPROC __rglgen_glMakeImageHandleResidentARB;
-extern RGLSYMGLMAKEIMAGEHANDLENONRESIDENTARBPROC __rglgen_glMakeImageHandleNonResidentARB;
-extern RGLSYMGLUNIFORMHANDLEUI64ARBPROC __rglgen_glUniformHandleui64ARB;
-extern RGLSYMGLUNIFORMHANDLEUI64VARBPROC __rglgen_glUniformHandleui64vARB;
-extern RGLSYMGLPROGRAMUNIFORMHANDLEUI64ARBPROC __rglgen_glProgramUniformHandleui64ARB;
-extern RGLSYMGLPROGRAMUNIFORMHANDLEUI64VARBPROC __rglgen_glProgramUniformHandleui64vARB;
-extern RGLSYMGLISTEXTUREHANDLERESIDENTARBPROC __rglgen_glIsTextureHandleResidentARB;
-extern RGLSYMGLISIMAGEHANDLERESIDENTARBPROC __rglgen_glIsImageHandleResidentARB;
-extern RGLSYMGLVERTEXATTRIBL1UI64ARBPROC __rglgen_glVertexAttribL1ui64ARB;
-extern RGLSYMGLVERTEXATTRIBL1UI64VARBPROC __rglgen_glVertexAttribL1ui64vARB;
-extern RGLSYMGLGETVERTEXATTRIBLUI64VARBPROC __rglgen_glGetVertexAttribLui64vARB;
-extern RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB;
-extern RGLSYMGLCLAMPCOLORARBPROC __rglgen_glClampColorARB;
-extern RGLSYMGLDISPATCHCOMPUTEGROUPSIZEARBPROC __rglgen_glDispatchComputeGroupSizeARB;
-extern RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB;
-extern RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB;
-extern RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB;
-extern RGLSYMGLGETDEBUGMESSAGELOGARBPROC __rglgen_glGetDebugMessageLogARB;
-extern RGLSYMGLDRAWBUFFERSARBPROC __rglgen_glDrawBuffersARB;
-extern RGLSYMGLBLENDEQUATIONIARBPROC __rglgen_glBlendEquationiARB;
-extern RGLSYMGLBLENDEQUATIONSEPARATEIARBPROC __rglgen_glBlendEquationSeparateiARB;
-extern RGLSYMGLBLENDFUNCIARBPROC __rglgen_glBlendFunciARB;
-extern RGLSYMGLBLENDFUNCSEPARATEIARBPROC __rglgen_glBlendFuncSeparateiARB;
-extern RGLSYMGLDRAWARRAYSINSTANCEDARBPROC __rglgen_glDrawArraysInstancedARB;
-extern RGLSYMGLDRAWELEMENTSINSTANCEDARBPROC __rglgen_glDrawElementsInstancedARB;
-extern RGLSYMGLPROGRAMSTRINGARBPROC __rglgen_glProgramStringARB;
-extern RGLSYMGLBINDPROGRAMARBPROC __rglgen_glBindProgramARB;
-extern RGLSYMGLDELETEPROGRAMSARBPROC __rglgen_glDeleteProgramsARB;
-extern RGLSYMGLGENPROGRAMSARBPROC __rglgen_glGenProgramsARB;
-extern RGLSYMGLPROGRAMENVPARAMETER4DARBPROC __rglgen_glProgramEnvParameter4dARB;
-extern RGLSYMGLPROGRAMENVPARAMETER4DVARBPROC __rglgen_glProgramEnvParameter4dvARB;
-extern RGLSYMGLPROGRAMENVPARAMETER4FARBPROC __rglgen_glProgramEnvParameter4fARB;
-extern RGLSYMGLPROGRAMENVPARAMETER4FVARBPROC __rglgen_glProgramEnvParameter4fvARB;
-extern RGLSYMGLPROGRAMLOCALPARAMETER4DARBPROC __rglgen_glProgramLocalParameter4dARB;
-extern RGLSYMGLPROGRAMLOCALPARAMETER4DVARBPROC __rglgen_glProgramLocalParameter4dvARB;
-extern RGLSYMGLPROGRAMLOCALPARAMETER4FARBPROC __rglgen_glProgramLocalParameter4fARB;
-extern RGLSYMGLPROGRAMLOCALPARAMETER4FVARBPROC __rglgen_glProgramLocalParameter4fvARB;
-extern RGLSYMGLGETPROGRAMENVPARAMETERDVARBPROC __rglgen_glGetProgramEnvParameterdvARB;
-extern RGLSYMGLGETPROGRAMENVPARAMETERFVARBPROC __rglgen_glGetProgramEnvParameterfvARB;
-extern RGLSYMGLGETPROGRAMLOCALPARAMETERDVARBPROC __rglgen_glGetProgramLocalParameterdvARB;
-extern RGLSYMGLGETPROGRAMLOCALPARAMETERFVARBPROC __rglgen_glGetProgramLocalParameterfvARB;
-extern RGLSYMGLGETPROGRAMIVARBPROC __rglgen_glGetProgramivARB;
-extern RGLSYMGLGETPROGRAMSTRINGARBPROC __rglgen_glGetProgramStringARB;
-extern RGLSYMGLISPROGRAMARBPROC __rglgen_glIsProgramARB;
-extern RGLSYMGLPROGRAMPARAMETERIARBPROC __rglgen_glProgramParameteriARB;
-extern RGLSYMGLFRAMEBUFFERTEXTUREARBPROC __rglgen_glFramebufferTextureARB;
-extern RGLSYMGLFRAMEBUFFERTEXTURELAYERARBPROC __rglgen_glFramebufferTextureLayerARB;
-extern RGLSYMGLFRAMEBUFFERTEXTUREFACEARBPROC __rglgen_glFramebufferTextureFaceARB;
-extern RGLSYMGLCOLORTABLEPROC __rglgen_glColorTable;
-extern RGLSYMGLCOLORTABLEPARAMETERFVPROC __rglgen_glColorTableParameterfv;
-extern RGLSYMGLCOLORTABLEPARAMETERIVPROC __rglgen_glColorTableParameteriv;
-extern RGLSYMGLCOPYCOLORTABLEPROC __rglgen_glCopyColorTable;
-extern RGLSYMGLGETCOLORTABLEPROC __rglgen_glGetColorTable;
-extern RGLSYMGLGETCOLORTABLEPARAMETERFVPROC __rglgen_glGetColorTableParameterfv;
-extern RGLSYMGLGETCOLORTABLEPARAMETERIVPROC __rglgen_glGetColorTableParameteriv;
-extern RGLSYMGLCOLORSUBTABLEPROC __rglgen_glColorSubTable;
-extern RGLSYMGLCOPYCOLORSUBTABLEPROC __rglgen_glCopyColorSubTable;
-extern RGLSYMGLCONVOLUTIONFILTER1DPROC __rglgen_glConvolutionFilter1D;
-extern RGLSYMGLCONVOLUTIONFILTER2DPROC __rglgen_glConvolutionFilter2D;
-extern RGLSYMGLCONVOLUTIONPARAMETERFPROC __rglgen_glConvolutionParameterf;
-extern RGLSYMGLCONVOLUTIONPARAMETERFVPROC __rglgen_glConvolutionParameterfv;
-extern RGLSYMGLCONVOLUTIONPARAMETERIPROC __rglgen_glConvolutionParameteri;
-extern RGLSYMGLCONVOLUTIONPARAMETERIVPROC __rglgen_glConvolutionParameteriv;
-extern RGLSYMGLCOPYCONVOLUTIONFILTER1DPROC __rglgen_glCopyConvolutionFilter1D;
-extern RGLSYMGLCOPYCONVOLUTIONFILTER2DPROC __rglgen_glCopyConvolutionFilter2D;
-extern RGLSYMGLGETCONVOLUTIONFILTERPROC __rglgen_glGetConvolutionFilter;
-extern RGLSYMGLGETCONVOLUTIONPARAMETERFVPROC __rglgen_glGetConvolutionParameterfv;
-extern RGLSYMGLGETCONVOLUTIONPARAMETERIVPROC __rglgen_glGetConvolutionParameteriv;
-extern RGLSYMGLGETSEPARABLEFILTERPROC __rglgen_glGetSeparableFilter;
-extern RGLSYMGLSEPARABLEFILTER2DPROC __rglgen_glSeparableFilter2D;
-extern RGLSYMGLGETHISTOGRAMPROC __rglgen_glGetHistogram;
-extern RGLSYMGLGETHISTOGRAMPARAMETERFVPROC __rglgen_glGetHistogramParameterfv;
-extern RGLSYMGLGETHISTOGRAMPARAMETERIVPROC __rglgen_glGetHistogramParameteriv;
-extern RGLSYMGLGETMINMAXPROC __rglgen_glGetMinmax;
-extern RGLSYMGLGETMINMAXPARAMETERFVPROC __rglgen_glGetMinmaxParameterfv;
-extern RGLSYMGLGETMINMAXPARAMETERIVPROC __rglgen_glGetMinmaxParameteriv;
-extern RGLSYMGLHISTOGRAMPROC __rglgen_glHistogram;
-extern RGLSYMGLMINMAXPROC __rglgen_glMinmax;
-extern RGLSYMGLRESETHISTOGRAMPROC __rglgen_glResetHistogram;
-extern RGLSYMGLRESETMINMAXPROC __rglgen_glResetMinmax;
-extern RGLSYMGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __rglgen_glMultiDrawArraysIndirectCountARB;
-extern RGLSYMGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __rglgen_glMultiDrawElementsIndirectCountARB;
-extern RGLSYMGLVERTEXATTRIBDIVISORARBPROC __rglgen_glVertexAttribDivisorARB;
-extern RGLSYMGLCURRENTPALETTEMATRIXARBPROC __rglgen_glCurrentPaletteMatrixARB;
-extern RGLSYMGLMATRIXINDEXUBVARBPROC __rglgen_glMatrixIndexubvARB;
-extern RGLSYMGLMATRIXINDEXUSVARBPROC __rglgen_glMatrixIndexusvARB;
-extern RGLSYMGLMATRIXINDEXUIVARBPROC __rglgen_glMatrixIndexuivARB;
-extern RGLSYMGLMATRIXINDEXPOINTERARBPROC __rglgen_glMatrixIndexPointerARB;
-extern RGLSYMGLSAMPLECOVERAGEARBPROC __rglgen_glSampleCoverageARB;
-extern RGLSYMGLACTIVETEXTUREARBPROC __rglgen_glActiveTextureARB;
-extern RGLSYMGLCLIENTACTIVETEXTUREARBPROC __rglgen_glClientActiveTextureARB;
-extern RGLSYMGLMULTITEXCOORD1DARBPROC __rglgen_glMultiTexCoord1dARB;
-extern RGLSYMGLMULTITEXCOORD1DVARBPROC __rglgen_glMultiTexCoord1dvARB;
-extern RGLSYMGLMULTITEXCOORD1FARBPROC __rglgen_glMultiTexCoord1fARB;
-extern RGLSYMGLMULTITEXCOORD1FVARBPROC __rglgen_glMultiTexCoord1fvARB;
-extern RGLSYMGLMULTITEXCOORD1IARBPROC __rglgen_glMultiTexCoord1iARB;
-extern RGLSYMGLMULTITEXCOORD1IVARBPROC __rglgen_glMultiTexCoord1ivARB;
-extern RGLSYMGLMULTITEXCOORD1SARBPROC __rglgen_glMultiTexCoord1sARB;
-extern RGLSYMGLMULTITEXCOORD1SVARBPROC __rglgen_glMultiTexCoord1svARB;
-extern RGLSYMGLMULTITEXCOORD2DARBPROC __rglgen_glMultiTexCoord2dARB;
-extern RGLSYMGLMULTITEXCOORD2DVARBPROC __rglgen_glMultiTexCoord2dvARB;
-extern RGLSYMGLMULTITEXCOORD2FARBPROC __rglgen_glMultiTexCoord2fARB;
-extern RGLSYMGLMULTITEXCOORD2FVARBPROC __rglgen_glMultiTexCoord2fvARB;
-extern RGLSYMGLMULTITEXCOORD2IARBPROC __rglgen_glMultiTexCoord2iARB;
-extern RGLSYMGLMULTITEXCOORD2IVARBPROC __rglgen_glMultiTexCoord2ivARB;
-extern RGLSYMGLMULTITEXCOORD2SARBPROC __rglgen_glMultiTexCoord2sARB;
-extern RGLSYMGLMULTITEXCOORD2SVARBPROC __rglgen_glMultiTexCoord2svARB;
-extern RGLSYMGLMULTITEXCOORD3DARBPROC __rglgen_glMultiTexCoord3dARB;
-extern RGLSYMGLMULTITEXCOORD3DVARBPROC __rglgen_glMultiTexCoord3dvARB;
-extern RGLSYMGLMULTITEXCOORD3FARBPROC __rglgen_glMultiTexCoord3fARB;
-extern RGLSYMGLMULTITEXCOORD3FVARBPROC __rglgen_glMultiTexCoord3fvARB;
-extern RGLSYMGLMULTITEXCOORD3IARBPROC __rglgen_glMultiTexCoord3iARB;
-extern RGLSYMGLMULTITEXCOORD3IVARBPROC __rglgen_glMultiTexCoord3ivARB;
-extern RGLSYMGLMULTITEXCOORD3SARBPROC __rglgen_glMultiTexCoord3sARB;
-extern RGLSYMGLMULTITEXCOORD3SVARBPROC __rglgen_glMultiTexCoord3svARB;
-extern RGLSYMGLMULTITEXCOORD4DARBPROC __rglgen_glMultiTexCoord4dARB;
-extern RGLSYMGLMULTITEXCOORD4DVARBPROC __rglgen_glMultiTexCoord4dvARB;
-extern RGLSYMGLMULTITEXCOORD4FARBPROC __rglgen_glMultiTexCoord4fARB;
-extern RGLSYMGLMULTITEXCOORD4FVARBPROC __rglgen_glMultiTexCoord4fvARB;
-extern RGLSYMGLMULTITEXCOORD4IARBPROC __rglgen_glMultiTexCoord4iARB;
-extern RGLSYMGLMULTITEXCOORD4IVARBPROC __rglgen_glMultiTexCoord4ivARB;
-extern RGLSYMGLMULTITEXCOORD4SARBPROC __rglgen_glMultiTexCoord4sARB;
-extern RGLSYMGLMULTITEXCOORD4SVARBPROC __rglgen_glMultiTexCoord4svARB;
-extern RGLSYMGLGENQUERIESARBPROC __rglgen_glGenQueriesARB;
-extern RGLSYMGLDELETEQUERIESARBPROC __rglgen_glDeleteQueriesARB;
-extern RGLSYMGLISQUERYARBPROC __rglgen_glIsQueryARB;
-extern RGLSYMGLBEGINQUERYARBPROC __rglgen_glBeginQueryARB;
-extern RGLSYMGLENDQUERYARBPROC __rglgen_glEndQueryARB;
-extern RGLSYMGLGETQUERYIVARBPROC __rglgen_glGetQueryivARB;
-extern RGLSYMGLGETQUERYOBJECTIVARBPROC __rglgen_glGetQueryObjectivARB;
-extern RGLSYMGLGETQUERYOBJECTUIVARBPROC __rglgen_glGetQueryObjectuivARB;
-extern RGLSYMGLPOINTPARAMETERFARBPROC __rglgen_glPointParameterfARB;
-extern RGLSYMGLPOINTPARAMETERFVARBPROC __rglgen_glPointParameterfvARB;
-extern RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC __rglgen_glGetGraphicsResetStatusARB;
-extern RGLSYMGLGETNTEXIMAGEARBPROC __rglgen_glGetnTexImageARB;
-extern RGLSYMGLREADNPIXELSARBPROC __rglgen_glReadnPixelsARB;
-extern RGLSYMGLGETNCOMPRESSEDTEXIMAGEARBPROC __rglgen_glGetnCompressedTexImageARB;
-extern RGLSYMGLGETNUNIFORMFVARBPROC __rglgen_glGetnUniformfvARB;
-extern RGLSYMGLGETNUNIFORMIVARBPROC __rglgen_glGetnUniformivARB;
-extern RGLSYMGLGETNUNIFORMUIVARBPROC __rglgen_glGetnUniformuivARB;
-extern RGLSYMGLGETNUNIFORMDVARBPROC __rglgen_glGetnUniformdvARB;
-extern RGLSYMGLGETNMAPDVARBPROC __rglgen_glGetnMapdvARB;
-extern RGLSYMGLGETNMAPFVARBPROC __rglgen_glGetnMapfvARB;
-extern RGLSYMGLGETNMAPIVARBPROC __rglgen_glGetnMapivARB;
-extern RGLSYMGLGETNPIXELMAPFVARBPROC __rglgen_glGetnPixelMapfvARB;
-extern RGLSYMGLGETNPIXELMAPUIVARBPROC __rglgen_glGetnPixelMapuivARB;
-extern RGLSYMGLGETNPIXELMAPUSVARBPROC __rglgen_glGetnPixelMapusvARB;
-extern RGLSYMGLGETNPOLYGONSTIPPLEARBPROC __rglgen_glGetnPolygonStippleARB;
-extern RGLSYMGLGETNCOLORTABLEARBPROC __rglgen_glGetnColorTableARB;
-extern RGLSYMGLGETNCONVOLUTIONFILTERARBPROC __rglgen_glGetnConvolutionFilterARB;
-extern RGLSYMGLGETNSEPARABLEFILTERARBPROC __rglgen_glGetnSeparableFilterARB;
-extern RGLSYMGLGETNHISTOGRAMARBPROC __rglgen_glGetnHistogramARB;
-extern RGLSYMGLGETNMINMAXARBPROC __rglgen_glGetnMinmaxARB;
-extern RGLSYMGLMINSAMPLESHADINGARBPROC __rglgen_glMinSampleShadingARB;
-extern RGLSYMGLDELETEOBJECTARBPROC __rglgen_glDeleteObjectARB;
-extern RGLSYMGLGETHANDLEARBPROC __rglgen_glGetHandleARB;
-extern RGLSYMGLDETACHOBJECTARBPROC __rglgen_glDetachObjectARB;
-extern RGLSYMGLCREATESHADEROBJECTARBPROC __rglgen_glCreateShaderObjectARB;
-extern RGLSYMGLSHADERSOURCEARBPROC __rglgen_glShaderSourceARB;
-extern RGLSYMGLCOMPILESHADERARBPROC __rglgen_glCompileShaderARB;
-extern RGLSYMGLCREATEPROGRAMOBJECTARBPROC __rglgen_glCreateProgramObjectARB;
-extern RGLSYMGLATTACHOBJECTARBPROC __rglgen_glAttachObjectARB;
-extern RGLSYMGLLINKPROGRAMARBPROC __rglgen_glLinkProgramARB;
-extern RGLSYMGLUSEPROGRAMOBJECTARBPROC __rglgen_glUseProgramObjectARB;
-extern RGLSYMGLVALIDATEPROGRAMARBPROC __rglgen_glValidateProgramARB;
-extern RGLSYMGLUNIFORM1FARBPROC __rglgen_glUniform1fARB;
-extern RGLSYMGLUNIFORM2FARBPROC __rglgen_glUniform2fARB;
-extern RGLSYMGLUNIFORM3FARBPROC __rglgen_glUniform3fARB;
-extern RGLSYMGLUNIFORM4FARBPROC __rglgen_glUniform4fARB;
-extern RGLSYMGLUNIFORM1IARBPROC __rglgen_glUniform1iARB;
-extern RGLSYMGLUNIFORM2IARBPROC __rglgen_glUniform2iARB;
-extern RGLSYMGLUNIFORM3IARBPROC __rglgen_glUniform3iARB;
-extern RGLSYMGLUNIFORM4IARBPROC __rglgen_glUniform4iARB;
-extern RGLSYMGLUNIFORM1FVARBPROC __rglgen_glUniform1fvARB;
-extern RGLSYMGLUNIFORM2FVARBPROC __rglgen_glUniform2fvARB;
-extern RGLSYMGLUNIFORM3FVARBPROC __rglgen_glUniform3fvARB;
-extern RGLSYMGLUNIFORM4FVARBPROC __rglgen_glUniform4fvARB;
-extern RGLSYMGLUNIFORM1IVARBPROC __rglgen_glUniform1ivARB;
-extern RGLSYMGLUNIFORM2IVARBPROC __rglgen_glUniform2ivARB;
-extern RGLSYMGLUNIFORM3IVARBPROC __rglgen_glUniform3ivARB;
-extern RGLSYMGLUNIFORM4IVARBPROC __rglgen_glUniform4ivARB;
-extern RGLSYMGLUNIFORMMATRIX2FVARBPROC __rglgen_glUniformMatrix2fvARB;
-extern RGLSYMGLUNIFORMMATRIX3FVARBPROC __rglgen_glUniformMatrix3fvARB;
-extern RGLSYMGLUNIFORMMATRIX4FVARBPROC __rglgen_glUniformMatrix4fvARB;
-extern RGLSYMGLGETOBJECTPARAMETERFVARBPROC __rglgen_glGetObjectParameterfvARB;
-extern RGLSYMGLGETOBJECTPARAMETERIVARBPROC __rglgen_glGetObjectParameterivARB;
-extern RGLSYMGLGETINFOLOGARBPROC __rglgen_glGetInfoLogARB;
-extern RGLSYMGLGETATTACHEDOBJECTSARBPROC __rglgen_glGetAttachedObjectsARB;
-extern RGLSYMGLGETUNIFORMLOCATIONARBPROC __rglgen_glGetUniformLocationARB;
-extern RGLSYMGLGETACTIVEUNIFORMARBPROC __rglgen_glGetActiveUniformARB;
-extern RGLSYMGLGETUNIFORMFVARBPROC __rglgen_glGetUniformfvARB;
-extern RGLSYMGLGETUNIFORMIVARBPROC __rglgen_glGetUniformivARB;
-extern RGLSYMGLGETSHADERSOURCEARBPROC __rglgen_glGetShaderSourceARB;
-extern RGLSYMGLNAMEDSTRINGARBPROC __rglgen_glNamedStringARB;
-extern RGLSYMGLDELETENAMEDSTRINGARBPROC __rglgen_glDeleteNamedStringARB;
-extern RGLSYMGLCOMPILESHADERINCLUDEARBPROC __rglgen_glCompileShaderIncludeARB;
-extern RGLSYMGLISNAMEDSTRINGARBPROC __rglgen_glIsNamedStringARB;
-extern RGLSYMGLGETNAMEDSTRINGARBPROC __rglgen_glGetNamedStringARB;
-extern RGLSYMGLGETNAMEDSTRINGIVARBPROC __rglgen_glGetNamedStringivARB;
-extern RGLSYMGLTEXPAGECOMMITMENTARBPROC __rglgen_glTexPageCommitmentARB;
-extern RGLSYMGLTEXBUFFERARBPROC __rglgen_glTexBufferARB;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE3DARBPROC __rglgen_glCompressedTexImage3DARB;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE2DARBPROC __rglgen_glCompressedTexImage2DARB;
-extern RGLSYMGLCOMPRESSEDTEXIMAGE1DARBPROC __rglgen_glCompressedTexImage1DARB;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __rglgen_glCompressedTexSubImage3DARB;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __rglgen_glCompressedTexSubImage2DARB;
-extern RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __rglgen_glCompressedTexSubImage1DARB;
-extern RGLSYMGLGETCOMPRESSEDTEXIMAGEARBPROC __rglgen_glGetCompressedTexImageARB;
-extern RGLSYMGLLOADTRANSPOSEMATRIXFARBPROC __rglgen_glLoadTransposeMatrixfARB;
-extern RGLSYMGLLOADTRANSPOSEMATRIXDARBPROC __rglgen_glLoadTransposeMatrixdARB;
-extern RGLSYMGLMULTTRANSPOSEMATRIXFARBPROC __rglgen_glMultTransposeMatrixfARB;
-extern RGLSYMGLMULTTRANSPOSEMATRIXDARBPROC __rglgen_glMultTransposeMatrixdARB;
-extern RGLSYMGLWEIGHTBVARBPROC __rglgen_glWeightbvARB;
-extern RGLSYMGLWEIGHTSVARBPROC __rglgen_glWeightsvARB;
-extern RGLSYMGLWEIGHTIVARBPROC __rglgen_glWeightivARB;
-extern RGLSYMGLWEIGHTFVARBPROC __rglgen_glWeightfvARB;
-extern RGLSYMGLWEIGHTDVARBPROC __rglgen_glWeightdvARB;
-extern RGLSYMGLWEIGHTUBVARBPROC __rglgen_glWeightubvARB;
-extern RGLSYMGLWEIGHTUSVARBPROC __rglgen_glWeightusvARB;
-extern RGLSYMGLWEIGHTUIVARBPROC __rglgen_glWeightuivARB;
-extern RGLSYMGLWEIGHTPOINTERARBPROC __rglgen_glWeightPointerARB;
-extern RGLSYMGLVERTEXBLENDARBPROC __rglgen_glVertexBlendARB;
-extern RGLSYMGLBINDBUFFERARBPROC __rglgen_glBindBufferARB;
-extern RGLSYMGLDELETEBUFFERSARBPROC __rglgen_glDeleteBuffersARB;
-extern RGLSYMGLGENBUFFERSARBPROC __rglgen_glGenBuffersARB;
-extern RGLSYMGLISBUFFERARBPROC __rglgen_glIsBufferARB;
-extern RGLSYMGLBUFFERDATAARBPROC __rglgen_glBufferDataARB;
-extern RGLSYMGLBUFFERSUBDATAARBPROC __rglgen_glBufferSubDataARB;
-extern RGLSYMGLGETBUFFERSUBDATAARBPROC __rglgen_glGetBufferSubDataARB;
-extern RGLSYMGLMAPBUFFERARBPROC __rglgen_glMapBufferARB;
-extern RGLSYMGLUNMAPBUFFERARBPROC __rglgen_glUnmapBufferARB;
-extern RGLSYMGLGETBUFFERPARAMETERIVARBPROC __rglgen_glGetBufferParameterivARB;
-extern RGLSYMGLGETBUFFERPOINTERVARBPROC __rglgen_glGetBufferPointervARB;
-extern RGLSYMGLVERTEXATTRIB1DARBPROC __rglgen_glVertexAttrib1dARB;
-extern RGLSYMGLVERTEXATTRIB1DVARBPROC __rglgen_glVertexAttrib1dvARB;
-extern RGLSYMGLVERTEXATTRIB1FARBPROC __rglgen_glVertexAttrib1fARB;
-extern RGLSYMGLVERTEXATTRIB1FVARBPROC __rglgen_glVertexAttrib1fvARB;
-extern RGLSYMGLVERTEXATTRIB1SARBPROC __rglgen_glVertexAttrib1sARB;
-extern RGLSYMGLVERTEXATTRIB1SVARBPROC __rglgen_glVertexAttrib1svARB;
-extern RGLSYMGLVERTEXATTRIB2DARBPROC __rglgen_glVertexAttrib2dARB;
-extern RGLSYMGLVERTEXATTRIB2DVARBPROC __rglgen_glVertexAttrib2dvARB;
-extern RGLSYMGLVERTEXATTRIB2FARBPROC __rglgen_glVertexAttrib2fARB;
-extern RGLSYMGLVERTEXATTRIB2FVARBPROC __rglgen_glVertexAttrib2fvARB;
-extern RGLSYMGLVERTEXATTRIB2SARBPROC __rglgen_glVertexAttrib2sARB;
-extern RGLSYMGLVERTEXATTRIB2SVARBPROC __rglgen_glVertexAttrib2svARB;
-extern RGLSYMGLVERTEXATTRIB3DARBPROC __rglgen_glVertexAttrib3dARB;
-extern RGLSYMGLVERTEXATTRIB3DVARBPROC __rglgen_glVertexAttrib3dvARB;
-extern RGLSYMGLVERTEXATTRIB3FARBPROC __rglgen_glVertexAttrib3fARB;
-extern RGLSYMGLVERTEXATTRIB3FVARBPROC __rglgen_glVertexAttrib3fvARB;
-extern RGLSYMGLVERTEXATTRIB3SARBPROC __rglgen_glVertexAttrib3sARB;
-extern RGLSYMGLVERTEXATTRIB3SVARBPROC __rglgen_glVertexAttrib3svARB;
-extern RGLSYMGLVERTEXATTRIB4NBVARBPROC __rglgen_glVertexAttrib4NbvARB;
-extern RGLSYMGLVERTEXATTRIB4NIVARBPROC __rglgen_glVertexAttrib4NivARB;
-extern RGLSYMGLVERTEXATTRIB4NSVARBPROC __rglgen_glVertexAttrib4NsvARB;
-extern RGLSYMGLVERTEXATTRIB4NUBARBPROC __rglgen_glVertexAttrib4NubARB;
-extern RGLSYMGLVERTEXATTRIB4NUBVARBPROC __rglgen_glVertexAttrib4NubvARB;
-extern RGLSYMGLVERTEXATTRIB4NUIVARBPROC __rglgen_glVertexAttrib4NuivARB;
-extern RGLSYMGLVERTEXATTRIB4NUSVARBPROC __rglgen_glVertexAttrib4NusvARB;
-extern RGLSYMGLVERTEXATTRIB4BVARBPROC __rglgen_glVertexAttrib4bvARB;
-extern RGLSYMGLVERTEXATTRIB4DARBPROC __rglgen_glVertexAttrib4dARB;
-extern RGLSYMGLVERTEXATTRIB4DVARBPROC __rglgen_glVertexAttrib4dvARB;
-extern RGLSYMGLVERTEXATTRIB4FARBPROC __rglgen_glVertexAttrib4fARB;
-extern RGLSYMGLVERTEXATTRIB4FVARBPROC __rglgen_glVertexAttrib4fvARB;
-extern RGLSYMGLVERTEXATTRIB4IVARBPROC __rglgen_glVertexAttrib4ivARB;
-extern RGLSYMGLVERTEXATTRIB4SARBPROC __rglgen_glVertexAttrib4sARB;
-extern RGLSYMGLVERTEXATTRIB4SVARBPROC __rglgen_glVertexAttrib4svARB;
-extern RGLSYMGLVERTEXATTRIB4UBVARBPROC __rglgen_glVertexAttrib4ubvARB;
-extern RGLSYMGLVERTEXATTRIB4UIVARBPROC __rglgen_glVertexAttrib4uivARB;
-extern RGLSYMGLVERTEXATTRIB4USVARBPROC __rglgen_glVertexAttrib4usvARB;
-extern RGLSYMGLVERTEXATTRIBPOINTERARBPROC __rglgen_glVertexAttribPointerARB;
-extern RGLSYMGLENABLEVERTEXATTRIBARRAYARBPROC __rglgen_glEnableVertexAttribArrayARB;
-extern RGLSYMGLDISABLEVERTEXATTRIBARRAYARBPROC __rglgen_glDisableVertexAttribArrayARB;
-extern RGLSYMGLGETVERTEXATTRIBDVARBPROC __rglgen_glGetVertexAttribdvARB;
-extern RGLSYMGLGETVERTEXATTRIBFVARBPROC __rglgen_glGetVertexAttribfvARB;
-extern RGLSYMGLGETVERTEXATTRIBIVARBPROC __rglgen_glGetVertexAttribivARB;
-extern RGLSYMGLGETVERTEXATTRIBPOINTERVARBPROC __rglgen_glGetVertexAttribPointervARB;
-extern RGLSYMGLBINDATTRIBLOCATIONARBPROC __rglgen_glBindAttribLocationARB;
-extern RGLSYMGLGETACTIVEATTRIBARBPROC __rglgen_glGetActiveAttribARB;
-extern RGLSYMGLGETATTRIBLOCATIONARBPROC __rglgen_glGetAttribLocationARB;
-extern RGLSYMGLWINDOWPOS2DARBPROC __rglgen_glWindowPos2dARB;
-extern RGLSYMGLWINDOWPOS2DVARBPROC __rglgen_glWindowPos2dvARB;
-extern RGLSYMGLWINDOWPOS2FARBPROC __rglgen_glWindowPos2fARB;
-extern RGLSYMGLWINDOWPOS2FVARBPROC __rglgen_glWindowPos2fvARB;
-extern RGLSYMGLWINDOWPOS2IARBPROC __rglgen_glWindowPos2iARB;
-extern RGLSYMGLWINDOWPOS2IVARBPROC __rglgen_glWindowPos2ivARB;
-extern RGLSYMGLWINDOWPOS2SARBPROC __rglgen_glWindowPos2sARB;
-extern RGLSYMGLWINDOWPOS2SVARBPROC __rglgen_glWindowPos2svARB;
-extern RGLSYMGLWINDOWPOS3DARBPROC __rglgen_glWindowPos3dARB;
-extern RGLSYMGLWINDOWPOS3DVARBPROC __rglgen_glWindowPos3dvARB;
-extern RGLSYMGLWINDOWPOS3FARBPROC __rglgen_glWindowPos3fARB;
-extern RGLSYMGLWINDOWPOS3FVARBPROC __rglgen_glWindowPos3fvARB;
-extern RGLSYMGLWINDOWPOS3IARBPROC __rglgen_glWindowPos3iARB;
-extern RGLSYMGLWINDOWPOS3IVARBPROC __rglgen_glWindowPos3ivARB;
-extern RGLSYMGLWINDOWPOS3SARBPROC __rglgen_glWindowPos3sARB;
-extern RGLSYMGLWINDOWPOS3SVARBPROC __rglgen_glWindowPos3svARB;
-extern RGLSYMGLMULTITEXCOORD1BOESPROC __rglgen_glMultiTexCoord1bOES;
-extern RGLSYMGLMULTITEXCOORD1BVOESPROC __rglgen_glMultiTexCoord1bvOES;
-extern RGLSYMGLMULTITEXCOORD2BOESPROC __rglgen_glMultiTexCoord2bOES;
-extern RGLSYMGLMULTITEXCOORD2BVOESPROC __rglgen_glMultiTexCoord2bvOES;
-extern RGLSYMGLMULTITEXCOORD3BOESPROC __rglgen_glMultiTexCoord3bOES;
-extern RGLSYMGLMULTITEXCOORD3BVOESPROC __rglgen_glMultiTexCoord3bvOES;
-extern RGLSYMGLMULTITEXCOORD4BOESPROC __rglgen_glMultiTexCoord4bOES;
-extern RGLSYMGLMULTITEXCOORD4BVOESPROC __rglgen_glMultiTexCoord4bvOES;
-extern RGLSYMGLTEXCOORD1BOESPROC __rglgen_glTexCoord1bOES;
-extern RGLSYMGLTEXCOORD1BVOESPROC __rglgen_glTexCoord1bvOES;
-extern RGLSYMGLTEXCOORD2BOESPROC __rglgen_glTexCoord2bOES;
-extern RGLSYMGLTEXCOORD2BVOESPROC __rglgen_glTexCoord2bvOES;
-extern RGLSYMGLTEXCOORD3BOESPROC __rglgen_glTexCoord3bOES;
-extern RGLSYMGLTEXCOORD3BVOESPROC __rglgen_glTexCoord3bvOES;
-extern RGLSYMGLTEXCOORD4BOESPROC __rglgen_glTexCoord4bOES;
-extern RGLSYMGLTEXCOORD4BVOESPROC __rglgen_glTexCoord4bvOES;
-extern RGLSYMGLVERTEX2BOESPROC __rglgen_glVertex2bOES;
-extern RGLSYMGLVERTEX2BVOESPROC __rglgen_glVertex2bvOES;
-extern RGLSYMGLVERTEX3BOESPROC __rglgen_glVertex3bOES;
-extern RGLSYMGLVERTEX3BVOESPROC __rglgen_glVertex3bvOES;
-extern RGLSYMGLVERTEX4BOESPROC __rglgen_glVertex4bOES;
-extern RGLSYMGLVERTEX4BVOESPROC __rglgen_glVertex4bvOES;
-extern RGLSYMGLALPHAFUNCXOESPROC __rglgen_glAlphaFuncxOES;
-extern RGLSYMGLCLEARCOLORXOESPROC __rglgen_glClearColorxOES;
-extern RGLSYMGLCLEARDEPTHXOESPROC __rglgen_glClearDepthxOES;
-extern RGLSYMGLCLIPPLANEXOESPROC __rglgen_glClipPlanexOES;
-extern RGLSYMGLCOLOR4XOESPROC __rglgen_glColor4xOES;
-extern RGLSYMGLDEPTHRANGEXOESPROC __rglgen_glDepthRangexOES;
-extern RGLSYMGLFOGXOESPROC __rglgen_glFogxOES;
-extern RGLSYMGLFOGXVOESPROC __rglgen_glFogxvOES;
-extern RGLSYMGLFRUSTUMXOESPROC __rglgen_glFrustumxOES;
-extern RGLSYMGLGETCLIPPLANEXOESPROC __rglgen_glGetClipPlanexOES;
-extern RGLSYMGLGETFIXEDVOESPROC __rglgen_glGetFixedvOES;
-extern RGLSYMGLGETTEXENVXVOESPROC __rglgen_glGetTexEnvxvOES;
-extern RGLSYMGLGETTEXPARAMETERXVOESPROC __rglgen_glGetTexParameterxvOES;
-extern RGLSYMGLLIGHTMODELXOESPROC __rglgen_glLightModelxOES;
-extern RGLSYMGLLIGHTMODELXVOESPROC __rglgen_glLightModelxvOES;
-extern RGLSYMGLLIGHTXOESPROC __rglgen_glLightxOES;
-extern RGLSYMGLLIGHTXVOESPROC __rglgen_glLightxvOES;
-extern RGLSYMGLLINEWIDTHXOESPROC __rglgen_glLineWidthxOES;
-extern RGLSYMGLLOADMATRIXXOESPROC __rglgen_glLoadMatrixxOES;
-extern RGLSYMGLMATERIALXOESPROC __rglgen_glMaterialxOES;
-extern RGLSYMGLMATERIALXVOESPROC __rglgen_glMaterialxvOES;
-extern RGLSYMGLMULTMATRIXXOESPROC __rglgen_glMultMatrixxOES;
-extern RGLSYMGLMULTITEXCOORD4XOESPROC __rglgen_glMultiTexCoord4xOES;
-extern RGLSYMGLNORMAL3XOESPROC __rglgen_glNormal3xOES;
-extern RGLSYMGLORTHOXOESPROC __rglgen_glOrthoxOES;
-extern RGLSYMGLPOINTPARAMETERXVOESPROC __rglgen_glPointParameterxvOES;
-extern RGLSYMGLPOINTSIZEXOESPROC __rglgen_glPointSizexOES;
-extern RGLSYMGLPOLYGONOFFSETXOESPROC __rglgen_glPolygonOffsetxOES;
-extern RGLSYMGLROTATEXOESPROC __rglgen_glRotatexOES;
-extern RGLSYMGLSAMPLECOVERAGEOESPROC __rglgen_glSampleCoverageOES;
-extern RGLSYMGLSCALEXOESPROC __rglgen_glScalexOES;
-extern RGLSYMGLTEXENVXOESPROC __rglgen_glTexEnvxOES;
-extern RGLSYMGLTEXENVXVOESPROC __rglgen_glTexEnvxvOES;
-extern RGLSYMGLTEXPARAMETERXOESPROC __rglgen_glTexParameterxOES;
-extern RGLSYMGLTEXPARAMETERXVOESPROC __rglgen_glTexParameterxvOES;
-extern RGLSYMGLTRANSLATEXOESPROC __rglgen_glTranslatexOES;
-extern RGLSYMGLACCUMXOESPROC __rglgen_glAccumxOES;
-extern RGLSYMGLBITMAPXOESPROC __rglgen_glBitmapxOES;
-extern RGLSYMGLBLENDCOLORXOESPROC __rglgen_glBlendColorxOES;
-extern RGLSYMGLCLEARACCUMXOESPROC __rglgen_glClearAccumxOES;
-extern RGLSYMGLCOLOR3XOESPROC __rglgen_glColor3xOES;
-extern RGLSYMGLCOLOR3XVOESPROC __rglgen_glColor3xvOES;
-extern RGLSYMGLCOLOR4XVOESPROC __rglgen_glColor4xvOES;
-extern RGLSYMGLCONVOLUTIONPARAMETERXOESPROC __rglgen_glConvolutionParameterxOES;
-extern RGLSYMGLCONVOLUTIONPARAMETERXVOESPROC __rglgen_glConvolutionParameterxvOES;
-extern RGLSYMGLEVALCOORD1XOESPROC __rglgen_glEvalCoord1xOES;
-extern RGLSYMGLEVALCOORD1XVOESPROC __rglgen_glEvalCoord1xvOES;
-extern RGLSYMGLEVALCOORD2XOESPROC __rglgen_glEvalCoord2xOES;
-extern RGLSYMGLEVALCOORD2XVOESPROC __rglgen_glEvalCoord2xvOES;
-extern RGLSYMGLFEEDBACKBUFFERXOESPROC __rglgen_glFeedbackBufferxOES;
-extern RGLSYMGLGETCONVOLUTIONPARAMETERXVOESPROC __rglgen_glGetConvolutionParameterxvOES;
-extern RGLSYMGLGETHISTOGRAMPARAMETERXVOESPROC __rglgen_glGetHistogramParameterxvOES;
-extern RGLSYMGLGETLIGHTXOESPROC __rglgen_glGetLightxOES;
-extern RGLSYMGLGETMAPXVOESPROC __rglgen_glGetMapxvOES;
-extern RGLSYMGLGETMATERIALXOESPROC __rglgen_glGetMaterialxOES;
-extern RGLSYMGLGETPIXELMAPXVPROC __rglgen_glGetPixelMapxv;
-extern RGLSYMGLGETTEXGENXVOESPROC __rglgen_glGetTexGenxvOES;
-extern RGLSYMGLGETTEXLEVELPARAMETERXVOESPROC __rglgen_glGetTexLevelParameterxvOES;
-extern RGLSYMGLINDEXXOESPROC __rglgen_glIndexxOES;
-extern RGLSYMGLINDEXXVOESPROC __rglgen_glIndexxvOES;
-extern RGLSYMGLLOADTRANSPOSEMATRIXXOESPROC __rglgen_glLoadTransposeMatrixxOES;
-extern RGLSYMGLMAP1XOESPROC __rglgen_glMap1xOES;
-extern RGLSYMGLMAP2XOESPROC __rglgen_glMap2xOES;
-extern RGLSYMGLMAPGRID1XOESPROC __rglgen_glMapGrid1xOES;
-extern RGLSYMGLMAPGRID2XOESPROC __rglgen_glMapGrid2xOES;
-extern RGLSYMGLMULTTRANSPOSEMATRIXXOESPROC __rglgen_glMultTransposeMatrixxOES;
-extern RGLSYMGLMULTITEXCOORD1XOESPROC __rglgen_glMultiTexCoord1xOES;
-extern RGLSYMGLMULTITEXCOORD1XVOESPROC __rglgen_glMultiTexCoord1xvOES;
-extern RGLSYMGLMULTITEXCOORD2XOESPROC __rglgen_glMultiTexCoord2xOES;
-extern RGLSYMGLMULTITEXCOORD2XVOESPROC __rglgen_glMultiTexCoord2xvOES;
-extern RGLSYMGLMULTITEXCOORD3XOESPROC __rglgen_glMultiTexCoord3xOES;
-extern RGLSYMGLMULTITEXCOORD3XVOESPROC __rglgen_glMultiTexCoord3xvOES;
-extern RGLSYMGLMULTITEXCOORD4XVOESPROC __rglgen_glMultiTexCoord4xvOES;
-extern RGLSYMGLNORMAL3XVOESPROC __rglgen_glNormal3xvOES;
-extern RGLSYMGLPASSTHROUGHXOESPROC __rglgen_glPassThroughxOES;
-extern RGLSYMGLPIXELMAPXPROC __rglgen_glPixelMapx;
-extern RGLSYMGLPIXELSTOREXPROC __rglgen_glPixelStorex;
-extern RGLSYMGLPIXELTRANSFERXOESPROC __rglgen_glPixelTransferxOES;
-extern RGLSYMGLPIXELZOOMXOESPROC __rglgen_glPixelZoomxOES;
-extern RGLSYMGLPRIORITIZETEXTURESXOESPROC __rglgen_glPrioritizeTexturesxOES;
-extern RGLSYMGLRASTERPOS2XOESPROC __rglgen_glRasterPos2xOES;
-extern RGLSYMGLRASTERPOS2XVOESPROC __rglgen_glRasterPos2xvOES;
-extern RGLSYMGLRASTERPOS3XOESPROC __rglgen_glRasterPos3xOES;
-extern RGLSYMGLRASTERPOS3XVOESPROC __rglgen_glRasterPos3xvOES;
-extern RGLSYMGLRASTERPOS4XOESPROC __rglgen_glRasterPos4xOES;
-extern RGLSYMGLRASTERPOS4XVOESPROC __rglgen_glRasterPos4xvOES;
-extern RGLSYMGLRECTXOESPROC __rglgen_glRectxOES;
-extern RGLSYMGLRECTXVOESPROC __rglgen_glRectxvOES;
-extern RGLSYMGLTEXCOORD1XOESPROC __rglgen_glTexCoord1xOES;
-extern RGLSYMGLTEXCOORD1XVOESPROC __rglgen_glTexCoord1xvOES;
-extern RGLSYMGLTEXCOORD2XOESPROC __rglgen_glTexCoord2xOES;
-extern RGLSYMGLTEXCOORD2XVOESPROC __rglgen_glTexCoord2xvOES;
-extern RGLSYMGLTEXCOORD3XOESPROC __rglgen_glTexCoord3xOES;
-extern RGLSYMGLTEXCOORD3XVOESPROC __rglgen_glTexCoord3xvOES;
-extern RGLSYMGLTEXCOORD4XOESPROC __rglgen_glTexCoord4xOES;
-extern RGLSYMGLTEXCOORD4XVOESPROC __rglgen_glTexCoord4xvOES;
-extern RGLSYMGLTEXGENXOESPROC __rglgen_glTexGenxOES;
-extern RGLSYMGLTEXGENXVOESPROC __rglgen_glTexGenxvOES;
-extern RGLSYMGLVERTEX2XOESPROC __rglgen_glVertex2xOES;
-extern RGLSYMGLVERTEX2XVOESPROC __rglgen_glVertex2xvOES;
-extern RGLSYMGLVERTEX3XOESPROC __rglgen_glVertex3xOES;
-extern RGLSYMGLVERTEX3XVOESPROC __rglgen_glVertex3xvOES;
-extern RGLSYMGLVERTEX4XOESPROC __rglgen_glVertex4xOES;
-extern RGLSYMGLVERTEX4XVOESPROC __rglgen_glVertex4xvOES;
-extern RGLSYMGLQUERYMATRIXXOESPROC __rglgen_glQueryMatrixxOES;
-extern RGLSYMGLCLEARDEPTHFOESPROC __rglgen_glClearDepthfOES;
-extern RGLSYMGLCLIPPLANEFOESPROC __rglgen_glClipPlanefOES;
-extern RGLSYMGLDEPTHRANGEFOESPROC __rglgen_glDepthRangefOES;
-extern RGLSYMGLFRUSTUMFOESPROC __rglgen_glFrustumfOES;
-extern RGLSYMGLGETCLIPPLANEFOESPROC __rglgen_glGetClipPlanefOES;
-extern RGLSYMGLORTHOFOESPROC __rglgen_glOrthofOES;
-extern RGLSYMGLIMAGETRANSFORMPARAMETERIHPPROC __rglgen_glImageTransformParameteriHP;
-extern RGLSYMGLIMAGETRANSFORMPARAMETERFHPPROC __rglgen_glImageTransformParameterfHP;
-extern RGLSYMGLIMAGETRANSFORMPARAMETERIVHPPROC __rglgen_glImageTransformParameterivHP;
-extern RGLSYMGLIMAGETRANSFORMPARAMETERFVHPPROC __rglgen_glImageTransformParameterfvHP;
-extern RGLSYMGLGETIMAGETRANSFORMPARAMETERIVHPPROC __rglgen_glGetImageTransformParameterivHP;
-extern RGLSYMGLGETIMAGETRANSFORMPARAMETERFVHPPROC __rglgen_glGetImageTransformParameterfvHP;
-
-struct rglgen_sym_map { const char *sym; void *ptr; };
-extern const struct rglgen_sym_map rglgen_symbol_map[];
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libretro-common/include/glsym/rglgen.h b/libretro-common/include/glsym/rglgen.h
deleted file mode 100644
index 54dcb62..0000000
--- a/libretro-common/include/glsym/rglgen.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef RGLGEN_H__
-#define RGLGEN_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <retro_common_api.h>
-
-#include "rglgen_headers.h"
-
-RETRO_BEGIN_DECLS
-
-struct rglgen_sym_map;
-
-typedef void (*rglgen_func_t)(void);
-typedef rglgen_func_t (*rglgen_proc_address_t)(const char*);
-void rglgen_resolve_symbols(rglgen_proc_address_t proc);
-void rglgen_resolve_symbols_custom(rglgen_proc_address_t proc,
-      const struct rglgen_sym_map *map);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/glsym/rglgen_headers.h b/libretro-common/include/glsym/rglgen_headers.h
deleted file mode 100644
index 06d8530..0000000
--- a/libretro-common/include/glsym/rglgen_headers.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef RGLGEN_HEADERS_H__
-#define RGLGEN_HEADERS_H__
-
-#ifdef HAVE_EGL
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#endif
-
-#if defined(IOS)
-
-#if defined(HAVE_OPENGLES3)
-#include <OpenGLES/ES3/gl.h>
-#include <OpenGLES/ES3/glext.h>
-#else
-#include <OpenGLES/ES2/gl.h>
-#include <OpenGLES/ES2/glext.h>
-#endif
-
-#elif defined(__APPLE__)
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-#elif defined(HAVE_PSGL)
-#include <PSGL/psgl.h>
-#include <GLES/glext.h>
-#elif defined(HAVE_OPENGL_MODERN)
-#include <GL3/gl3.h>
-#include <GL3/gl3ext.h>
-#elif defined(HAVE_OPENGLES3)
-#include <GLES3/gl3.h>
-#define __gl2_h_
-#include <GLES2/gl2ext.h>
-#elif defined(HAVE_OPENGLES2)
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#elif defined(HAVE_OPENGLES1)
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#else
-#if defined(_WIN32) && !defined(_XBOX)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-#include <GL/gl.h>
-#include <GL/glext.h>
-#endif
-
-#ifndef GL_MAP_WRITE_BIT
-#define GL_MAP_WRITE_BIT 0x0002
-#endif
-
-#ifndef GL_MAP_INVALIDATE_BUFFER_BIT
-#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008
-#endif
-
-#ifndef GL_RED_INTEGER
-#define GL_RED_INTEGER 0x8D94
-#endif
-
-#endif
diff --git a/libretro-common/include/libco.h b/libretro-common/include/libco.h
deleted file mode 100644
index 1599cb2..0000000
--- a/libretro-common/include/libco.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (libco.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBCO_H
-#define LIBCO_H
-
-#include <retro_common_api.h>
-
-#ifdef LIBCO_C
-  #ifdef LIBCO_MP
-    #define thread_local __thread
-  #else
-    #define thread_local
-  #endif
-#endif
-
-RETRO_BEGIN_DECLS
-
-typedef void* cothread_t;
-
-/**
- * co_active:
- *
- * Gets the currently active context.
- *
- * Returns: active context.
- **/
-cothread_t co_active(void);
-
-/**
- * co_create:
- * @int                : stack size
- * @funcptr            : thread entry function callback
- *
- * Create a co_thread.
- *
- * Returns: cothread if successful, otherwise NULL.
- */
-cothread_t co_create(unsigned int, void (*)(void));
-
-/**
- * co_delete:
- * @cothread           : cothread object
- *
- * Frees a co_thread.
- */
-void co_delete(cothread_t cothread);
-
-/**
- * co_switch:
- * @cothread           : cothread object to switch to
- *
- * Do a context switch to @cothread.
- */
-void co_switch(cothread_t cothread);
-
-RETRO_END_DECLS
-
-/* ifndef LIBCO_H */
-#endif
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
deleted file mode 100644
index b100865..0000000
--- a/libretro-common/include/libretro.h
+++ /dev/null
@@ -1,2166 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro API header (libretro.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_H__
-#define LIBRETRO_H__
-
-#include <stdint.h>
-#include <stddef.h>
-#include <limits.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __cplusplus
-#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
-/* Hack applied for MSVC when compiling in C89 mode
- * as it isn't C99-compliant. */
-#define bool unsigned char
-#define true 1
-#define false 0
-#else
-#include <stdbool.h>
-#endif
-#endif
-
-#ifndef RETRO_CALLCONV
-#  if defined(__GNUC__) && defined(__i386__) && !defined(__x86_64__)
-#    define RETRO_CALLCONV __attribute__((cdecl))
-#  elif defined(_MSC_VER) && defined(_M_X86) && !defined(_M_X64)
-#    define RETRO_CALLCONV __cdecl
-#  else
-#    define RETRO_CALLCONV /* all other platforms only have one calling convention each */
-#  endif
-#endif
-
-#ifndef RETRO_API
-#  if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#    ifdef RETRO_IMPORT_SYMBOLS
-#      ifdef __GNUC__
-#        define RETRO_API RETRO_CALLCONV __attribute__((__dllimport__))
-#      else
-#        define RETRO_API RETRO_CALLCONV __declspec(dllimport)
-#      endif
-#    else
-#      ifdef __GNUC__
-#        define RETRO_API RETRO_CALLCONV __attribute__((__dllexport__))
-#      else
-#        define RETRO_API RETRO_CALLCONV __declspec(dllexport)
-#      endif
-#    endif
-#  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
-#        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
-#      else
-#        define RETRO_API RETRO_CALLCONV
-#      endif
-#  endif
-#endif
-
-/* Used for checking API/ABI mismatches that can break libretro 
- * implementations.
- * It is not incremented for compatible changes to the API.
- */
-#define RETRO_API_VERSION         1
-
-/*
- * Libretro's fundamental device abstractions.
- *
- * Libretro's input system consists of some standardized device types,
- * such as a joypad (with/without analog), mouse, keyboard, lightgun 
- * and a pointer.
- *
- * The functionality of these devices are fixed, and individual cores 
- * map their own concept of a controller to libretro's abstractions.
- * This makes it possible for frontends to map the abstract types to a 
- * real input device, and not having to worry about binding input 
- * correctly to arbitrary controller layouts.
- */
-
-#define RETRO_DEVICE_TYPE_SHIFT         8
-#define RETRO_DEVICE_MASK               ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1)
-#define RETRO_DEVICE_SUBCLASS(base, id) (((id + 1) << RETRO_DEVICE_TYPE_SHIFT) | base)
-
-/* Input disabled. */
-#define RETRO_DEVICE_NONE         0
-
-/* The JOYPAD is called RetroPad. It is essentially a Super Nintendo 
- * controller, but with additional L2/R2/L3/R3 buttons, similar to a 
- * PS1 DualShock. */
-#define RETRO_DEVICE_JOYPAD       1
-
-/* The mouse is a simple mouse, similar to Super Nintendo's mouse.
- * X and Y coordinates are reported relatively to last poll (poll callback).
- * It is up to the libretro implementation to keep track of where the mouse 
- * pointer is supposed to be on the screen.
- * The frontend must make sure not to interfere with its own hardware 
- * mouse pointer.
- */
-#define RETRO_DEVICE_MOUSE        2
-
-/* KEYBOARD device lets one poll for raw key pressed.
- * It is poll based, so input callback will return with the current 
- * pressed state.
- * For event/text based keyboard input, see
- * RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK.
- */
-#define RETRO_DEVICE_KEYBOARD     3
-
-/* Lightgun X/Y coordinates are reported relatively to last poll,
- * similar to mouse. */
-#define RETRO_DEVICE_LIGHTGUN     4
-
-/* The ANALOG device is an extension to JOYPAD (RetroPad).
- * Similar to DualShock it adds two analog sticks.
- * This is treated as a separate device type as it returns values in the 
- * full analog range of [-0x8000, 0x7fff]. Positive X axis is right.
- * Positive Y axis is down.
- * Only use ANALOG type when polling for analog values of the axes.
- */
-#define RETRO_DEVICE_ANALOG       5
-
-/* Abstracts the concept of a pointing mechanism, e.g. touch.
- * This allows libretro to query in absolute coordinates where on the 
- * screen a mouse (or something similar) is being placed.
- * For a touch centric device, coordinates reported are the coordinates
- * of the press.
- *
- * Coordinates in X and Y are reported as:
- * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen,
- * and 0x7fff corresponds to the far right/bottom of the screen.
- * The "screen" is here defined as area that is passed to the frontend and 
- * later displayed on the monitor.
- *
- * The frontend is free to scale/resize this screen as it sees fit, however,
- * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the 
- * game image, etc.
- *
- * To check if the pointer coordinates are valid (e.g. a touch display 
- * actually being touched), PRESSED returns 1 or 0.
- *
- * If using a mouse on a desktop, PRESSED will usually correspond to the 
- * left mouse button, but this is a frontend decision.
- * PRESSED will only return 1 if the pointer is inside the game screen.
- *
- * For multi-touch, the index variable can be used to successively query 
- * more presses.
- * If index = 0 returns true for _PRESSED, coordinates can be extracted
- * with _X, _Y for index = 0. One can then query _PRESSED, _X, _Y with 
- * index = 1, and so on.
- * Eventually _PRESSED will return false for an index. No further presses 
- * are registered at this point. */
-#define RETRO_DEVICE_POINTER      6
-
-/* Buttons for the RetroPad (JOYPAD).
- * The placement of these is equivalent to placements on the 
- * Super Nintendo controller.
- * L2/R2/L3/R3 buttons correspond to the PS1 DualShock. */
-#define RETRO_DEVICE_ID_JOYPAD_B        0
-#define RETRO_DEVICE_ID_JOYPAD_Y        1
-#define RETRO_DEVICE_ID_JOYPAD_SELECT   2
-#define RETRO_DEVICE_ID_JOYPAD_START    3
-#define RETRO_DEVICE_ID_JOYPAD_UP       4
-#define RETRO_DEVICE_ID_JOYPAD_DOWN     5
-#define RETRO_DEVICE_ID_JOYPAD_LEFT     6
-#define RETRO_DEVICE_ID_JOYPAD_RIGHT    7
-#define RETRO_DEVICE_ID_JOYPAD_A        8
-#define RETRO_DEVICE_ID_JOYPAD_X        9
-#define RETRO_DEVICE_ID_JOYPAD_L       10
-#define RETRO_DEVICE_ID_JOYPAD_R       11
-#define RETRO_DEVICE_ID_JOYPAD_L2      12
-#define RETRO_DEVICE_ID_JOYPAD_R2      13
-#define RETRO_DEVICE_ID_JOYPAD_L3      14
-#define RETRO_DEVICE_ID_JOYPAD_R3      15
-
-/* Index / Id values for ANALOG device. */
-#define RETRO_DEVICE_INDEX_ANALOG_LEFT   0
-#define RETRO_DEVICE_INDEX_ANALOG_RIGHT  1
-#define RETRO_DEVICE_ID_ANALOG_X         0
-#define RETRO_DEVICE_ID_ANALOG_Y         1
-
-/* Id values for MOUSE. */
-#define RETRO_DEVICE_ID_MOUSE_X                0
-#define RETRO_DEVICE_ID_MOUSE_Y                1
-#define RETRO_DEVICE_ID_MOUSE_LEFT             2
-#define RETRO_DEVICE_ID_MOUSE_RIGHT            3
-#define RETRO_DEVICE_ID_MOUSE_WHEELUP          4
-#define RETRO_DEVICE_ID_MOUSE_WHEELDOWN        5
-#define RETRO_DEVICE_ID_MOUSE_MIDDLE           6
-#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP    7
-#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN  8
-
-/* Id values for LIGHTGUN types. */
-#define RETRO_DEVICE_ID_LIGHTGUN_X        0
-#define RETRO_DEVICE_ID_LIGHTGUN_Y        1
-#define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER  2
-#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR   3
-#define RETRO_DEVICE_ID_LIGHTGUN_TURBO    4
-#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE    5
-#define RETRO_DEVICE_ID_LIGHTGUN_START    6
-
-/* Id values for POINTER. */
-#define RETRO_DEVICE_ID_POINTER_X         0
-#define RETRO_DEVICE_ID_POINTER_Y         1
-#define RETRO_DEVICE_ID_POINTER_PRESSED   2
-
-/* Returned from retro_get_region(). */
-#define RETRO_REGION_NTSC  0
-#define RETRO_REGION_PAL   1
-
-/* Id values for LANGUAGE */
-enum retro_language
-{
-   RETRO_LANGUAGE_ENGLISH             = 0,
-   RETRO_LANGUAGE_JAPANESE            = 1,
-   RETRO_LANGUAGE_FRENCH              = 2,
-   RETRO_LANGUAGE_SPANISH             = 3,
-   RETRO_LANGUAGE_GERMAN              = 4,
-   RETRO_LANGUAGE_ITALIAN             = 5,
-   RETRO_LANGUAGE_DUTCH               = 6,
-   RETRO_LANGUAGE_PORTUGUESE_BRAZIL   = 7,
-   RETRO_LANGUAGE_PORTUGUESE_PORTUGAL = 8,
-   RETRO_LANGUAGE_RUSSIAN             = 9,
-   RETRO_LANGUAGE_KOREAN              = 10,
-   RETRO_LANGUAGE_CHINESE_TRADITIONAL = 11,
-   RETRO_LANGUAGE_CHINESE_SIMPLIFIED  = 12,
-   RETRO_LANGUAGE_ESPERANTO           = 13,
-   RETRO_LANGUAGE_POLISH              = 14,
-   RETRO_LANGUAGE_VIETNAMESE          = 15,
-   RETRO_LANGUAGE_LAST,
-
-   /* Ensure sizeof(enum) == sizeof(int) */
-   RETRO_LANGUAGE_DUMMY          = INT_MAX 
-};
-
-/* Passed to retro_get_memory_data/size().
- * If the memory type doesn't apply to the 
- * implementation NULL/0 can be returned.
- */
-#define RETRO_MEMORY_MASK        0xff
-
-/* Regular save RAM. This RAM is usually found on a game cartridge,
- * backed up by a battery.
- * If save game data is too complex for a single memory buffer,
- * the SAVE_DIRECTORY (preferably) or SYSTEM_DIRECTORY environment
- * callback can be used. */
-#define RETRO_MEMORY_SAVE_RAM    0
-
-/* Some games have a built-in clock to keep track of time.
- * This memory is usually just a couple of bytes to keep track of time.
- */
-#define RETRO_MEMORY_RTC         1
-
-/* System ram lets a frontend peek into a game systems main RAM. */
-#define RETRO_MEMORY_SYSTEM_RAM  2
-
-/* Video ram lets a frontend peek into a game systems video RAM (VRAM). */
-#define RETRO_MEMORY_VIDEO_RAM   3
-
-/* Keysyms used for ID in input state callback when polling RETRO_KEYBOARD. */
-enum retro_key
-{
-   RETROK_UNKNOWN        = 0,
-   RETROK_FIRST          = 0,
-   RETROK_BACKSPACE      = 8,
-   RETROK_TAB            = 9,
-   RETROK_CLEAR          = 12,
-   RETROK_RETURN         = 13,
-   RETROK_PAUSE          = 19,
-   RETROK_ESCAPE         = 27,
-   RETROK_SPACE          = 32,
-   RETROK_EXCLAIM        = 33,
-   RETROK_QUOTEDBL       = 34,
-   RETROK_HASH           = 35,
-   RETROK_DOLLAR         = 36,
-   RETROK_AMPERSAND      = 38,
-   RETROK_QUOTE          = 39,
-   RETROK_LEFTPAREN      = 40,
-   RETROK_RIGHTPAREN     = 41,
-   RETROK_ASTERISK       = 42,
-   RETROK_PLUS           = 43,
-   RETROK_COMMA          = 44,
-   RETROK_MINUS          = 45,
-   RETROK_PERIOD         = 46,
-   RETROK_SLASH          = 47,
-   RETROK_0              = 48,
-   RETROK_1              = 49,
-   RETROK_2              = 50,
-   RETROK_3              = 51,
-   RETROK_4              = 52,
-   RETROK_5              = 53,
-   RETROK_6              = 54,
-   RETROK_7              = 55,
-   RETROK_8              = 56,
-   RETROK_9              = 57,
-   RETROK_COLON          = 58,
-   RETROK_SEMICOLON      = 59,
-   RETROK_LESS           = 60,
-   RETROK_EQUALS         = 61,
-   RETROK_GREATER        = 62,
-   RETROK_QUESTION       = 63,
-   RETROK_AT             = 64,
-   RETROK_LEFTBRACKET    = 91,
-   RETROK_BACKSLASH      = 92,
-   RETROK_RIGHTBRACKET   = 93,
-   RETROK_CARET          = 94,
-   RETROK_UNDERSCORE     = 95,
-   RETROK_BACKQUOTE      = 96,
-   RETROK_a              = 97,
-   RETROK_b              = 98,
-   RETROK_c              = 99,
-   RETROK_d              = 100,
-   RETROK_e              = 101,
-   RETROK_f              = 102,
-   RETROK_g              = 103,
-   RETROK_h              = 104,
-   RETROK_i              = 105,
-   RETROK_j              = 106,
-   RETROK_k              = 107,
-   RETROK_l              = 108,
-   RETROK_m              = 109,
-   RETROK_n              = 110,
-   RETROK_o              = 111,
-   RETROK_p              = 112,
-   RETROK_q              = 113,
-   RETROK_r              = 114,
-   RETROK_s              = 115,
-   RETROK_t              = 116,
-   RETROK_u              = 117,
-   RETROK_v              = 118,
-   RETROK_w              = 119,
-   RETROK_x              = 120,
-   RETROK_y              = 121,
-   RETROK_z              = 122,
-   RETROK_DELETE         = 127,
-
-   RETROK_KP0            = 256,
-   RETROK_KP1            = 257,
-   RETROK_KP2            = 258,
-   RETROK_KP3            = 259,
-   RETROK_KP4            = 260,
-   RETROK_KP5            = 261,
-   RETROK_KP6            = 262,
-   RETROK_KP7            = 263,
-   RETROK_KP8            = 264,
-   RETROK_KP9            = 265,
-   RETROK_KP_PERIOD      = 266,
-   RETROK_KP_DIVIDE      = 267,
-   RETROK_KP_MULTIPLY    = 268,
-   RETROK_KP_MINUS       = 269,
-   RETROK_KP_PLUS        = 270,
-   RETROK_KP_ENTER       = 271,
-   RETROK_KP_EQUALS      = 272,
-
-   RETROK_UP             = 273,
-   RETROK_DOWN           = 274,
-   RETROK_RIGHT          = 275,
-   RETROK_LEFT           = 276,
-   RETROK_INSERT         = 277,
-   RETROK_HOME           = 278,
-   RETROK_END            = 279,
-   RETROK_PAGEUP         = 280,
-   RETROK_PAGEDOWN       = 281,
-
-   RETROK_F1             = 282,
-   RETROK_F2             = 283,
-   RETROK_F3             = 284,
-   RETROK_F4             = 285,
-   RETROK_F5             = 286,
-   RETROK_F6             = 287,
-   RETROK_F7             = 288,
-   RETROK_F8             = 289,
-   RETROK_F9             = 290,
-   RETROK_F10            = 291,
-   RETROK_F11            = 292,
-   RETROK_F12            = 293,
-   RETROK_F13            = 294,
-   RETROK_F14            = 295,
-   RETROK_F15            = 296,
-
-   RETROK_NUMLOCK        = 300,
-   RETROK_CAPSLOCK       = 301,
-   RETROK_SCROLLOCK      = 302,
-   RETROK_RSHIFT         = 303,
-   RETROK_LSHIFT         = 304,
-   RETROK_RCTRL          = 305,
-   RETROK_LCTRL          = 306,
-   RETROK_RALT           = 307,
-   RETROK_LALT           = 308,
-   RETROK_RMETA          = 309,
-   RETROK_LMETA          = 310,
-   RETROK_LSUPER         = 311,
-   RETROK_RSUPER         = 312,
-   RETROK_MODE           = 313,
-   RETROK_COMPOSE        = 314,
-
-   RETROK_HELP           = 315,
-   RETROK_PRINT          = 316,
-   RETROK_SYSREQ         = 317,
-   RETROK_BREAK          = 318,
-   RETROK_MENU           = 319,
-   RETROK_POWER          = 320,
-   RETROK_EURO           = 321,
-   RETROK_UNDO           = 322,
-
-   RETROK_LAST,
-
-   RETROK_DUMMY          = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
-};
-
-enum retro_mod
-{
-   RETROKMOD_NONE       = 0x0000,
-
-   RETROKMOD_SHIFT      = 0x01,
-   RETROKMOD_CTRL       = 0x02,
-   RETROKMOD_ALT        = 0x04,
-   RETROKMOD_META       = 0x08,
-
-   RETROKMOD_NUMLOCK    = 0x10,
-   RETROKMOD_CAPSLOCK   = 0x20,
-   RETROKMOD_SCROLLOCK  = 0x40,
-
-   RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
-};
-
-/* If set, this call is not part of the public libretro API yet. It can 
- * change or be removed at any time. */
-#define RETRO_ENVIRONMENT_EXPERIMENTAL 0x10000
-/* Environment callback to be used internally in frontend. */
-#define RETRO_ENVIRONMENT_PRIVATE 0x20000
-
-/* Environment commands. */
-#define RETRO_ENVIRONMENT_SET_ROTATION  1  /* const unsigned * --
-                                            * Sets screen rotation of graphics.
-                                            * Is only implemented if rotation can be accelerated by hardware.
-                                            * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180, 
-                                            * 270 degrees counter-clockwise respectively.
-                                            */
-#define RETRO_ENVIRONMENT_GET_OVERSCAN  2  /* bool * --
-                                            * Boolean value whether or not the implementation should use overscan, 
-                                            * or crop away overscan.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CAN_DUPE  3  /* bool * --
-                                            * Boolean value whether or not frontend supports frame duping,
-                                            * passing NULL to video frame callback.
-                                            */
-
-                                           /* Environ 4, 5 are no longer supported (GET_VARIABLE / SET_VARIABLES), 
-                                            * and reserved to avoid possible ABI clash.
-                                            */
-
-#define RETRO_ENVIRONMENT_SET_MESSAGE   6  /* const struct retro_message * --
-                                            * Sets a message to be displayed in implementation-specific manner 
-                                            * for a certain amount of 'frames'.
-                                            * Should not be used for trivial messages, which should simply be 
-                                            * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a 
-                                            * fallback, stderr).
-                                            */
-#define RETRO_ENVIRONMENT_SHUTDOWN      7  /* N/A (NULL) --
-                                            * Requests the frontend to shutdown.
-                                            * Should only be used if game has a specific
-                                            * way to shutdown the game from a menu item or similar.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL 8
-                                           /* const unsigned * --
-                                            * Gives a hint to the frontend how demanding this implementation
-                                            * is on a system. E.g. reporting a level of 2 means
-                                            * this implementation should run decently on all frontends
-                                            * of level 2 and up.
-                                            *
-                                            * It can be used by the frontend to potentially warn
-                                            * about too demanding implementations.
-                                            *
-                                            * The levels are "floating".
-                                            *
-                                            * This function can be called on a per-game basis,
-                                            * as certain games an implementation can play might be
-                                            * particularly demanding.
-                                            * If called, it should be called in retro_load_game().
-                                            */
-#define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9
-                                           /* const char ** --
-                                            * Returns the "system" directory of the frontend.
-                                            * This directory can be used to store system specific 
-                                            * content such as BIOSes, configuration data, etc.
-                                            * The returned value can be NULL.
-                                            * If so, no such directory is defined,
-                                            * and it's up to the implementation to find a suitable directory.
-                                            *
-                                            * NOTE: Some cores used this folder also for "save" data such as 
-                                            * memory cards, etc, for lack of a better place to put it.
-                                            * This is now discouraged, and if possible, cores should try to 
-                                            * use the new GET_SAVE_DIRECTORY.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PIXEL_FORMAT 10
-                                           /* const enum retro_pixel_format * --
-                                            * Sets the internal pixel format used by the implementation.
-                                            * The default pixel format is RETRO_PIXEL_FORMAT_0RGB1555.
-                                            * This pixel format however, is deprecated (see enum retro_pixel_format).
-                                            * If the call returns false, the frontend does not support this pixel 
-                                            * format.
-                                            *
-                                            * This function should be called inside retro_load_game() or 
-                                            * retro_get_system_av_info().
-                                            */
-#define RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS 11
-                                           /* const struct retro_input_descriptor * --
-                                            * Sets an array of retro_input_descriptors.
-                                            * It is up to the frontend to present this in a usable way.
-                                            * The array is terminated by retro_input_descriptor::description 
-                                            * being set to NULL.
-                                            * This function can be called at any time, but it is recommended 
-                                            * to call it as early as possible.
-                                            */
-#define RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK 12
-                                           /* const struct retro_keyboard_callback * --
-                                            * Sets a callback function used to notify core about keyboard events.
-                                            */
-#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE 13
-                                           /* const struct retro_disk_control_callback * --
-                                            * Sets an interface which frontend can use to eject and insert 
-                                            * disk images.
-                                            * This is used for games which consist of multiple images and 
-                                            * must be manually swapped out by the user (e.g. PSX).
-                                            */
-#define RETRO_ENVIRONMENT_SET_HW_RENDER 14
-                                           /* struct retro_hw_render_callback * --
-                                            * Sets an interface to let a libretro core render with 
-                                            * hardware acceleration.
-                                            * Should be called in retro_load_game().
-                                            * If successful, libretro cores will be able to render to a 
-                                            * frontend-provided framebuffer.
-                                            * The size of this framebuffer will be at least as large as 
-                                            * max_width/max_height provided in get_av_info().
-                                            * If HW rendering is used, pass only RETRO_HW_FRAME_BUFFER_VALID or 
-                                            * NULL to retro_video_refresh_t.
-                                            */
-#define RETRO_ENVIRONMENT_GET_VARIABLE 15
-                                           /* struct retro_variable * --
-                                            * Interface to acquire user-defined information from environment
-                                            * that cannot feasibly be supported in a multi-system way.
-                                            * 'key' should be set to a key which has already been set by 
-                                            * SET_VARIABLES.
-                                            * 'data' will be set to a value or NULL.
-                                            */
-#define RETRO_ENVIRONMENT_SET_VARIABLES 16
-                                           /* const struct retro_variable * --
-                                            * Allows an implementation to signal the environment
-                                            * which variables it might want to check for later using 
-                                            * GET_VARIABLE.
-                                            * This allows the frontend to present these variables to 
-                                            * a user dynamically.
-                                            * This should be called as early as possible (ideally in 
-                                            * retro_set_environment).
-                                            *
-                                            * 'data' points to an array of retro_variable structs 
-                                            * terminated by a { NULL, NULL } element.
-                                            * retro_variable::key should be namespaced to not collide 
-                                            * with other implementations' keys. E.g. A core called 
-                                            * 'foo' should use keys named as 'foo_option'.
-                                            * retro_variable::value should contain a human readable 
-                                            * description of the key as well as a '|' delimited list 
-                                            * of expected values.
-                                            *
-                                            * The number of possible options should be very limited, 
-                                            * i.e. it should be feasible to cycle through options 
-                                            * without a keyboard.
-                                            *
-                                            * First entry should be treated as a default.
-                                            *
-                                            * Example entry:
-                                            * { "foo_option", "Speed hack coprocessor X; false|true" }
-                                            *
-                                            * Text before first ';' is description. This ';' must be 
-                                            * followed by a space, and followed by a list of possible 
-                                            * values split up with '|'.
-                                            *
-                                            * Only strings are operated on. The possible values will 
-                                            * generally be displayed and stored as-is by the frontend.
-                                            */
-#define RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE 17
-                                           /* bool * --
-                                            * Result is set to true if some variables are updated by
-                                            * frontend since last call to RETRO_ENVIRONMENT_GET_VARIABLE.
-                                            * Variables should be queried with GET_VARIABLE.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME 18
-                                           /* const bool * --
-                                            * If true, the libretro implementation supports calls to 
-                                            * retro_load_game() with NULL as argument.
-                                            * Used by cores which can run without particular game data.
-                                            * This should be called within retro_set_environment() only.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LIBRETRO_PATH 19
-                                           /* const char ** --
-                                            * Retrieves the absolute path from where this libretro 
-                                            * implementation was loaded.
-                                            * NULL is returned if the libretro was loaded statically 
-                                            * (i.e. linked statically to frontend), or if the path cannot be 
-                                            * determined.
-                                            * Mostly useful in cooperation with SET_SUPPORT_NO_GAME as assets can 
-                                            * be loaded without ugly hacks.
-                                            */
-                                           
-                                           /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK. 
-                                            * It was not used by any known core at the time,
-                                            * and was removed from the API. */
-#define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22
-                                           /* const struct retro_audio_callback * --
-                                            * Sets an interface which is used to notify a libretro core about audio 
-                                            * being available for writing.
-                                            * The callback can be called from any thread, so a core using this must 
-                                            * have a thread safe audio implementation.
-                                            * It is intended for games where audio and video are completely 
-                                            * asynchronous and audio can be generated on the fly.
-                                            * This interface is not recommended for use with emulators which have 
-                                            * highly synchronous audio.
-                                            *
-                                            * The callback only notifies about writability; the libretro core still 
-                                            * has to call the normal audio callbacks
-                                            * to write audio. The audio callbacks must be called from within the 
-                                            * notification callback.
-                                            * The amount of audio data to write is up to the implementation.
-                                            * Generally, the audio callback will be called continously in a loop.
-                                            *
-                                            * Due to thread safety guarantees and lack of sync between audio and 
-                                            * video, a frontend  can selectively disallow this interface based on 
-                                            * internal configuration. A core using this interface must also 
-                                            * implement the "normal" audio interface.
-                                            *
-                                            * A libretro core using SET_AUDIO_CALLBACK should also make use of 
-                                            * SET_FRAME_TIME_CALLBACK.
-                                            */
-#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21
-                                           /* const struct retro_frame_time_callback * --
-                                            * Lets the core know how much time has passed since last 
-                                            * invocation of retro_run().
-                                            * The frontend can tamper with the timing to fake fast-forward, 
-                                            * slow-motion, frame stepping, etc.
-                                            * In this case the delta time will use the reference value 
-                                            * in frame_time_callback..
-                                            */
-#define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23
-                                           /* struct retro_rumble_interface * --
-                                            * Gets an interface which is used by a libretro core to set 
-                                            * state of rumble motors in controllers.
-                                            * A strong and weak motor is supported, and they can be 
-                                            * controlled indepedently.
-                                            */
-#define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24
-                                           /* uint64_t * --
-                                            * Gets a bitmask telling which device type are expected to be 
-                                            * handled properly in a call to retro_input_state_t.
-                                            * Devices which are not handled or recognized always return 
-                                            * 0 in retro_input_state_t.
-                                            * Example bitmask: caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG).
-                                            * Should only be called in retro_run().
-                                            */
-#define RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE (25 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_sensor_interface * --
-                                            * Gets access to the sensor interface.
-                                            * The purpose of this interface is to allow
-                                            * setting state related to sensors such as polling rate, 
-                                            * enabling/disable it entirely, etc.
-                                            * Reading sensor state is done via the normal 
-                                            * input_state_callback API.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE (26 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_camera_callback * --
-                                            * Gets an interface to a video camera driver.
-                                            * A libretro core can use this interface to get access to a 
-                                            * video camera.
-                                            * New video frames are delivered in a callback in same 
-                                            * thread as retro_run().
-                                            *
-                                            * GET_CAMERA_INTERFACE should be called in retro_load_game().
-                                            *
-                                            * Depending on the camera implementation used, camera frames 
-                                            * will be delivered as a raw framebuffer,
-                                            * or as an OpenGL texture directly.
-                                            *
-                                            * The core has to tell the frontend here which types of 
-                                            * buffers can be handled properly.
-                                            * An OpenGL texture can only be handled when using a 
-                                            * libretro GL core (SET_HW_RENDER).
-                                            * It is recommended to use a libretro GL core when 
-                                            * using camera interface.
-                                            *
-                                            * The camera is not started automatically. The retrieved start/stop 
-                                            * functions must be used to explicitly
-                                            * start and stop the camera driver.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LOG_INTERFACE 27
-                                           /* struct retro_log_callback * --
-                                            * Gets an interface for logging. This is useful for 
-                                            * logging in a cross-platform way
-                                            * as certain platforms cannot use use stderr for logging. 
-                                            * It also allows the frontend to
-                                            * show logging information in a more suitable way.
-                                            * If this interface is not used, libretro cores should 
-                                            * log to stderr as desired.
-                                            */
-#define RETRO_ENVIRONMENT_GET_PERF_INTERFACE 28
-                                           /* struct retro_perf_callback * --
-                                            * Gets an interface for performance counters. This is useful 
-                                            * for performance logging in a cross-platform way and for detecting 
-                                            * architecture-specific features, such as SIMD support.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE 29
-                                           /* struct retro_location_callback * --
-                                            * Gets access to the location interface.
-                                            * The purpose of this interface is to be able to retrieve 
-                                            * location-based information from the host device,
-                                            * such as current latitude / longitude.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 /* Old name, kept for compatibility. */
-#define RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY 30
-                                           /* const char ** --
-                                            * Returns the "core assets" directory of the frontend.
-                                            * This directory can be used to store specific assets that the 
-                                            * core relies upon, such as art assets,
-                                            * input data, etc etc.
-                                            * The returned value can be NULL.
-                                            * If so, no such directory is defined,
-                                            * and it's up to the implementation to find a suitable directory.
-                                            */
-#define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31
-                                           /* const char ** --
-                                            * Returns the "save" directory of the frontend.
-                                            * This directory can be used to store SRAM, memory cards, 
-                                            * high scores, etc, if the libretro core
-                                            * cannot use the regular memory interface (retro_get_memory_data()).
-                                            *
-                                            * NOTE: libretro cores used to check GET_SYSTEM_DIRECTORY for 
-                                            * similar things before.
-                                            * They should still check GET_SYSTEM_DIRECTORY if they want to 
-                                            * be backwards compatible.
-                                            * The path here can be NULL. It should only be non-NULL if the 
-                                            * frontend user has set a specific save path.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32
-                                           /* const struct retro_system_av_info * --
-                                            * Sets a new av_info structure. This can only be called from 
-                                            * within retro_run().
-                                            * This should *only* be used if the core is completely altering the 
-                                            * internal resolutions, aspect ratios, timings, sampling rate, etc.
-                                            * Calling this can require a full reinitialization of video/audio 
-                                            * drivers in the frontend,
-                                            *
-                                            * so it is important to call it very sparingly, and usually only with 
-                                            * the users explicit consent.
-                                            * An eventual driver reinitialize will happen so that video and 
-                                            * audio callbacks
-                                            * happening after this call within the same retro_run() call will 
-                                            * target the newly initialized driver.
-                                            *
-                                            * This callback makes it possible to support configurable resolutions 
-                                            * in games, which can be useful to
-                                            * avoid setting the "worst case" in max_width/max_height.
-                                            *
-                                            * ***HIGHLY RECOMMENDED*** Do not call this callback every time 
-                                            * resolution changes in an emulator core if it's
-                                            * expected to be a temporary change, for the reasons of possible 
-                                            * driver reinitialization.
-                                            * This call is not a free pass for not trying to provide 
-                                            * correct values in retro_get_system_av_info(). If you need to change 
-                                            * things like aspect ratio or nominal width/height, 
-                                            * use RETRO_ENVIRONMENT_SET_GEOMETRY, which is a softer variant 
-                                            * of SET_SYSTEM_AV_INFO.
-                                            *
-                                            * If this returns false, the frontend does not acknowledge a 
-                                            * changed av_info struct.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK 33
-                                           /* const struct retro_get_proc_address_interface * --
-                                            * Allows a libretro core to announce support for the 
-                                            * get_proc_address() interface.
-                                            * This interface allows for a standard way to extend libretro where 
-                                            * use of environment calls are too indirect,
-                                            * e.g. for cases where the frontend wants to call directly into the core.
-                                            *
-                                            * If a core wants to expose this interface, SET_PROC_ADDRESS_CALLBACK 
-                                            * **MUST** be called from within retro_set_environment().
-                                            */
-#define RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO 34
-                                           /* const struct retro_subsystem_info * --
-                                            * This environment call introduces the concept of libretro "subsystems".
-                                            * A subsystem is a variant of a libretro core which supports 
-                                            * different kinds of games.
-                                            * The purpose of this is to support e.g. emulators which might 
-                                            * have special needs, e.g. Super Nintendo's Super GameBoy, Sufami Turbo.
-                                            * It can also be used to pick among subsystems in an explicit way 
-                                            * if the libretro implementation is a multi-system emulator itself.
-                                            *
-                                            * Loading a game via a subsystem is done with retro_load_game_special(),
-                                            * and this environment call allows a libretro core to expose which 
-                                            * subsystems are supported for use with retro_load_game_special().
-                                            * A core passes an array of retro_game_special_info which is terminated 
-                                            * with a zeroed out retro_game_special_info struct.
-                                            *
-                                            * If a core wants to use this functionality, SET_SUBSYSTEM_INFO
-                                            * **MUST** be called from within retro_set_environment().
-                                            */
-#define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35
-                                           /* const struct retro_controller_info * --
-                                            * This environment call lets a libretro core tell the frontend 
-                                            * which controller types are recognized in calls to 
-                                            * retro_set_controller_port_device().
-                                            *
-                                            * Some emulators such as Super Nintendo
-                                            * support multiple lightgun types which must be specifically 
-                                            * selected from.
-                                            * It is therefore sometimes necessary for a frontend to be able 
-                                            * to tell the core about a special kind of input device which is 
-                                            * not covered by the libretro input API.
-                                            *
-                                            * In order for a frontend to understand the workings of an input device,
-                                            * it must be a specialized type
-                                            * of the generic device types already defined in the libretro API.
-                                            *
-                                            * Which devices are supported can vary per input port.
-                                            * The core must pass an array of const struct retro_controller_info which 
-                                            * is terminated with a blanked out struct. Each element of the struct 
-                                            * corresponds to an ascending port index to 
-                                            * retro_set_controller_port_device().
-                                            * Even if special device types are set in the libretro core, 
-                                            * libretro should only poll input based on the base input device types.
-                                            */
-#define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_memory_map * --
-                                            * This environment call lets a libretro core tell the frontend 
-                                            * about the memory maps this core emulates.
-                                            * This can be used to implement, for example, cheats in a core-agnostic way.
-                                            *
-                                            * Should only be used by emulators; it doesn't make much sense for 
-                                            * anything else.
-                                            * It is recommended to expose all relevant pointers through 
-                                            * retro_get_memory_* as well.
-                                            *
-                                            * Can be called from retro_init and retro_load_game.
-                                            */
-#define RETRO_ENVIRONMENT_SET_GEOMETRY 37
-                                           /* const struct retro_game_geometry * --
-                                            * This environment call is similar to SET_SYSTEM_AV_INFO for changing 
-                                            * video parameters, but provides a guarantee that drivers will not be 
-                                            * reinitialized.
-                                            * This can only be called from within retro_run().
-                                            *
-                                            * The purpose of this call is to allow a core to alter nominal 
-                                            * width/heights as well as aspect ratios on-the-fly, which can be 
-                                            * useful for some emulators to change in run-time.
-                                            *
-                                            * max_width/max_height arguments are ignored and cannot be changed
-                                            * with this call as this could potentially require a reinitialization or a 
-                                            * non-constant time operation.
-                                            * If max_width/max_height are to be changed, SET_SYSTEM_AV_INFO is required.
-                                            *
-                                            * A frontend must guarantee that this environment call completes in 
-                                            * constant time.
-                                            */
-#define RETRO_ENVIRONMENT_GET_USERNAME 38 
-                                           /* const char **
-                                            * Returns the specified username of the frontend, if specified by the user.
-                                            * This username can be used as a nickname for a core that has online facilities 
-                                            * or any other mode where personalization of the user is desirable.
-                                            * The returned value can be NULL.
-                                            * If this environ callback is used by a core that requires a valid username, 
-                                            * a default username should be specified by the core.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LANGUAGE 39
-                                           /* unsigned * --
-                                            * Returns the specified language of the frontend, if specified by the user.
-                                            * It can be used by the core for localization purposes.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER (40 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_framebuffer * --
-                                            * Returns a preallocated framebuffer which the core can use for rendering
-                                            * the frame into when not using SET_HW_RENDER.
-                                            * The framebuffer returned from this call must not be used
-                                            * after the current call to retro_run() returns.
-                                            *
-                                            * The goal of this call is to allow zero-copy behavior where a core
-                                            * can render directly into video memory, avoiding extra bandwidth cost by copying
-                                            * memory from core to video memory.
-                                            *
-                                            * If this call succeeds and the core renders into it,
-                                            * the framebuffer pointer and pitch can be passed to retro_video_refresh_t.
-                                            * If the buffer from GET_CURRENT_SOFTWARE_FRAMEBUFFER is to be used,
-                                            * the core must pass the exact
-                                            * same pointer as returned by GET_CURRENT_SOFTWARE_FRAMEBUFFER;
-                                            * i.e. passing a pointer which is offset from the
-                                            * buffer is undefined. The width, height and pitch parameters
-                                            * must also match exactly to the values obtained from GET_CURRENT_SOFTWARE_FRAMEBUFFER.
-                                            *
-                                            * It is possible for a frontend to return a different pixel format
-                                            * than the one used in SET_PIXEL_FORMAT. This can happen if the frontend
-                                            * needs to perform conversion.
-                                            *
-                                            * It is still valid for a core to render to a different buffer
-                                            * even if GET_CURRENT_SOFTWARE_FRAMEBUFFER succeeds.
-                                            *
-                                            * A frontend must make sure that the pointer obtained from this function is
-                                            * writeable (and readable).
-                                            */
-
-enum retro_hw_render_interface_type
-{
-   RETRO_HW_RENDER_INTERFACE_VULKAN = 0,
-   RETRO_HW_RENDER_INTERFACE_DUMMY = INT_MAX
-};
-
-/* Base struct. All retro_hw_render_interface_* types
- * contain at least these fields. */
-struct retro_hw_render_interface
-{
-   enum retro_hw_render_interface_type interface_type;
-   unsigned interface_version;
-};
-#define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_hw_render_interface ** --
-                                            * Returns an API specific rendering interface for accessing API specific data.
-                                            * Not all HW rendering APIs support or need this.
-                                            * The contents of the returned pointer is specific to the rendering API
-                                            * being used. See the various headers like libretro_vulkan.h, etc.
-                                            *
-                                            * GET_HW_RENDER_INTERFACE cannot be called before context_reset has been called.
-                                            * Similarly, after context_destroyed callback returns,
-                                            * the contents of the HW_RENDER_INTERFACE are invalidated.
-                                            */
-
-#define RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const bool * --
-                                            * If true, the libretro implementation supports achievements
-                                            * either via memory descriptors set with RETRO_ENVIRONMENT_SET_MEMORY_MAPS
-                                            * or via retro_get_memory_data/retro_get_memory_size.
-                                            *
-                                            * This must be called before the first call to retro_run.
-                                            */
-
-enum retro_hw_render_context_negotiation_interface_type
-{
-   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN = 0,
-   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_DUMMY = INT_MAX
-};
-
-/* Base struct. All retro_hw_render_context_negotiation_interface_* types
- * contain at least these fields. */
-struct retro_hw_render_context_negotiation_interface
-{
-   enum retro_hw_render_context_negotiation_interface_type interface_type;
-   unsigned interface_version;
-};
-#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_hw_render_context_negotiation_interface * --
-                                            * Sets an interface which lets the libretro core negotiate with frontend how a context is created.
-                                            * The semantics of this interface depends on which API is used in SET_HW_RENDER earlier.
-                                            * This interface will be used when the frontend is trying to create a HW rendering context,
-                                            * so it will be used after SET_HW_RENDER, but before the context_reset callback.
-                                            */
-
-/* Serialized state is incomplete in some way. Set if serialization is
- * usable in typical end-user cases but should not be relied upon to
- * implement frame-sensitive frontend features such as netplay or
- * rerecording. */
-#define RETRO_SERIALIZATION_QUIRK_INCOMPLETE (1 << 0)
-/* The core must spend some time initializing before serialization is
- * supported. retro_serialize() will initially fail; retro_unserialize()
- * and retro_serialize_size() may or may not work correctly either. */
-#define RETRO_SERIALIZATION_QUIRK_MUST_INITIALIZE (1 << 1)
-/* Serialization size may change within a session. */
-#define RETRO_SERIALIZATION_QUIRK_CORE_VARIABLE_SIZE (1 << 2)
-/* Set by the frontend to acknowledge that it supports variable-sized
- * states. */
-#define RETRO_SERIALIZATION_QUIRK_FRONT_VARIABLE_SIZE (1 << 3)
-/* Serialized state can only be loaded during the same session. */
-#define RETRO_SERIALIZATION_QUIRK_SINGLE_SESSION (1 << 4)
-/* Serialized state cannot be loaded on an architecture with a different
- * endianness from the one it was saved on. */
-#define RETRO_SERIALIZATION_QUIRK_ENDIAN_DEPENDENT (1 << 5)
-/* Serialized state cannot be loaded on a different platform from the one it
- * was saved on for reasons other than endianness, such as word size
- * dependence */
-#define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6)
-
-#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
-                                           /* uint64_t * --
-                                            * Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't
-                                            * recognize or support. Should be set in either retro_init or retro_load_game, but not both.
-                                            */
-
-
-#define RETRO_MEMDESC_CONST     (1 << 0)   /* The frontend will never change this memory area once retro_load_game has returned. */
-#define RETRO_MEMDESC_BIGENDIAN (1 << 1)   /* The memory area contains big endian data. Default is little endian. */
-#define RETRO_MEMDESC_ALIGN_2   (1 << 16)  /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
-#define RETRO_MEMDESC_ALIGN_4   (2 << 16)
-#define RETRO_MEMDESC_ALIGN_8   (3 << 16)
-#define RETRO_MEMDESC_MINSIZE_2 (1 << 24)  /* All memory in this region is accessed at least 2 bytes at the time. */
-#define RETRO_MEMDESC_MINSIZE_4 (2 << 24)
-#define RETRO_MEMDESC_MINSIZE_8 (3 << 24)
-struct retro_memory_descriptor
-{
-   uint64_t flags;
-
-   /* Pointer to the start of the relevant ROM or RAM chip.
-    * It's strongly recommended to use 'offset' if possible, rather than 
-    * doing math on the pointer.
-    *
-    * If the same byte is mapped my multiple descriptors, their descriptors 
-    * must have the same pointer.
-    * If 'start' does not point to the first byte in the pointer, put the 
-    * difference in 'offset' instead.
-    *
-    * May be NULL if there's nothing usable here (e.g. hardware registers and 
-    * open bus). No flags should be set if the pointer is NULL.
-    * It's recommended to minimize the number of descriptors if possible,
-    * but not mandatory. */
-   void *ptr;
-   size_t offset;
-
-   /* This is the location in the emulated address space 
-    * where the mapping starts. */
-   size_t start;
-
-   /* Which bits must be same as in 'start' for this mapping to apply.
-    * The first memory descriptor to claim a certain byte is the one 
-    * that applies.
-    * A bit which is set in 'start' must also be set in this.
-    * Can be zero, in which case each byte is assumed mapped exactly once. 
-    * In this case, 'len' must be a power of two. */
-   size_t select;
-
-   /* If this is nonzero, the set bits are assumed not connected to the 
-    * memory chip's address pins. */
-   size_t disconnect;
-
-   /* This one tells the size of the current memory area.
-    * If, after start+disconnect are applied, the address is higher than 
-    * this, the highest bit of the address is cleared.
-    *
-    * If the address is still too high, the next highest bit is cleared.
-    * Can be zero, in which case it's assumed to be infinite (as limited 
-    * by 'select' and 'disconnect'). */
-   size_t len;
-
-   /* To go from emulated address to physical address, the following 
-    * order applies:
-    * Subtract 'start', pick off 'disconnect', apply 'len', add 'offset'. */
-
-   /* The address space name must consist of only a-zA-Z0-9_-, 
-    * should be as short as feasible (maximum length is 8 plus the NUL),
-    * and may not be any other address space plus one or more 0-9A-F 
-    * at the end.
-    * However, multiple memory descriptors for the same address space is 
-    * allowed, and the address space name can be empty. NULL is treated 
-    * as empty.
-    *
-    * Address space names are case sensitive, but avoid lowercase if possible.
-    * The same pointer may exist in multiple address spaces.
-    *
-    * Examples:
-    * blank+blank - valid (multiple things may be mapped in the same namespace)
-    * 'Sp'+'Sp' - valid (multiple things may be mapped in the same namespace)
-    * 'A'+'B' - valid (neither is a prefix of each other)
-    * 'S'+blank - valid ('S' is not in 0-9A-F)
-    * 'a'+blank - valid ('a' is not in 0-9A-F)
-    * 'a'+'A' - valid (neither is a prefix of each other)
-    * 'AR'+blank - valid ('R' is not in 0-9A-F)
-    * 'ARB'+blank - valid (the B can't be part of the address either, because 
-    *                      there is no namespace 'AR')
-    * blank+'B' - not valid, because it's ambigous which address space B1234 
-    *             would refer to.
-    * The length can't be used for that purpose; the frontend may want 
-    * to append arbitrary data to an address, without a separator. */
-   const char *addrspace;
-
-   /* TODO: When finalizing this one, add a description field, which should be
-    * "WRAM" or something roughly equally long. */
-
-   /* TODO: When finalizing this one, replace 'select' with 'limit', which tells
-    * which bits can vary and still refer to the same address (limit = ~select).
-    * TODO: limit? range? vary? something else? */
-
-   /* TODO: When finalizing this one, if 'len' is above what 'select' (or
-    * 'limit') allows, it's bankswitched. Bankswitched data must have both 'len'
-    * and 'select' != 0, and the mappings don't tell how the system switches the
-    * banks. */
-
-   /* TODO: When finalizing this one, fix the 'len' bit removal order.
-    * For len=0x1800, pointer 0x1C00 should go to 0x1400, not 0x0C00.
-    * Algorithm: Take bits highest to lowest, but if it goes above len, clear
-    * the most recent addition and continue on the next bit.
-    * TODO: Can the above be optimized? Is "remove the lowest bit set in both
-    * pointer and 'len'" equivalent? */
-   
-   /* TODO: Some emulators (MAME?) emulate big endian systems by only accessing
-    * the emulated memory in 32-bit chunks, native endian. But that's nothing
-    * compared to Darek Mihocka <http://www.emulators.com/docs/nx07_vm101.htm>
-    * (section Emulation 103 - Nearly Free Byte Reversal) - he flips the ENTIRE
-    * RAM backwards! I'll want to represent both of those, via some flags.
-    * 
-    * I suspect MAME either didn't think of that idea, or don't want the #ifdef.
-    * Not sure which, nor do I really care. */
-   
-   /* TODO: Some of those flags are unused and/or don't really make sense. Clean
-    * them up. */
-};
-
-/* The frontend may use the largest value of 'start'+'select' in a 
- * certain namespace to infer the size of the address space.
- *
- * If the address space is larger than that, a mapping with .ptr=NULL 
- * should be at the end of the array, with .select set to all ones for 
- * as long as the address space is big.
- *
- * Sample descriptors (minus .ptr, and RETRO_MEMFLAG_ on the flags):
- * SNES WRAM:
- * .start=0x7E0000, .len=0x20000
- * (Note that this must be mapped before the ROM in most cases; some of the 
- * ROM mappers 
- * try to claim $7E0000, or at least $7E8000.)
- * SNES SPC700 RAM:
- * .addrspace="S", .len=0x10000
- * SNES WRAM mirrors:
- * .flags=MIRROR, .start=0x000000, .select=0xC0E000, .len=0x2000
- * .flags=MIRROR, .start=0x800000, .select=0xC0E000, .len=0x2000
- * SNES WRAM mirrors, alternate equivalent descriptor:
- * .flags=MIRROR, .select=0x40E000, .disconnect=~0x1FFF
- * (Various similar constructions can be created by combining parts of 
- * the above two.)
- * SNES LoROM (512KB, mirrored a couple of times):
- * .flags=CONST, .start=0x008000, .select=0x408000, .disconnect=0x8000, .len=512*1024
- * .flags=CONST, .start=0x400000, .select=0x400000, .disconnect=0x8000, .len=512*1024
- * SNES HiROM (4MB):
- * .flags=CONST,                 .start=0x400000, .select=0x400000, .len=4*1024*1024
- * .flags=CONST, .offset=0x8000, .start=0x008000, .select=0x408000, .len=4*1024*1024
- * SNES ExHiROM (8MB):
- * .flags=CONST, .offset=0,                  .start=0xC00000, .select=0xC00000, .len=4*1024*1024
- * .flags=CONST, .offset=4*1024*1024,        .start=0x400000, .select=0xC00000, .len=4*1024*1024
- * .flags=CONST, .offset=0x8000,             .start=0x808000, .select=0xC08000, .len=4*1024*1024
- * .flags=CONST, .offset=4*1024*1024+0x8000, .start=0x008000, .select=0xC08000, .len=4*1024*1024
- * Clarify the size of the address space:
- * .ptr=NULL, .select=0xFFFFFF
- * .len can be implied by .select in many of them, but was included for clarity.
- */
-
-struct retro_memory_map
-{
-   const struct retro_memory_descriptor *descriptors;
-   unsigned num_descriptors;
-};
-
-struct retro_controller_description
-{
-   /* Human-readable description of the controller. Even if using a generic 
-    * input device type, this can be set to the particular device type the 
-    * core uses. */
-   const char *desc;
-
-   /* Device type passed to retro_set_controller_port_device(). If the device 
-    * type is a sub-class of a generic input device type, use the 
-    * RETRO_DEVICE_SUBCLASS macro to create an ID.
-    *
-    * E.g. RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1). */
-   unsigned id;
-};
-
-struct retro_controller_info
-{
-   const struct retro_controller_description *types;
-   unsigned num_types;
-};
-
-struct retro_subsystem_memory_info
-{
-   /* The extension associated with a memory type, e.g. "psram". */
-   const char *extension;
-
-   /* The memory type for retro_get_memory(). This should be at 
-    * least 0x100 to avoid conflict with standardized 
-    * libretro memory types. */
-   unsigned type;
-};
-
-struct retro_subsystem_rom_info
-{
-   /* Describes what the content is (SGB BIOS, GB ROM, etc). */
-   const char *desc;
-
-   /* Same definition as retro_get_system_info(). */
-   const char *valid_extensions;
-
-   /* Same definition as retro_get_system_info(). */
-   bool need_fullpath;
-
-   /* Same definition as retro_get_system_info(). */
-   bool block_extract;
-
-   /* This is set if the content is required to load a game. 
-    * If this is set to false, a zeroed-out retro_game_info can be passed. */
-   bool required;
-
-   /* Content can have multiple associated persistent 
-    * memory types (retro_get_memory()). */
-   const struct retro_subsystem_memory_info *memory;
-   unsigned num_memory;
-};
-
-struct retro_subsystem_info
-{
-   /* Human-readable string of the subsystem type, e.g. "Super GameBoy" */
-   const char *desc;
-
-   /* A computer friendly short string identifier for the subsystem type.
-    * This name must be [a-z].
-    * E.g. if desc is "Super GameBoy", this can be "sgb".
-    * This identifier can be used for command-line interfaces, etc.
-    */
-   const char *ident;
-
-   /* Infos for each content file. The first entry is assumed to be the 
-    * "most significant" content for frontend purposes.
-    * E.g. with Super GameBoy, the first content should be the GameBoy ROM, 
-    * as it is the most "significant" content to a user.
-    * If a frontend creates new file paths based on the content used 
-    * (e.g. savestates), it should use the path for the first ROM to do so. */
-   const struct retro_subsystem_rom_info *roms;
-
-   /* Number of content files associated with a subsystem. */
-   unsigned num_roms;
-   
-   /* The type passed to retro_load_game_special(). */
-   unsigned id;
-};
-
-typedef void (RETRO_CALLCONV *retro_proc_address_t)(void);
-
-/* libretro API extension functions:
- * (None here so far).
- *
- * Get a symbol from a libretro core.
- * Cores should only return symbols which are actual 
- * extensions to the libretro API.
- *
- * Frontends should not use this to obtain symbols to standard 
- * libretro entry points (static linking or dlsym).
- *
- * The symbol name must be equal to the function name, 
- * e.g. if void retro_foo(void); exists, the symbol must be called "retro_foo".
- * The returned function pointer must be cast to the corresponding type.
- */
-typedef retro_proc_address_t (RETRO_CALLCONV *retro_get_proc_address_t)(const char *sym);
-
-struct retro_get_proc_address_interface
-{
-   retro_get_proc_address_t get_proc_address;
-};
-
-enum retro_log_level
-{
-   RETRO_LOG_DEBUG = 0,
-   RETRO_LOG_INFO,
-   RETRO_LOG_WARN,
-   RETRO_LOG_ERROR,
-
-   RETRO_LOG_DUMMY = INT_MAX
-};
-
-/* Logging function. Takes log level argument as well. */
-typedef void (RETRO_CALLCONV *retro_log_printf_t)(enum retro_log_level level,
-      const char *fmt, ...);
-
-struct retro_log_callback
-{
-   retro_log_printf_t log;
-};
-
-/* Performance related functions */
-
-/* ID values for SIMD CPU features */
-#define RETRO_SIMD_SSE      (1 << 0)
-#define RETRO_SIMD_SSE2     (1 << 1)
-#define RETRO_SIMD_VMX      (1 << 2)
-#define RETRO_SIMD_VMX128   (1 << 3)
-#define RETRO_SIMD_AVX      (1 << 4)
-#define RETRO_SIMD_NEON     (1 << 5)
-#define RETRO_SIMD_SSE3     (1 << 6)
-#define RETRO_SIMD_SSSE3    (1 << 7)
-#define RETRO_SIMD_MMX      (1 << 8)
-#define RETRO_SIMD_MMXEXT   (1 << 9)
-#define RETRO_SIMD_SSE4     (1 << 10)
-#define RETRO_SIMD_SSE42    (1 << 11)
-#define RETRO_SIMD_AVX2     (1 << 12)
-#define RETRO_SIMD_VFPU     (1 << 13)
-#define RETRO_SIMD_PS       (1 << 14)
-#define RETRO_SIMD_AES      (1 << 15)
-#define RETRO_SIMD_VFPV3    (1 << 16)
-#define RETRO_SIMD_VFPV4    (1 << 17)
-#define RETRO_SIMD_POPCNT   (1 << 18)
-#define RETRO_SIMD_MOVBE    (1 << 19)
-#define RETRO_SIMD_CMOV     (1 << 20)
-#define RETRO_SIMD_ASIMD    (1 << 21)
-
-typedef uint64_t retro_perf_tick_t;
-typedef int64_t retro_time_t;
-
-struct retro_perf_counter
-{
-   const char *ident;
-   retro_perf_tick_t start;
-   retro_perf_tick_t total;
-   retro_perf_tick_t call_cnt;
-
-   bool registered;
-};
-
-/* Returns current time in microseconds.
- * Tries to use the most accurate timer available.
- */
-typedef retro_time_t (RETRO_CALLCONV *retro_perf_get_time_usec_t)(void);
-
-/* A simple counter. Usually nanoseconds, but can also be CPU cycles.
- * Can be used directly if desired (when creating a more sophisticated 
- * performance counter system).
- * */
-typedef retro_perf_tick_t (RETRO_CALLCONV *retro_perf_get_counter_t)(void);
-
-/* Returns a bit-mask of detected CPU features (RETRO_SIMD_*). */
-typedef uint64_t (RETRO_CALLCONV *retro_get_cpu_features_t)(void);
-
-/* Asks frontend to log and/or display the state of performance counters.
- * Performance counters can always be poked into manually as well.
- */
-typedef void (RETRO_CALLCONV *retro_perf_log_t)(void);
-
-/* Register a performance counter.
- * ident field must be set with a discrete value and other values in 
- * retro_perf_counter must be 0.
- * Registering can be called multiple times. To avoid calling to 
- * frontend redundantly, you can check registered field first. */
-typedef void (RETRO_CALLCONV *retro_perf_register_t)(struct retro_perf_counter *counter);
-
-/* Starts a registered counter. */
-typedef void (RETRO_CALLCONV *retro_perf_start_t)(struct retro_perf_counter *counter);
-
-/* Stops a registered counter. */
-typedef void (RETRO_CALLCONV *retro_perf_stop_t)(struct retro_perf_counter *counter);
-
-/* For convenience it can be useful to wrap register, start and stop in macros.
- * E.g.:
- * #ifdef LOG_PERFORMANCE
- * #define RETRO_PERFORMANCE_INIT(perf_cb, name) static struct retro_perf_counter name = {#name}; if (!name.registered) perf_cb.perf_register(&(name))
- * #define RETRO_PERFORMANCE_START(perf_cb, name) perf_cb.perf_start(&(name))
- * #define RETRO_PERFORMANCE_STOP(perf_cb, name) perf_cb.perf_stop(&(name))
- * #else
- * ... Blank macros ...
- * #endif
- *
- * These can then be used mid-functions around code snippets.
- *
- * extern struct retro_perf_callback perf_cb;  * Somewhere in the core.
- *
- * void do_some_heavy_work(void)
- * {
- *    RETRO_PERFORMANCE_INIT(cb, work_1;
- *    RETRO_PERFORMANCE_START(cb, work_1);
- *    heavy_work_1();
- *    RETRO_PERFORMANCE_STOP(cb, work_1);
- *
- *    RETRO_PERFORMANCE_INIT(cb, work_2);
- *    RETRO_PERFORMANCE_START(cb, work_2);
- *    heavy_work_2();
- *    RETRO_PERFORMANCE_STOP(cb, work_2);
- * }
- *
- * void retro_deinit(void)
- * {
- *    perf_cb.perf_log();  * Log all perf counters here for example.
- * }
- */
-
-struct retro_perf_callback
-{
-   retro_perf_get_time_usec_t    get_time_usec;
-   retro_get_cpu_features_t      get_cpu_features;
-
-   retro_perf_get_counter_t      get_perf_counter;
-   retro_perf_register_t         perf_register;
-   retro_perf_start_t            perf_start;
-   retro_perf_stop_t             perf_stop;
-   retro_perf_log_t              perf_log;
-};
-
-/* FIXME: Document the sensor API and work out behavior.
- * It will be marked as experimental until then.
- */
-enum retro_sensor_action
-{
-   RETRO_SENSOR_ACCELEROMETER_ENABLE = 0,
-   RETRO_SENSOR_ACCELEROMETER_DISABLE,
-
-   RETRO_SENSOR_DUMMY = INT_MAX
-};
-
-/* Id values for SENSOR types. */
-#define RETRO_SENSOR_ACCELEROMETER_X 0
-#define RETRO_SENSOR_ACCELEROMETER_Y 1
-#define RETRO_SENSOR_ACCELEROMETER_Z 2
-
-typedef bool (RETRO_CALLCONV *retro_set_sensor_state_t)(unsigned port, 
-      enum retro_sensor_action action, unsigned rate);
-
-typedef float (RETRO_CALLCONV *retro_sensor_get_input_t)(unsigned port, unsigned id);
-
-struct retro_sensor_interface
-{
-   retro_set_sensor_state_t set_sensor_state;
-   retro_sensor_get_input_t get_sensor_input;
-};
-
-enum retro_camera_buffer
-{
-   RETRO_CAMERA_BUFFER_OPENGL_TEXTURE = 0,
-   RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER,
-
-   RETRO_CAMERA_BUFFER_DUMMY = INT_MAX
-};
-
-/* Starts the camera driver. Can only be called in retro_run(). */
-typedef bool (RETRO_CALLCONV *retro_camera_start_t)(void);
-
-/* Stops the camera driver. Can only be called in retro_run(). */
-typedef void (RETRO_CALLCONV *retro_camera_stop_t)(void);
-
-/* Callback which signals when the camera driver is initialized 
- * and/or deinitialized.
- * retro_camera_start_t can be called in initialized callback.
- */
-typedef void (RETRO_CALLCONV *retro_camera_lifetime_status_t)(void);
-
-/* A callback for raw framebuffer data. buffer points to an XRGB8888 buffer.
- * Width, height and pitch are similar to retro_video_refresh_t.
- * First pixel is top-left origin.
- */
-typedef void (RETRO_CALLCONV *retro_camera_frame_raw_framebuffer_t)(const uint32_t *buffer, 
-      unsigned width, unsigned height, size_t pitch);
-
-/* A callback for when OpenGL textures are used.
- *
- * texture_id is a texture owned by camera driver.
- * Its state or content should be considered immutable, except for things like 
- * texture filtering and clamping.
- *
- * texture_target is the texture target for the GL texture.
- * These can include e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, and possibly 
- * more depending on extensions.
- *
- * affine points to a packed 3x3 column-major matrix used to apply an affine 
- * transform to texture coordinates. (affine_matrix * vec3(coord_x, coord_y, 1.0))
- * After transform, normalized texture coord (0, 0) should be bottom-left 
- * and (1, 1) should be top-right (or (width, height) for RECTANGLE).
- *
- * GL-specific typedefs are avoided here to avoid relying on gl.h in 
- * the API definition.
- */
-typedef void (RETRO_CALLCONV *retro_camera_frame_opengl_texture_t)(unsigned texture_id, 
-      unsigned texture_target, const float *affine);
-
-struct retro_camera_callback
-{
-   /* Set by libretro core. 
-    * Example bitmask: caps = (1 << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE) | (1 << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER).
-    */
-   uint64_t caps; 
-
-   /* Desired resolution for camera. Is only used as a hint. */
-   unsigned width;
-   unsigned height;
-
-   /* Set by frontend. */
-   retro_camera_start_t start;
-   retro_camera_stop_t stop;
-
-   /* Set by libretro core if raw framebuffer callbacks will be used. */
-   retro_camera_frame_raw_framebuffer_t frame_raw_framebuffer;
-
-   /* Set by libretro core if OpenGL texture callbacks will be used. */
-   retro_camera_frame_opengl_texture_t frame_opengl_texture; 
-
-   /* Set by libretro core. Called after camera driver is initialized and 
-    * ready to be started.
-    * Can be NULL, in which this callback is not called.
-    */
-   retro_camera_lifetime_status_t initialized;
-
-   /* Set by libretro core. Called right before camera driver is 
-    * deinitialized.
-    * Can be NULL, in which this callback is not called.
-    */
-   retro_camera_lifetime_status_t deinitialized;
-};
-
-/* Sets the interval of time and/or distance at which to update/poll 
- * location-based data.
- *
- * To ensure compatibility with all location-based implementations,
- * values for both interval_ms and interval_distance should be provided.
- *
- * interval_ms is the interval expressed in milliseconds.
- * interval_distance is the distance interval expressed in meters.
- */
-typedef void (RETRO_CALLCONV *retro_location_set_interval_t)(unsigned interval_ms,
-      unsigned interval_distance);
-
-/* Start location services. The device will start listening for changes to the
- * current location at regular intervals (which are defined with 
- * retro_location_set_interval_t). */
-typedef bool (RETRO_CALLCONV *retro_location_start_t)(void);
-
-/* Stop location services. The device will stop listening for changes 
- * to the current location. */
-typedef void (RETRO_CALLCONV *retro_location_stop_t)(void);
-
-/* Get the position of the current location. Will set parameters to 
- * 0 if no new  location update has happened since the last time. */
-typedef bool (RETRO_CALLCONV *retro_location_get_position_t)(double *lat, double *lon,
-      double *horiz_accuracy, double *vert_accuracy);
-
-/* Callback which signals when the location driver is initialized 
- * and/or deinitialized.
- * retro_location_start_t can be called in initialized callback.
- */
-typedef void (RETRO_CALLCONV *retro_location_lifetime_status_t)(void);
-
-struct retro_location_callback
-{
-   retro_location_start_t         start;
-   retro_location_stop_t          stop;
-   retro_location_get_position_t  get_position;
-   retro_location_set_interval_t  set_interval;
-
-   retro_location_lifetime_status_t initialized;
-   retro_location_lifetime_status_t deinitialized;
-};
-
-enum retro_rumble_effect
-{
-   RETRO_RUMBLE_STRONG = 0,
-   RETRO_RUMBLE_WEAK = 1,
-
-   RETRO_RUMBLE_DUMMY = INT_MAX
-};
-
-/* Sets rumble state for joypad plugged in port 'port'. 
- * Rumble effects are controlled independently,
- * and setting e.g. strong rumble does not override weak rumble.
- * Strength has a range of [0, 0xffff].
- *
- * Returns true if rumble state request was honored. 
- * Calling this before first retro_run() is likely to return false. */
-typedef bool (RETRO_CALLCONV *retro_set_rumble_state_t)(unsigned port, 
-      enum retro_rumble_effect effect, uint16_t strength);
-
-struct retro_rumble_interface
-{
-   retro_set_rumble_state_t set_rumble_state;
-};
-
-/* Notifies libretro that audio data should be written. */
-typedef void (RETRO_CALLCONV *retro_audio_callback_t)(void);
-
-/* True: Audio driver in frontend is active, and callback is 
- * expected to be called regularily.
- * False: Audio driver in frontend is paused or inactive. 
- * Audio callback will not be called until set_state has been 
- * called with true.
- * Initial state is false (inactive).
- */
-typedef void (RETRO_CALLCONV *retro_audio_set_state_callback_t)(bool enabled);
-
-struct retro_audio_callback
-{
-   retro_audio_callback_t callback;
-   retro_audio_set_state_callback_t set_state;
-};
-
-/* Notifies a libretro core of time spent since last invocation 
- * of retro_run() in microseconds.
- *
- * It will be called right before retro_run() every frame.
- * The frontend can tamper with timing to support cases like 
- * fast-forward, slow-motion and framestepping.
- *
- * In those scenarios the reference frame time value will be used. */
-typedef int64_t retro_usec_t;
-typedef void (RETRO_CALLCONV *retro_frame_time_callback_t)(retro_usec_t usec);
-struct retro_frame_time_callback
-{
-   retro_frame_time_callback_t callback;
-   /* Represents the time of one frame. It is computed as 
-    * 1000000 / fps, but the implementation will resolve the 
-    * rounding to ensure that framestepping, etc is exact. */
-   retro_usec_t reference;
-};
-
-/* Pass this to retro_video_refresh_t if rendering to hardware.
- * Passing NULL to retro_video_refresh_t is still a frame dupe as normal.
- * */
-#define RETRO_HW_FRAME_BUFFER_VALID ((void*)-1)
-
-/* Invalidates the current HW context.
- * Any GL state is lost, and must not be deinitialized explicitly.
- * If explicit deinitialization is desired by the libretro core,
- * it should implement context_destroy callback.
- * If called, all GPU resources must be reinitialized.
- * Usually called when frontend reinits video driver.
- * Also called first time video driver is initialized, 
- * allowing libretro core to initialize resources.
- */
-typedef void (RETRO_CALLCONV *retro_hw_context_reset_t)(void);
-
-/* Gets current framebuffer which is to be rendered to.
- * Could change every frame potentially.
- */
-typedef uintptr_t (RETRO_CALLCONV *retro_hw_get_current_framebuffer_t)(void);
-
-/* Get a symbol from HW context. */
-typedef retro_proc_address_t (RETRO_CALLCONV *retro_hw_get_proc_address_t)(const char *sym);
-
-enum retro_hw_context_type
-{
-   RETRO_HW_CONTEXT_NONE             = 0,
-   /* OpenGL 2.x. Driver can choose to use latest compatibility context. */
-   RETRO_HW_CONTEXT_OPENGL           = 1, 
-   /* OpenGL ES 2.0. */
-   RETRO_HW_CONTEXT_OPENGLES2        = 2,
-   /* Modern desktop core GL context. Use version_major/
-    * version_minor fields to set GL version. */
-   RETRO_HW_CONTEXT_OPENGL_CORE      = 3,
-   /* OpenGL ES 3.0 */
-   RETRO_HW_CONTEXT_OPENGLES3        = 4,
-   /* OpenGL ES 3.1+. Set version_major/version_minor. For GLES2 and GLES3,
-    * use the corresponding enums directly. */
-   RETRO_HW_CONTEXT_OPENGLES_VERSION = 5,
-
-   /* Vulkan, see RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE. */
-   RETRO_HW_CONTEXT_VULKAN           = 6,
-
-   RETRO_HW_CONTEXT_DUMMY = INT_MAX
-};
-
-struct retro_hw_render_callback
-{
-   /* Which API to use. Set by libretro core. */
-   enum retro_hw_context_type context_type;
-
-   /* Called when a context has been created or when it has been reset.
-    * An OpenGL context is only valid after context_reset() has been called.
-    *
-    * When context_reset is called, OpenGL resources in the libretro 
-    * implementation are guaranteed to be invalid.
-    *
-    * It is possible that context_reset is called multiple times during an 
-    * application lifecycle.
-    * If context_reset is called without any notification (context_destroy),
-    * the OpenGL context was lost and resources should just be recreated
-    * without any attempt to "free" old resources.
-    */
-   retro_hw_context_reset_t context_reset;
-
-   /* Set by frontend.
-    * TODO: This is rather obsolete. The frontend should not
-    * be providing preallocated framebuffers. */
-   retro_hw_get_current_framebuffer_t get_current_framebuffer;
-
-   /* Set by frontend.
-    * Can return all relevant functions, including glClear on Windows. */
-   retro_hw_get_proc_address_t get_proc_address;
-
-   /* Set if render buffers should have depth component attached.
-    * TODO: Obsolete. */
-   bool depth;
-
-   /* Set if stencil buffers should be attached.
-    * TODO: Obsolete. */
-   bool stencil;
-
-   /* If depth and stencil are true, a packed 24/8 buffer will be added. 
-    * Only attaching stencil is invalid and will be ignored. */
-
-   /* Use conventional bottom-left origin convention. If false, 
-    * standard libretro top-left origin semantics are used.
-    * TODO: Move to GL specific interface. */
-   bool bottom_left_origin;
-   
-   /* Major version number for core GL context or GLES 3.1+. */
-   unsigned version_major;
-
-   /* Minor version number for core GL context or GLES 3.1+. */
-   unsigned version_minor;
-
-   /* If this is true, the frontend will go very far to avoid 
-    * resetting context in scenarios like toggling fullscreen, etc.
-    * TODO: Obsolete? Maybe frontend should just always assume this ...
-    */
-   bool cache_context;
-
-   /* The reset callback might still be called in extreme situations 
-    * such as if the context is lost beyond recovery.
-    *
-    * For optimal stability, set this to false, and allow context to be 
-    * reset at any time.
-    */
-   
-   /* A callback to be called before the context is destroyed in a 
-    * controlled way by the frontend. */
-   retro_hw_context_reset_t context_destroy;
-
-   /* OpenGL resources can be deinitialized cleanly at this step.
-    * context_destroy can be set to NULL, in which resources will 
-    * just be destroyed without any notification.
-    *
-    * Even when context_destroy is non-NULL, it is possible that 
-    * context_reset is called without any destroy notification.
-    * This happens if context is lost by external factors (such as 
-    * notified by GL_ARB_robustness).
-    *
-    * In this case, the context is assumed to be already dead,
-    * and the libretro implementation must not try to free any OpenGL 
-    * resources in the subsequent context_reset.
-    */
-
-   /* Creates a debug context. */
-   bool debug_context;
-};
-
-/* Callback type passed in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK. 
- * Called by the frontend in response to keyboard events.
- * down is set if the key is being pressed, or false if it is being released.
- * keycode is the RETROK value of the char.
- * character is the text character of the pressed key. (UTF-32).
- * key_modifiers is a set of RETROKMOD values or'ed together.
- *
- * The pressed/keycode state can be indepedent of the character.
- * It is also possible that multiple characters are generated from a 
- * single keypress.
- * Keycode events should be treated separately from character events.
- * However, when possible, the frontend should try to synchronize these.
- * If only a character is posted, keycode should be RETROK_UNKNOWN.
- *
- * Similarily if only a keycode event is generated with no corresponding 
- * character, character should be 0.
- */
-typedef void (RETRO_CALLCONV *retro_keyboard_event_t)(bool down, unsigned keycode, 
-      uint32_t character, uint16_t key_modifiers);
-
-struct retro_keyboard_callback
-{
-   retro_keyboard_event_t callback;
-};
-
-/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE.
- * Should be set for implementations which can swap out multiple disk 
- * images in runtime.
- *
- * If the implementation can do this automatically, it should strive to do so.
- * However, there are cases where the user must manually do so.
- *
- * Overview: To swap a disk image, eject the disk image with 
- * set_eject_state(true).
- * Set the disk index with set_image_index(index). Insert the disk again 
- * with set_eject_state(false).
- */
-
-/* If ejected is true, "ejects" the virtual disk tray.
- * When ejected, the disk image index can be set.
- */
-typedef bool (RETRO_CALLCONV *retro_set_eject_state_t)(bool ejected);
-
-/* Gets current eject state. The initial state is 'not ejected'. */
-typedef bool (RETRO_CALLCONV *retro_get_eject_state_t)(void);
-
-/* Gets current disk index. First disk is index 0.
- * If return value is >= get_num_images(), no disk is currently inserted.
- */
-typedef unsigned (RETRO_CALLCONV *retro_get_image_index_t)(void);
-
-/* Sets image index. Can only be called when disk is ejected.
- * The implementation supports setting "no disk" by using an 
- * index >= get_num_images().
- */
-typedef bool (RETRO_CALLCONV *retro_set_image_index_t)(unsigned index);
-
-/* Gets total number of images which are available to use. */
-typedef unsigned (RETRO_CALLCONV *retro_get_num_images_t)(void);
-
-struct retro_game_info;
-
-/* Replaces the disk image associated with index.
- * Arguments to pass in info have same requirements as retro_load_game().
- * Virtual disk tray must be ejected when calling this.
- *
- * Replacing a disk image with info = NULL will remove the disk image 
- * from the internal list.
- * As a result, calls to get_image_index() can change.
- *
- * E.g. replace_image_index(1, NULL), and previous get_image_index() 
- * returned 4 before.
- * Index 1 will be removed, and the new index is 3.
- */
-typedef bool (RETRO_CALLCONV *retro_replace_image_index_t)(unsigned index,
-      const struct retro_game_info *info);
-
-/* Adds a new valid index (get_num_images()) to the internal disk list.
- * This will increment subsequent return values from get_num_images() by 1.
- * This image index cannot be used until a disk image has been set 
- * with replace_image_index. */
-typedef bool (RETRO_CALLCONV *retro_add_image_index_t)(void);
-
-struct retro_disk_control_callback
-{
-   retro_set_eject_state_t set_eject_state;
-   retro_get_eject_state_t get_eject_state;
-
-   retro_get_image_index_t get_image_index;
-   retro_set_image_index_t set_image_index;
-   retro_get_num_images_t  get_num_images;
-
-   retro_replace_image_index_t replace_image_index;
-   retro_add_image_index_t add_image_index;
-};
-
-enum retro_pixel_format
-{
-   /* 0RGB1555, native endian.
-    * 0 bit must be set to 0.
-    * This pixel format is default for compatibility concerns only.
-    * If a 15/16-bit pixel format is desired, consider using RGB565. */
-   RETRO_PIXEL_FORMAT_0RGB1555 = 0,
-
-   /* XRGB8888, native endian.
-    * X bits are ignored. */
-   RETRO_PIXEL_FORMAT_XRGB8888 = 1,
-
-   /* RGB565, native endian.
-    * This pixel format is the recommended format to use if a 15/16-bit
-    * format is desired as it is the pixel format that is typically 
-    * available on a wide range of low-power devices.
-    *
-    * It is also natively supported in APIs like OpenGL ES. */
-   RETRO_PIXEL_FORMAT_RGB565   = 2,
-
-   /* Ensure sizeof() == sizeof(int). */
-   RETRO_PIXEL_FORMAT_UNKNOWN  = INT_MAX
-};
-
-struct retro_message
-{
-   const char *msg;        /* Message to be displayed. */
-   unsigned    frames;     /* Duration in frames of message. */
-};
-
-/* Describes how the libretro implementation maps a libretro input bind
- * to its internal input system through a human readable string.
- * This string can be used to better let a user configure input. */
-struct retro_input_descriptor
-{
-   /* Associates given parameters with a description. */
-   unsigned port;
-   unsigned device;
-   unsigned index;
-   unsigned id;
-
-   /* Human readable description for parameters.
-    * The pointer must remain valid until
-    * retro_unload_game() is called. */
-   const char *description; 
-};
-
-struct retro_system_info
-{
-   /* All pointers are owned by libretro implementation, and pointers must 
-    * remain valid until retro_deinit() is called. */
-
-   const char *library_name;      /* Descriptive name of library. Should not 
-                                   * contain any version numbers, etc. */
-   const char *library_version;   /* Descriptive version of core. */
-
-   const char *valid_extensions;  /* A string listing probably content 
-                                   * extensions the core will be able to 
-                                   * load, separated with pipe.
-                                   * I.e. "bin|rom|iso".
-                                   * Typically used for a GUI to filter 
-                                   * out extensions. */
-
-   /* If true, retro_load_game() is guaranteed to provide a valid pathname 
-    * in retro_game_info::path.
-    * ::data and ::size are both invalid.
-    *
-    * If false, ::data and ::size are guaranteed to be valid, but ::path 
-    * might not be valid.
-    *
-    * This is typically set to true for libretro implementations that must 
-    * load from file.
-    * Implementations should strive for setting this to false, as it allows 
-    * the frontend to perform patching, etc. */
-   bool        need_fullpath;                                       
-
-   /* If true, the frontend is not allowed to extract any archives before 
-    * loading the real content.
-    * Necessary for certain libretro implementations that load games 
-    * from zipped archives. */
-   bool        block_extract;     
-};
-
-struct retro_game_geometry
-{
-   unsigned base_width;    /* Nominal video width of game. */
-   unsigned base_height;   /* Nominal video height of game. */
-   unsigned max_width;     /* Maximum possible width of game. */
-   unsigned max_height;    /* Maximum possible height of game. */
-
-   float    aspect_ratio;  /* Nominal aspect ratio of game. If
-                            * aspect_ratio is <= 0.0, an aspect ratio
-                            * of base_width / base_height is assumed.
-                            * A frontend could override this setting,
-                            * if desired. */
-};
-
-struct retro_system_timing
-{
-   double fps;             /* FPS of video content. */
-   double sample_rate;     /* Sampling rate of audio. */
-};
-
-struct retro_system_av_info
-{
-   struct retro_game_geometry geometry;
-   struct retro_system_timing timing;
-};
-
-struct retro_variable
-{
-   /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE.
-    * If NULL, obtains the complete environment string if more 
-    * complex parsing is necessary.
-    * The environment string is formatted as key-value pairs 
-    * delimited by semicolons as so:
-    * "key1=value1;key2=value2;..."
-    */
-   const char *key;
-   
-   /* Value to be obtained. If key does not exist, it is set to NULL. */
-   const char *value;
-};
-
-struct retro_game_info
-{
-   const char *path;       /* Path to game, UTF-8 encoded.
-                            * Sometimes used as a reference for building other paths.
-                            * May be NULL if game was loaded from stdin or similar,
-                            * but in this case some cores will be unable to load `data`.
-                            * So, it is preferable to fabricate something here instead
-                            * of passing NULL, which will help more cores to succeed.
-                            * retro_system_info::need_fullpath requires
-                            * that this path is valid. */
-   const void *data;       /* Memory buffer of loaded game. Will be NULL 
-                            * if need_fullpath was set. */
-   size_t      size;       /* Size of memory buffer. */
-   const char *meta;       /* String of implementation specific meta-data. */
-};
-
-#define RETRO_MEMORY_ACCESS_WRITE (1 << 0)
-   /* The core will write to the buffer provided by retro_framebuffer::data. */
-#define RETRO_MEMORY_ACCESS_READ (1 << 1)
-   /* The core will read from retro_framebuffer::data. */
-#define RETRO_MEMORY_TYPE_CACHED (1 << 0)
-   /* The memory in data is cached.
-    * If not cached, random writes and/or reading from the buffer is expected to be very slow. */
-struct retro_framebuffer
-{
-   void *data;                      /* The framebuffer which the core can render into.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER.
-                                       The initial contents of data are unspecified. */
-   unsigned width;                  /* The framebuffer width used by the core. Set by core. */
-   unsigned height;                 /* The framebuffer height used by the core. Set by core. */
-   size_t pitch;                    /* The number of bytes between the beginning of a scanline,
-                                       and beginning of the next scanline.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-   enum retro_pixel_format format;  /* The pixel format the core must use to render into data.
-                                       This format could differ from the format used in
-                                       SET_PIXEL_FORMAT.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-
-   unsigned access_flags;           /* How the core will access the memory in the framebuffer.
-                                       RETRO_MEMORY_ACCESS_* flags.
-                                       Set by core. */
-   unsigned memory_flags;           /* Flags telling core how the memory has been mapped.
-                                       RETRO_MEMORY_TYPE_* flags.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-};
-
-/* Callbacks */
-
-/* Environment callback. Gives implementations a way of performing 
- * uncommon tasks. Extensible. */
-typedef bool (RETRO_CALLCONV *retro_environment_t)(unsigned cmd, void *data);
-
-/* Render a frame. Pixel format is 15-bit 0RGB1555 native endian 
- * unless changed (see RETRO_ENVIRONMENT_SET_PIXEL_FORMAT).
- *
- * Width and height specify dimensions of buffer.
- * Pitch specifices length in bytes between two lines in buffer.
- *
- * For performance reasons, it is highly recommended to have a frame 
- * that is packed in memory, i.e. pitch == width * byte_per_pixel.
- * Certain graphic APIs, such as OpenGL ES, do not like textures 
- * that are not packed in memory.
- */
-typedef void (RETRO_CALLCONV *retro_video_refresh_t)(const void *data, unsigned width,
-      unsigned height, size_t pitch);
-
-/* Renders a single audio frame. Should only be used if implementation 
- * generates a single sample at a time.
- * Format is signed 16-bit native endian.
- */
-typedef void (RETRO_CALLCONV *retro_audio_sample_t)(int16_t left, int16_t right);
-
-/* Renders multiple audio frames in one go.
- *
- * One frame is defined as a sample of left and right channels, interleaved.
- * I.e. int16_t buf[4] = { l, r, l, r }; would be 2 frames.
- * Only one of the audio callbacks must ever be used.
- */
-typedef size_t (RETRO_CALLCONV *retro_audio_sample_batch_t)(const int16_t *data,
-      size_t frames);
-
-/* Polls input. */
-typedef void (RETRO_CALLCONV *retro_input_poll_t)(void);
-
-/* Queries for input for player 'port'. device will be masked with 
- * RETRO_DEVICE_MASK.
- *
- * Specialization of devices such as RETRO_DEVICE_JOYPAD_MULTITAP that 
- * have been set with retro_set_controller_port_device()
- * will still use the higher level RETRO_DEVICE_JOYPAD to request input.
- */
-typedef int16_t (RETRO_CALLCONV *retro_input_state_t)(unsigned port, unsigned device, 
-      unsigned index, unsigned id);
-
-/* Sets callbacks. retro_set_environment() is guaranteed to be called 
- * before retro_init().
- *
- * The rest of the set_* functions are guaranteed to have been called 
- * before the first call to retro_run() is made. */
-RETRO_API void retro_set_environment(retro_environment_t);
-RETRO_API void retro_set_video_refresh(retro_video_refresh_t);
-RETRO_API void retro_set_audio_sample(retro_audio_sample_t);
-RETRO_API void retro_set_audio_sample_batch(retro_audio_sample_batch_t);
-RETRO_API void retro_set_input_poll(retro_input_poll_t);
-RETRO_API void retro_set_input_state(retro_input_state_t);
-
-/* Library global initialization/deinitialization. */
-RETRO_API void retro_init(void);
-RETRO_API void retro_deinit(void);
-
-/* Must return RETRO_API_VERSION. Used to validate ABI compatibility
- * when the API is revised. */
-RETRO_API unsigned retro_api_version(void);
-
-/* Gets statically known system info. Pointers provided in *info 
- * must be statically allocated.
- * Can be called at any time, even before retro_init(). */
-RETRO_API void retro_get_system_info(struct retro_system_info *info);
-
-/* Gets information about system audio/video timings and geometry.
- * Can be called only after retro_load_game() has successfully completed.
- * NOTE: The implementation of this function might not initialize every 
- * variable if needed.
- * E.g. geom.aspect_ratio might not be initialized if core doesn't 
- * desire a particular aspect ratio. */
-RETRO_API void retro_get_system_av_info(struct retro_system_av_info *info);
-
-/* Sets device to be used for player 'port'.
- * By default, RETRO_DEVICE_JOYPAD is assumed to be plugged into all 
- * available ports.
- * Setting a particular device type is not a guarantee that libretro cores 
- * will only poll input based on that particular device type. It is only a 
- * hint to the libretro core when a core cannot automatically detect the 
- * appropriate input device type on its own. It is also relevant when a 
- * core can change its behavior depending on device type. */
-RETRO_API void retro_set_controller_port_device(unsigned port, unsigned device);
-
-/* Resets the current game. */
-RETRO_API void retro_reset(void);
-
-/* Runs the game for one video frame.
- * During retro_run(), input_poll callback must be called at least once.
- * 
- * If a frame is not rendered for reasons where a game "dropped" a frame,
- * this still counts as a frame, and retro_run() should explicitly dupe 
- * a frame if GET_CAN_DUPE returns true.
- * In this case, the video callback can take a NULL argument for data.
- */
-RETRO_API void retro_run(void);
-
-/* Returns the amount of data the implementation requires to serialize 
- * internal state (save states).
- * Between calls to retro_load_game() and retro_unload_game(), the 
- * returned size is never allowed to be larger than a previous returned 
- * value, to ensure that the frontend can allocate a save state buffer once.
- */
-RETRO_API size_t retro_serialize_size(void);
-
-/* Serializes internal state. If failed, or size is lower than
- * retro_serialize_size(), it should return false, true otherwise. */
-RETRO_API bool retro_serialize(void *data, size_t size);
-RETRO_API bool retro_unserialize(const void *data, size_t size);
-
-RETRO_API void retro_cheat_reset(void);
-RETRO_API void retro_cheat_set(unsigned index, bool enabled, const char *code);
-
-/* Loads a game. */
-RETRO_API bool retro_load_game(const struct retro_game_info *game);
-
-/* Loads a "special" kind of game. Should not be used,
- * except in extreme cases. */
-RETRO_API bool retro_load_game_special(
-  unsigned game_type,
-  const struct retro_game_info *info, size_t num_info
-);
-
-/* Unloads a currently loaded game. */
-RETRO_API void retro_unload_game(void);
-
-/* Gets region of game. */
-RETRO_API unsigned retro_get_region(void);
-
-/* Gets region of memory. */
-RETRO_API void *retro_get_memory_data(unsigned id);
-RETRO_API size_t retro_get_memory_size(unsigned id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libretro-common/include/libretro_dspfilter.h b/libretro-common/include/libretro_dspfilter.h
deleted file mode 100644
index 1b9929c..0000000
--- a/libretro-common/include/libretro_dspfilter.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro API header (libretro_dspfilter.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_DSPFILTER_API_H__
-#define LIBRETRO_DSPFILTER_API_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#define DSPFILTER_SIMD_SSE      (1 << 0)
-#define DSPFILTER_SIMD_SSE2     (1 << 1)
-#define DSPFILTER_SIMD_VMX      (1 << 2)
-#define DSPFILTER_SIMD_VMX128   (1 << 3)
-#define DSPFILTER_SIMD_AVX      (1 << 4)
-#define DSPFILTER_SIMD_NEON     (1 << 5)
-#define DSPFILTER_SIMD_SSE3     (1 << 6)
-#define DSPFILTER_SIMD_SSSE3    (1 << 7)
-#define DSPFILTER_SIMD_MMX      (1 << 8)
-#define DSPFILTER_SIMD_MMXEXT   (1 << 9)
-#define DSPFILTER_SIMD_SSE4     (1 << 10)
-#define DSPFILTER_SIMD_SSE42    (1 << 11)
-#define DSPFILTER_SIMD_AVX2     (1 << 12)
-#define DSPFILTER_SIMD_VFPU     (1 << 13)
-#define DSPFILTER_SIMD_PS       (1 << 14)
-
-/* A bit-mask of all supported SIMD instruction sets.
- * Allows an implementation to pick different 
- * dspfilter_implementation structs.
- */
-typedef unsigned dspfilter_simd_mask_t;
-
-/* Dynamic library endpoint. */
-typedef const struct dspfilter_implementation *(
-      *dspfilter_get_implementation_t)(dspfilter_simd_mask_t mask);
-
-/* The same SIMD mask argument is forwarded to create() callback 
- * as well to avoid having to keep lots of state around. */
-const struct dspfilter_implementation *dspfilter_get_implementation(
-      dspfilter_simd_mask_t mask);
-
-#define DSPFILTER_API_VERSION 1
-
-struct dspfilter_info
-{
-   /* Input sample rate that the DSP plugin receives. */
-   float input_rate;
-};
-
-struct dspfilter_output
-{
-   /* The DSP plugin has to provide the buffering for the 
-    * output samples or reuse the input buffer directly.
-    *
-    * The samples are laid out in interleaving order: LRLRLRLR
-    * The range of the samples are [-1.0, 1.0]. 
-    *
-    * It is not necessary to manually clip values. */
-   float *samples;
-
-   /* Frames which the DSP plugin outputted for the current process.
-    *
-    * One frame is here defined as a combined sample of 
-    * left and right channels. 
-    *
-    * (I.e. 44.1kHz, 16bit stereo will have 
-    * 88.2k samples/sec and 44.1k frames/sec.)
-    */
-   unsigned frames;
-};
-
-struct dspfilter_input 
-{
-   /* Input data for the DSP. The samples are interleaved in order: LRLRLRLR
-    *
-    * It is valid for a DSP plug to use this buffer for output as long as 
-    * the output size is less or equal to the input.
-    *
-    * This is useful for filters which can output one sample for each 
-    * input sample and do not need to maintain its own buffers.
-    *
-    * Block based filters must provide their own buffering scheme.
-    *
-    * The input size is not bound, but it can be safely assumed that it 
-    * will not exceed ~100ms worth of audio at a time. */
-   float *samples;
-
-   /* Number of frames for input data.
-    * One frame is here defined as a combined sample of 
-    * left and right channels. 
-    *
-    * (I.e. 44.1kHz, 16bit stereo will have 
-    * 88.2k samples/sec and 44.1k frames/sec.)
-    */
-   unsigned frames;
-};
-
-/* Returns true if config key was found. Otherwise, 
- * returns false, and sets value to default value.
- */
-typedef int (*dspfilter_config_get_float_t)(void *userdata,
-      const char *key, float *value, float default_value);
-
-typedef int (*dspfilter_config_get_int_t)(void *userdata,
-      const char *key, int *value, int default_value);
-
-/* Allocates an array with values. free() with dspfilter_config_free_t. */
-typedef int (*dspfilter_config_get_float_array_t)(void *userdata, 
-      const char *key, float **values, unsigned *out_num_values,
-      const float *default_values, unsigned num_default_values);
-
-typedef int (*dspfilter_config_get_int_array_t)(void *userdata,
-      const char *key, int **values, unsigned *out_num_values,
-      const int *default_values, unsigned num_default_values);
-
-typedef int (*dspfilter_config_get_string_t)(void *userdata,
-      const char *key, char **output, const char *default_output);
-
-/* Calls free() in host runtime. Sometimes needed on Windows. 
- * free() on NULL is fine. */
-typedef void (*dspfilter_config_free_t)(void *ptr);
-
-struct dspfilter_config
-{
-   dspfilter_config_get_float_t get_float;
-   dspfilter_config_get_int_t get_int;
-
-   dspfilter_config_get_float_array_t get_float_array;
-   dspfilter_config_get_int_array_t get_int_array;
-
-   dspfilter_config_get_string_t get_string;
-   /* Avoid problems where DSP plug and host are 
-    * linked against different C runtimes. */
-   dspfilter_config_free_t free; 
-};
-
-/* Creates a handle of the plugin. Returns NULL if failed. */
-typedef void *(*dspfilter_init_t)(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata);
-
-/* Frees the handle. */
-typedef void (*dspfilter_free_t)(void *data);
-
-/* Processes input data. 
- * The plugin is allowed to return variable sizes for output data. */
-typedef void (*dspfilter_process_t)(void *data,
-      struct dspfilter_output *output, const struct dspfilter_input *input);
-
-struct dspfilter_implementation
-{
-   dspfilter_init_t     init;
-   dspfilter_process_t  process;
-   dspfilter_free_t     free;
-
-   /* Must be DSPFILTER_API_VERSION */
-   unsigned api_version;
-
-   /* Human readable identifier of implementation. */
-   const char *ident;
-
-   /* Computer-friendly short version of ident.
-    * Lower case, no spaces and special characters, etc. */
-   const char *short_ident; 
-};
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/libretro_vulkan.h b/libretro-common/include/libretro_vulkan.h
deleted file mode 100644
index f683a0f..0000000
--- a/libretro-common/include/libretro_vulkan.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro API header (libretro_vulkan.h)
- * ---------------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_VULKAN_H__
-#define LIBRETRO_VULKAN_H__
-
-#include <libretro.h>
-#include <vulkan/vulkan.h>
-
-#define RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION 5
-#define RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN_VERSION 1
-
-struct retro_vulkan_image
-{
-   VkImageView image_view;
-   VkImageLayout image_layout;
-   VkImageViewCreateInfo create_info;
-};
-
-typedef void (*retro_vulkan_set_image_t)(void *handle,
-      const struct retro_vulkan_image *image,
-      uint32_t num_semaphores,
-      const VkSemaphore *semaphores,
-      uint32_t src_queue_family);
-
-typedef uint32_t (*retro_vulkan_get_sync_index_t)(void *handle);
-typedef uint32_t (*retro_vulkan_get_sync_index_mask_t)(void *handle);
-typedef void (*retro_vulkan_set_command_buffers_t)(void *handle,
-      uint32_t num_cmd,
-      const VkCommandBuffer *cmd);
-typedef void (*retro_vulkan_wait_sync_index_t)(void *handle);
-typedef void (*retro_vulkan_lock_queue_t)(void *handle);
-typedef void (*retro_vulkan_unlock_queue_t)(void *handle);
-typedef void (*retro_vulkan_set_signal_semaphore_t)(void *handle, VkSemaphore semaphore);
-
-typedef const VkApplicationInfo *(*retro_vulkan_get_application_info_t)(void);
-
-struct retro_vulkan_context
-{
-   VkPhysicalDevice gpu;
-   VkDevice device;
-   VkQueue queue;
-   uint32_t queue_family_index;
-   VkQueue presentation_queue;
-   uint32_t presentation_queue_family_index;
-};
-
-typedef bool (*retro_vulkan_create_device_t)(
-      struct retro_vulkan_context *context,
-      VkInstance instance,
-      VkPhysicalDevice gpu,
-      VkSurfaceKHR surface,
-      PFN_vkGetInstanceProcAddr get_instance_proc_addr,
-      const char **required_device_extensions,
-      unsigned num_required_device_extensions,
-      const char **required_device_layers,
-      unsigned num_required_device_layers,
-      const VkPhysicalDeviceFeatures *required_features);
-
-typedef void (*retro_vulkan_destroy_device_t)(void);
-
-/* Note on thread safety:
- * The Vulkan API is heavily designed around multi-threading, and
- * the libretro interface for it should also be threading friendly.
- * A core should be able to build command buffers and submit 
- * command buffers to the GPU from any thread.
- */
-
-struct retro_hw_render_context_negotiation_interface_vulkan
-{
-   /* Must be set to RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN. */
-   enum retro_hw_render_context_negotiation_interface_type interface_type;
-   /* Must be set to RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN_VERSION. */
-   unsigned interface_version;
-
-   /* If non-NULL, returns a VkApplicationInfo struct that the frontend can use instead of
-    * its "default" application info.
-    */
-   retro_vulkan_get_application_info_t get_application_info;
-
-   /* If non-NULL, the libretro core will choose one or more physical devices,
-    * create one or more logical devices and create one or more queues.
-    * The core must prepare a designated PhysicalDevice, Device, Queue and queue family index
-    * which the frontend will use for its internal operation.
-    *
-    * If gpu is not VK_NULL_HANDLE, the physical device provided to the frontend must be this PhysicalDevice.
-    * The core is still free to use other physical devices.
-    *
-    * The frontend will request certain extensions and layers for a device which is created.
-    * The core must ensure that the queue and queue_family_index support GRAPHICS and COMPUTE.
-    *
-    * If surface is not VK_NULL_HANDLE, the core must consider presentation when creating the queues.
-    * If presentation to "surface" is supported on the queue, presentation_queue must be equal to queue.
-    * If not, a second queue must be provided in presentation_queue and presentation_queue_index.
-    * If surface is not VK_NULL_HANDLE, the instance from frontend will have been created with supported for
-    * VK_KHR_surface extension.
-    *
-    * The core is free to set its own queue priorities.
-    * Device provided to frontend is owned by the frontend, but any additional device resources must be freed by core
-    * in destroy_device callback.
-    *
-    * If this function returns true, a PhysicalDevice, Device and Queues are initialized.
-    * If false, none of the above have been initialized and the frontend will attempt
-    * to fallback to "default" device creation, as if this function was never called.
-    */
-   retro_vulkan_create_device_t create_device;
-
-   /* If non-NULL, this callback is called similar to context_destroy for HW_RENDER_INTERFACE.
-    * However, it will be called even if context_reset was not called.
-    * This can happen if the context never succeeds in being created.
-    * destroy_device will always be called before the VkInstance
-    * of the frontend is destroyed if create_device was called successfully so that the core has a chance of
-    * tearing down its own device resources.
-    *
-    * Only auxillary resources should be freed here, i.e. resources which are not part of retro_vulkan_context.
-    */
-   retro_vulkan_destroy_device_t destroy_device;
-};
-
-struct retro_hw_render_interface_vulkan
-{
-   /* Must be set to RETRO_HW_RENDER_INTERFACE_VULKAN. */
-   enum retro_hw_render_interface_type interface_type;
-   /* Must be set to RETRO_HW_RENDER_INTERFACE_VULKAN_VERSION. */
-   unsigned interface_version;
-
-   /* Opaque handle to the Vulkan backend in the frontend
-    * which must be passed along to all function pointers
-    * in this interface.
-    *
-    * The rationale for including a handle here (which libretro v1 
-    * doesn't currently do in general) is:
-    *
-    * - Vulkan cores should be able to be freely threaded without lots of fuzz.
-    *   This would break frontends which currently rely on TLS
-    *   to deal with multiple cores loaded at the same time.
-    * - Fixing this in general is TODO for an eventual libretro v2.
-    */
-   void *handle;
-
-   /* The Vulkan instance the context is using. */
-   VkInstance instance;
-   /* The physical device used. */
-   VkPhysicalDevice gpu;
-   /* The logical device used. */
-   VkDevice device;
-
-   /* Allows a core to fetch all its needed symbols without having to link
-    * against the loader itself. */
-   PFN_vkGetDeviceProcAddr get_device_proc_addr;
-   PFN_vkGetInstanceProcAddr get_instance_proc_addr;
-
-   /* The queue the core must use to submit data.
-    * This queue and index must remain constant throughout the lifetime
-    * of the context.
-    *
-    * This queue will be the queue that supports graphics and compute
-    * if the device supports compute.
-    */
-   VkQueue queue;
-   unsigned queue_index;
-
-   /* Before calling retro_video_refresh_t with RETRO_HW_FRAME_BUFFER_VALID,
-    * set which image to use for this frame.
-    *
-    * If num_semaphores is non-zero, the frontend will wait for the 
-    * semaphores provided to be signaled before using the results further 
-    * in the pipeline.
-    *
-    * Semaphores provided by a single call to set_image will only be
-    * waited for once (waiting for a semaphore resets it).
-    * E.g. set_image, video_refresh, and then another
-    * video_refresh without set_image,
-    * but same image will only wait for semaphores once.
-    *
-    * For this reason, ownership transfer will only occur if semaphores
-    * are waited on for a particular frame in the frontend.
-    *
-    * Using semaphores is optional for synchronization purposes, 
-    * but if not using
-    * semaphores, an image memory barrier in vkCmdPipelineBarrier 
-    * should be used in the graphics_queue.
-    * Example:
-    *
-    * vkCmdPipelineBarrier(cmd,
-    *    srcStageMask = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
-    *    dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-    *    image_memory_barrier = {
-    *       srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-    *       dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
-    *    });
-    *
-    * The use of pipeline barriers instead of semaphores is encouraged 
-    * as it is simpler and more fine-grained. A layout transition 
-    * must generally happen anyways which requires a
-    * pipeline barrier.
-    *
-    * The image passed to set_image must have imageUsage flags set to at least
-    * VK_IMAGE_USAGE_TRANSFER_SRC_BIT and VK_IMAGE_USAGE_SAMPLED_BIT.
-    * The core will naturally want to use flags such as
-    * VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT and/or 
-    * VK_IMAGE_USAGE_TRANSFER_DST_BIT depending
-    * on how the final image is created.
-    *
-    * The image must also have been created with MUTABLE_FORMAT bit set if 
-    * 8-bit formats are used, so that the frontend can reinterpret sRGB 
-    * formats as it sees fit.
-    *
-    * Images passed to set_image should be created with TILING_OPTIMAL.
-    * The image layout should be transitioned to either 
-    * VK_IMAGE_LAYOUT_GENERIC or VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL.
-    * The actual image layout used must be set in image_layout.
-    *
-    * The image must be a 2D texture which may or not be layered 
-    * and/or mipmapped.
-    *
-    * The image must be suitable for linear sampling.
-    * While the image_view is typically the only field used,
-    * the frontend may want to reinterpret the texture as sRGB vs. 
-    * non-sRGB for example so the VkImageViewCreateInfo used to 
-    * create the image view must also be passed in.
-    *
-    * The data in the pointer to the image struct will not be copied
-    * as the pNext field in create_info cannot be reliably deep-copied.
-    * The image pointer passed to set_image must be valid until 
-    * retro_video_refresh_t has returned.
-    *
-    * If frame duping is used when passing NULL to retro_video_refresh_t,
-    * the frontend is free to either use the latest image passed to 
-    * set_image or reuse the older pointer passed to set_image the 
-    * frame RETRO_HW_FRAME_BUFFER_VALID was last used.
-    * 
-    * Essentially, the lifetime of the pointer passed to 
-    * retro_video_refresh_t should be extended if frame duping is used 
-    * so that the frontend can reuse the older pointer.
-    *
-    * The image itself however, must not be touched by the core until
-    * wait_sync_index has been completed later. The frontend may perform
-    * layout transitions on the image, so even read-only access is not defined.
-    * The exception to read-only rule is if GENERAL layout is used for the image.
-    * In this case, the frontend is not allowed to perform any layout transitions,
-    * so concurrent reads from core and frontend are allowed.
-    *
-    * If frame duping is used, or if set_command_buffers is used,
-    * the frontend will not wait for any semaphores.
-    *
-    * The src_queue_family is used to specify which queue family
-    * the image is currently owned by. If using multiple queue families
-    * (e.g. async compute), the frontend will need to acquire ownership of the
-    * image before rendering with it and release the image afterwards.
-    *
-    * If src_queue_family is equal to the queue family (queue_index),
-    * no ownership transfer will occur.
-    * Similarly, if src_queue_family is VK_QUEUE_FAMILY_IGNORED,
-    * no ownership transfer will occur.
-    *
-    * The frontend will always release ownership back to src_queue_family.
-    * Waiting for frontend to complete with wait_sync_index() ensures that
-    * the frontend has released ownership back to the application.
-    * Note that in Vulkan, transfering ownership is a two-part process.
-    *
-    * Example frame:
-    *  - core releases ownership from src_queue_index to queue_index with VkImageMemoryBarrier.
-    *  - core calls set_image with src_queue_index.
-    *  - Frontend will acquire the image with src_queue_index -> queue_index as well, completing the ownership transfer.
-    *  - Frontend renders the frame.
-    *  - Frontend releases ownership with queue_index -> src_queue_index.
-    *  - Next time image is used, core must acquire ownership from queue_index ...
-    *
-    * Since the frontend releases ownership, we cannot necessarily dupe the frame because
-    * the core needs to make the roundtrip of ownership transfer.
-    */
-   retro_vulkan_set_image_t set_image;
-
-   /* Get the current sync index for this frame which is obtained in 
-    * frontend by calling e.g. vkAcquireNextImageKHR before calling 
-    * retro_run().
-    *
-    * This index will correspond to which swapchain buffer is currently 
-    * the active one.
-    *
-    * Knowing this index is very useful for maintaining safe asynchronous CPU 
-    * and GPU operation without stalling.
-    *
-    * The common pattern for synchronization is to receive fences when 
-    * submitting command buffers to Vulkan (vkQueueSubmit) and add this fence 
-    * to a list of fences for frame number get_sync_index().
-    *
-    * Next time we receive the same get_sync_index(), we can wait for the 
-    * fences from before, which will usually return immediately as the 
-    * frontend will generally also avoid letting the GPU run ahead too much.
-    *
-    * After the fence has signaled, we know that the GPU has completed all 
-    * GPU work related to work submitted in the frame we last saw get_sync_index(). 
-    *
-    * This means we can safely reuse or free resources allocated in this frame.
-    *
-    * In theory, even if we wait for the fences correctly, it is not technically 
-    * safe to write to the image we earlier passed to the frontend since we're 
-    * not waiting for the frontend GPU jobs to complete.
-    *
-    * The frontend will guarantee that the appropriate pipeline barrier
-    * in graphics_queue has been used such that 
-    * VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT cannot
-    * start until the frontend is done with the image.
-    */
-   retro_vulkan_get_sync_index_t get_sync_index;
-
-   /* Returns a bitmask of how many swapchain images we currently have 
-    * in the frontend.
-    *
-    * If bit #N is set in the return value, get_sync_index can return N.
-    * Knowing this value is useful for preallocating per-frame management 
-    * structures ahead of time.
-    *
-    * While this value will typically remain constant throughout the 
-    * applications lifecycle, it may for example change if the frontend 
-    * suddently changes fullscreen state and/or latency.
-    *
-    * If this value ever changes, it is safe to assume that the device 
-    * is completely idle and all synchronization objects can be deleted 
-    * right away as desired.
-    */
-   retro_vulkan_get_sync_index_mask_t get_sync_index_mask;
-
-   /* Instead of submitting the command buffer to the queue first, the core 
-    * can pass along its command buffer to the frontend, and the frontend 
-    * will submit the command buffer together with the frontends command buffers. 
-    *
-    * This has the advantage that the overhead of vkQueueSubmit can be 
-    * amortized into a single call. For this mode, semaphores in set_image 
-    * will be ignored, so vkCmdPipelineBarrier must be used to synchronize 
-    * the core and frontend.
-    *
-    * The command buffers in set_command_buffers are only executed once, 
-    * even if frame duping is used.
-    *
-    * If frame duping is used, set_image should be used for the frames 
-    * which should be duped instead.
-    *
-    * Command buffers passed to the frontend with set_command_buffers
-    * must not actually be submitted to the GPU until retro_video_refresh_t 
-    * is called.
-    *
-    * The frontend must submit the command buffer before submitting any 
-    * other command buffers provided by set_command_buffers. */
-   retro_vulkan_set_command_buffers_t set_command_buffers;
-
-   /* Waits on CPU for device activity for the current sync index to complete.
-    * This is useful since the core will not have a relevant fence to sync with
-    * when the frontend is submitting the command buffers. */
-   retro_vulkan_wait_sync_index_t wait_sync_index;
-
-   /* If the core submits command buffers itself to any of the queues provided 
-    * in this interface, the core must lock and unlock the frontend from 
-    * racing on the VkQueue.
-    *
-    * Queue submission can happen on any thread.
-    * Even if queue submission happens on the same thread as retro_run(), 
-    * the lock/unlock functions must still be called.
-    *
-    * NOTE: Queue submissions are heavy-weight. */
-   retro_vulkan_lock_queue_t lock_queue;
-   retro_vulkan_unlock_queue_t unlock_queue;
-
-   /* Sets a semaphore which is signaled when the image in set_image can safely be reused.
-    * The semaphore is consumed next call to retro_video_refresh_t.
-    * The semaphore will be signalled even for duped frames.
-    * The semaphore will be signalled only once, so set_signal_semaphore should be called every frame.
-    * The semaphore may be VK_NULL_HANDLE, which disables semaphore signalling for next call to retro_video_refresh_t.
-    *
-    * This is mostly useful to support use cases where you're rendering to a single image that
-    * is recycled in a ping-pong fashion with the frontend to save memory (but potentially less throughput).
-    */
-   retro_vulkan_set_signal_semaphore_t set_signal_semaphore;
-};
-
-#endif
-
diff --git a/libretro-common/include/lists/dir_list.h b/libretro-common/include/lists/dir_list.h
deleted file mode 100644
index 3b4a9c5..0000000
--- a/libretro-common/include/lists/dir_list.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dir_list.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_DIR_LIST_H
-#define __LIBRETRO_SDK_DIR_LIST_H
-
-#include <retro_common_api.h>
-
-#include <lists/string_list.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * dir_list_new:
- * @dir                : directory path.
- * @ext                : allowed extensions of file directory entries to include.
- * @include_dirs       : include directories as part of the finished directory listing?
- * @include_hidden     : include hidden files and directories as part of the finished directory listing?
- * @include_compressed : include compressed files, even when not part of ext.
- * @recursive          : list directory contents recursively
- *
- * Create a directory listing.
- *
- * Returns: pointer to a directory listing of type 'struct string_list *' on success,
- * NULL in case of error. Has to be freed manually.
- **/
-struct string_list *dir_list_new(const char *dir, const char *ext,
-      bool include_dirs, bool include_hidden, bool include_compressed, bool recursive);
-
-/**
- * dir_list_sort:
- * @list      : pointer to the directory listing.
- * @dir_first : move the directories in the listing to the top?
- *
- * Sorts a directory listing.
- *
- **/
-void dir_list_sort(struct string_list *list, bool dir_first);
-
-/**
- * dir_list_free:
- * @list : pointer to the directory listing
- *
- * Frees a directory listing.
- *
- **/
-void dir_list_free(struct string_list *list);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/lists/file_list.h b/libretro-common/include/lists/file_list.h
deleted file mode 100644
index 95b0eb5..0000000
--- a/libretro-common/include/lists/file_list.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_list.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FILE_LIST_H__
-#define __LIBRETRO_SDK_FILE_LIST_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-
-struct item_file
-{
-   char *path;
-   char *label;
-   char *alt;
-   unsigned type;
-   size_t directory_ptr;
-   size_t entry_idx;
-   void *userdata;
-   void *actiondata;
-};
-
-typedef struct file_list
-{
-   struct item_file *list;
-
-   size_t capacity;
-   size_t size;
-} file_list_t;
-
-
-void *file_list_get_userdata_at_offset(const file_list_t *list, 
-      size_t index);
-
-void *file_list_get_actiondata_at_offset(const file_list_t *list, 
-      size_t index);
-
-void file_list_free(file_list_t *list);
-
-bool file_list_append(file_list_t *userdata, const char *path,
-      const char *label, unsigned type, size_t current_directory_ptr,
-      size_t entry_index);
-
-bool file_list_prepend(file_list_t *list,
-      const char *path, const char *label,
-      unsigned type, size_t directory_ptr,
-      size_t entry_idx);
-
-void file_list_pop(file_list_t *list, size_t *directory_ptr);
-
-void file_list_clear(file_list_t *list);
-
-void file_list_copy(const file_list_t *src, file_list_t *dst);
-
-void file_list_get_last(const file_list_t *list,
-      const char **path, const char **label,
-      unsigned *type, size_t *entry_idx);
-
-void *file_list_get_last_actiondata(const file_list_t *list);
-
-size_t file_list_get_size(const file_list_t *list);
-
-size_t file_list_get_directory_ptr(const file_list_t *list);
-
-void file_list_get_at_offset(const file_list_t *list, size_t index,
-      const char **path, const char **label,
-      unsigned *type, size_t *entry_idx);
-    
-void file_list_free_userdata(const file_list_t *list, size_t index);
-    
-void file_list_free_actiondata(const file_list_t *list, size_t idx);
-
-void file_list_set_label_at_offset(file_list_t *list, size_t index,
-      const char *label);
-
-void file_list_get_label_at_offset(const file_list_t *list, size_t index,
-      const char **label);
-
-void file_list_set_alt_at_offset(file_list_t *list, size_t index,
-      const char *alt);
-
-void file_list_set_userdata(const file_list_t *list, size_t idx, void *ptr);
-
-void file_list_set_actiondata(const file_list_t *list, size_t idx, void *ptr);
-
-void file_list_get_alt_at_offset(const file_list_t *list, size_t index,
-      const char **alt);
-
-void file_list_sort_on_alt(file_list_t *list);
-
-void file_list_sort_on_type(file_list_t *list);
-
-bool file_list_search(const file_list_t *list, const char *needle,
-      size_t *index);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/lists/string_list.h b/libretro-common/include/lists/string_list.h
deleted file mode 100644
index c15cd0e..0000000
--- a/libretro-common/include/lists/string_list.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (string_list.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_STRING_LIST_H
-#define __LIBRETRO_SDK_STRING_LIST_H
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-#include <stdlib.h>
-#include <stddef.h>
-
-RETRO_BEGIN_DECLS
-
-union string_list_elem_attr
-{
-   bool  b;
-   int   i;
-   void *p;
-};
-
-struct string_list_elem
-{
-   char *data;
-   union string_list_elem_attr attr;
-};
-
-struct string_list
-{
-   struct string_list_elem *elems;
-   size_t size;
-   size_t cap;
-};
-
-/**
- * string_list_find_elem:
- * @list             : pointer to string list
- * @elem             : element to find inside the string list.
- *
- * Searches for an element (@elem) inside the string list.
- *
- * Returns: true (1) if element could be found, otherwise false (0).
- */
-int string_list_find_elem(const struct string_list *list, const char *elem);
-
-/**
- * string_list_find_elem_prefix:
- * @list             : pointer to string list
- * @prefix           : prefix to append to @elem
- * @elem             : element to find inside the string list.
- *
- * Searches for an element (@elem) inside the string list. Will
- * also search for the same element prefixed by @prefix.
- *
- * Returns: true (1) if element could be found, otherwise false (0).
- */
-bool string_list_find_elem_prefix(const struct string_list *list,
-      const char *prefix, const char *elem);
-
-/**
- * string_split:
- * @str              : string to turn into a string list
- * @delim            : delimiter character to use for splitting the string.
- *
- * Creates a new string list based on string @str, delimited by @delim.
- *
- * Returns: new string list if successful, otherwise NULL.
- */
-struct string_list *string_split(const char *str, const char *delim);
-
-/**
- * string_list_new:
- *
- * Creates a new string list. Has to be freed manually.
- *
- * Returns: new string list if successful, otherwise NULL.
- */
-struct string_list *string_list_new(void);
-
-/**
- * string_list_append:
- * @list             : pointer to string list
- * @elem             : element to add to the string list
- * @attr             : attributes of new element.
- *
- * Appends a new element to the string list.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool string_list_append(struct string_list *list, const char *elem,
-      union string_list_elem_attr attr);
-
-/**
- * string_list_append_n:
- * @list             : pointer to string list
- * @elem             : element to add to the string list
- * @length           : read at most this many bytes from elem
- * @attr             : attributes of new element.
- *
- * Appends a new element to the string list.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool string_list_append_n(struct string_list *list, const char *elem,
-      unsigned length, union string_list_elem_attr attr);
-
-/**
- * string_list_free
- * @list             : pointer to string list object
- *
- * Frees a string list.
- */
-void string_list_free(struct string_list *list);
-
-/**
- * string_list_join_concat:
- * @buffer           : buffer that @list will be joined to.
- * @size             : length of @buffer.
- * @list             : pointer to string list.
- * @delim            : delimiter character for @list.
- *
- * A string list will be joined/concatenated as a
- * string to @buffer, delimited by @delim.
- */
-void string_list_join_concat(char *buffer, size_t size,
-      const struct string_list *list, const char *sep);
-
-/**
- * string_list_set:
- * @list             : pointer to string list
- * @idx              : index of element in string list
- * @str              : value for the element.
- *
- * Set value of element inside string list.
- **/
-void string_list_set(struct string_list *list, unsigned idx,
-      const char *str);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/math/complex.h b/libretro-common/include/math/complex.h
deleted file mode 100644
index d7695c2..0000000
--- a/libretro-common/include/math/complex.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (complex.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef __LIBRETRO_SDK_MATH_COMPLEX_H__
-#define __LIBRETRO_SDK_MATH_COMPLEX_H__
-
-#include <stdint.h>
-
-#include <retro_inline.h>
-
-typedef struct
-{
-   float real;
-   float imag;
-} fft_complex_t;
-
-static INLINE fft_complex_t fft_complex_mul(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out;
-   out.real = a.real * b.real - a.imag * b.imag;
-   out.imag = a.imag * b.real + a.real * b.imag;
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_add(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out;
-   out.real = a.real + b.real;
-   out.imag = a.imag + b.imag;
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_sub(fft_complex_t a,
-      fft_complex_t b)
-{
-   fft_complex_t out;
-   out.real = a.real - b.real;
-   out.imag = a.imag - b.imag;
-
-   return out;
-
-}
-
-static INLINE fft_complex_t fft_complex_conj(fft_complex_t a)
-{
-   fft_complex_t out;
-   out.real = a.real;
-   out.imag = -a.imag;
-
-   return out;
-}
-
-#endif
diff --git a/libretro-common/include/math/float_minmax.h b/libretro-common/include/math/float_minmax.h
deleted file mode 100644
index d917ef8..0000000
--- a/libretro-common/include/math/float_minmax.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (float_minmax.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef __LIBRETRO_SDK_MATH_FLOAT_MINMAX_H__
-#define __LIBRETRO_SDK_MATH_FLOAT_MINMAX_H__
-
-#include <stdint.h>
-#include <math.h>
-
-#include <retro_inline.h>
-#include <retro_miscellaneous.h>
-#include <retro_environment.h>
-
-#ifdef __SSE2__
-#include <emmintrin.h>
-#include <mmintrin.h>
-#endif
-
-static INLINE float float_min(float a, float b)
-{
-#ifdef __SSE2__
-   _mm_store_ss( &a, _mm_min_ss(_mm_set_ss(a),_mm_set_ss(b)) );
-   return a;
-#elif !defined(DJGPP) && (defined(__STDC_C99__) || defined(__STDC_C11__))
-   return fminf(a, b);
-#else
-   return MIN(a, b);
-#endif
-}
-
-static INLINE float float_max(float a, float b)
-{
-#ifdef __SSE2__
-   _mm_store_ss( &a, _mm_max_ss(_mm_set_ss(a),_mm_set_ss(b)) );
-   return a;
-#elif !defined(DJGPP) && (defined(__STDC_C99__) || defined(__STDC_C11__))
-   return fmaxf(a, b);
-#else
-   return MAX(a, b);
-#endif
-}
-
-
-#endif
diff --git a/libretro-common/include/math/fxp.h b/libretro-common/include/math/fxp.h
deleted file mode 100644
index 56b036c..0000000
--- a/libretro-common/include/math/fxp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fxp.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_MATH_FXP_H__
-#define __LIBRETRO_SDK_MATH_FXP_H__
-
-#include <stdint.h>
-
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-
-#include <retro_inline.h>
-
-static INLINE int64_t fx32_mul(const int32_t a, const int32_t b)
-{
-#ifdef _MSC_VER
-   return __emul(a, b);
-#else
-   return ((int64_t)a) * ((int64_t)b);
-#endif
-}
-
-static INLINE int32_t fx32_shiftdown(const int64_t a)
-{
-#ifdef _MSC_VER
-	return (int32_t)__ll_rshift(a, 12);
-#else
-	return (int32_t)(a >> 12);
-#endif
-}
-
-static INLINE int64_t fx32_shiftup(const int32_t a)
-{
-#ifdef _MSC_VER
-	return __ll_lshift(a, 12);
-#else
-	return ((int64_t)a) << 12;
-#endif
-}
-
-#endif
-
diff --git a/libretro-common/include/memalign.h b/libretro-common/include/memalign.h
deleted file mode 100644
index ca809f8..0000000
--- a/libretro-common/include/memalign.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (memalign.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_MEMALIGN_H
-#define _LIBRETRO_MEMALIGN_H
-
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-void *memalign_alloc(size_t boundary, size_t size);
-
-void *memalign_alloc_aligned(size_t size);
-
-void memalign_free(void *ptr);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/memmap.h b/libretro-common/include/memmap.h
deleted file mode 100644
index 5dc1a89..0000000
--- a/libretro-common/include/memmap.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (memmap.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_MEMMAP_H
-#define _LIBRETRO_MEMMAP_H
-
-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU)
-/* No mman available */
-#elif defined(_WIN32) && !defined(_XBOX)
-#include <windows.h>
-#include <errno.h>
-#include <io.h>
-#else
-#define HAVE_MMAN
-#include <sys/mman.h>
-#endif
-
-#if !defined(HAVE_MMAN) || defined(_WIN32)
-void* mmap(void *addr, size_t len, int mmap_prot, int mmap_flags, int fildes, size_t off);
-
-int munmap(void *addr, size_t len);
-
-int mprotect(void *addr, size_t len, int prot);
-#endif
-
-int memsync(void *start, void *end);
-
-int memprotect(void *addr, size_t len);
-
-#endif
diff --git a/libretro-common/include/net/net_compat.h b/libretro-common/include/net/net_compat.h
deleted file mode 100644
index dc8cdc1..0000000
--- a/libretro-common/include/net/net_compat.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_compat.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_SDK_NETPLAY_COMPAT_H__
-#define LIBRETRO_SDK_NETPLAY_COMPAT_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <boolean.h>
-#include <retro_inline.h>
-#include <stdint.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-
-#define WIN32_LEAN_AND_MEAN
-
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-
-#elif defined(_XBOX)
-
-#define NOD3D
-#include <xtl.h>
-#include <io.h>
-
-#elif defined(GEKKO)
-
-#include <network.h>
-
-#elif defined(VITA)
-
-#include <psp2/net/net.h>
-#include <psp2/net/netctl.h>
-
-#define sockaddr_in SceNetSockaddrIn
-#define sockaddr SceNetSockaddr
-#define sendto sceNetSendto
-#define recvfrom sceNetRecvfrom
-#define socket(a,b,c) sceNetSocket("unknown",a,b,c)
-#define bind sceNetBind
-#define accept sceNetAccept
-#define setsockopt sceNetSetsockopt
-#define connect sceNetConnect
-#define listen sceNetListen
-#define send sceNetSend
-#define recv sceNetRecv
-#define MSG_DONTWAIT SCE_NET_MSG_DONTWAIT
-#define AF_INET SCE_NET_AF_INET
-#define AF_UNSPEC 0
-#define INADDR_ANY SCE_NET_INADDR_ANY
-#define INADDR_NONE 0xffffffff
-#define SOCK_STREAM SCE_NET_SOCK_STREAM
-#define SOCK_DGRAM SCE_NET_SOCK_DGRAM
-#define SOL_SOCKET SCE_NET_SOL_SOCKET
-#define SO_REUSEADDR SCE_NET_SO_REUSEADDR
-#define SO_SNDBUF SCE_NET_SO_SNDBUF
-#define SO_SNDTIMEO SCE_NET_SO_SNDTIMEO
-#define SO_NBIO SCE_NET_SO_NBIO
-#define htonl sceNetHtonl
-#define ntohl sceNetNtohl
-#define htons sceNetHtons
-#define socklen_t unsigned int
-
-struct hostent
-{
-	char *h_name;
-	char **h_aliases;
-	int  h_addrtype;
-	int  h_length;
-	char **h_addr_list;
-	char *h_addr;
-};
-
-struct SceNetInAddr inet_aton(const char *ip_addr);
-
-#else
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifndef __PSL1GHT__
-#include <netinet/tcp.h>
-#endif
-
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <fcntl.h>
-
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <cell/sysmodule.h>
-#include <netex/net.h>
-#include <netex/libnetctl.h>
-#include <sys/timer.h>
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK SYS_NET_EWOULDBLOCK
-#endif
-
-#else
-#include <signal.h>
-#endif
-
-#endif
-
-#include <errno.h>
-
-#ifdef GEKKO
-#define sendto(s, msg, len, flags, addr, tolen) net_sendto(s, msg, len, 0, addr, 8)
-#define socket(domain, type, protocol) net_socket(domain, type, protocol)
-#define bind(s, name, namelen) net_bind(s, name, namelen)
-#define listen(s, backlog) net_listen(s, backlog)
-#define accept(s, addr, addrlen) net_accept(s, addr, addrlen)
-#define connect(s, addr, addrlen) net_connect(s, addr, addrlen)
-#define send(s, data, size, flags) net_send(s, data, size, flags)
-#define recv(s, mem, len, flags) net_recv(s, mem, len, flags)
-#define recvfrom(s, mem, len, flags, from, fromlen) net_recvfrom(s, mem, len, flags, from, fromlen)
-#define select(maxfdp1, readset, writeset, exceptset, timeout) net_select(maxfdp1, readset, writeset, exceptset, timeout)
-#endif
-
-static INLINE bool isagain(int bytes)
-{
-#if defined(_WIN32)
-   if (bytes != SOCKET_ERROR)
-      return false;
-   if (WSAGetLastError() != WSAEWOULDBLOCK)
-      return false;
-   return true;
-#elif defined(VITA)
-	 return (bytes<0 && (bytes == SCE_NET_ERROR_EAGAIN || bytes == SCE_NET_ERROR_EWOULDBLOCK));
-#elif defined(WIIU)
-   return (bytes == -1) && ((socketlasterr() == SO_SUCCESS) || (socketlasterr() == SO_EWOULDBLOCK));
-#else
-   return (bytes < 0 && (errno == EAGAIN || errno == EWOULDBLOCK));
-#endif
-}
-
-#ifdef _XBOX
-#define socklen_t int
-
-#ifndef h_addr
-#define h_addr h_addr_list[0] /* for backward compatibility */
-#endif
-
-#ifndef SO_KEEPALIVE
-#define SO_KEEPALIVE 0 /* verify if correct */
-#endif
-#endif
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-#ifndef _WIN32
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-/* Compatibility layer for legacy or incomplete BSD socket implementations.
- * Only for IPv4. Mostly useful for the consoles which do not support
- * anything reasonably modern on the socket API side of things. */
-
-#ifdef HAVE_SOCKET_LEGACY
-
-#define sockaddr_storage sockaddr_in
-#define addrinfo addrinfo_retro__
-
-struct addrinfo
-{
-   int ai_flags;
-   int ai_family;
-   int ai_socktype;
-   int ai_protocol;
-   size_t ai_addrlen;
-   struct sockaddr *ai_addr;
-   char *ai_canonname;
-   struct addrinfo *ai_next;
-};
-
-#ifndef AI_PASSIVE
-#define AI_PASSIVE 1
-#endif
-
-/* gai_strerror() not used, so we skip that. */
-
-#endif
-
-uint16_t inet_htons(uint16_t hostshort);
-
-int inet_ptrton(int af, const char *src, void *dst);
-
-int getaddrinfo_retro(const char *node, const char *service,
-      struct addrinfo *hints, struct addrinfo **res);
-
-void freeaddrinfo_retro(struct addrinfo *res);
-
-/**
- * network_init:
- *
- * Platform specific socket library initialization.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool network_init(void);
-
-/**
- * network_deinit:
- *
- * Deinitialize platform specific socket libraries.
- **/
-void network_deinit(void);
-
-const char *inet_ntop_compat(int af, const void *src, char *dst, socklen_t cnt);
-
-bool udp_send_packet(const char *host, uint16_t port, const char *msg);
-
-#endif
diff --git a/libretro-common/include/net/net_http.h b/libretro-common/include/net/net_http.h
deleted file mode 100644
index be03761..0000000
--- a/libretro-common/include/net/net_http.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_http.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_NET_HTTP_H
-#define _LIBRETRO_SDK_NET_HTTP_H
-
-#include <stdint.h>
-#include <boolean.h>
-#include <string.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-struct http_t;
-struct http_connection_t;
-
-struct http_connection_t *net_http_connection_new(const char *url, const char *method, const char *data);
-
-bool net_http_connection_iterate(struct http_connection_t *conn);
-
-bool net_http_connection_done(struct http_connection_t *conn);
-
-void net_http_connection_free(struct http_connection_t *conn);
-
-const char *net_http_connection_url(struct http_connection_t *conn);
-
-struct http_t *net_http_new(struct http_connection_t *conn);
-
-/* You can use this to call net_http_update 
- * only when something will happen; select() it for reading. */
-int net_http_fd(struct http_t *state);
-
-/* Returns true if it's done, or if something broke.
- * 'total' will be 0 if it's not known. */
-bool net_http_update(struct http_t *state, size_t* progress, size_t* total);
-
-/* 200, 404, or whatever.  */
-int net_http_status(struct http_t *state);
-
-bool net_http_error(struct http_t *state);
-
-/* Returns the downloaded data. The returned buffer is owned by the 
- * HTTP handler; it's freed by net_http_delete. 
- *
- * If the status is not 20x and accept_error is false, it returns NULL. */
-uint8_t* net_http_data(struct http_t *state, size_t* len, bool accept_error);
-
-/* Cleans up all memory. */
-void net_http_delete(struct http_t *state);
-
-void net_http_urlencode_full(char **dest, const char *source);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/net/net_http_parse.h b/libretro-common/include/net/net_http_parse.h
deleted file mode 100644
index 4fc4845..0000000
--- a/libretro-common/include/net/net_http_parse.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_http.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_NET_HTTP_PARSE_H
-#define _LIBRETRO_SDK_NET_HTTP_PARSE_H
-
-#include <stdint.h>
-#include <boolean.h>
-#include <string.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * string_parse_html_anchor:
- * @line               : Buffer where the <a> tag is stored
- * @link               : Buffer to store the link URL in
- * @name               : Buffer to store the link URL in
- * @link_size          : Size of the link buffer including the NUL-terminator
- * @name_size          : Size of the name buffer including the NUL-terminator
- *
- * Parses an HTML anchor link stored in @line in the form of: <a href="/path/to/url">Title</a>
- * The buffer pointed to by @link is filled with the URL path the link points to,
- * and @name is filled with the title portion of the link.
- *
- * Returns: 0 if URL was parsed completely, otherwise 1.
- **/
-int string_parse_html_anchor(const char *line, char *link, char *name,
-      size_t link_size, size_t name_size);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/net/net_ifinfo.h b/libretro-common/include/net/net_ifinfo.h
deleted file mode 100644
index 9412d30..0000000
--- a/libretro-common/include/net/net_ifinfo.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_ifinfo.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_NET_IFINFO_H
-#define _LIBRETRO_NET_IFINFO_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-
-struct net_ifinfo_entry
-{
-   char *name;
-   char *host;
-};
-
-struct net_ifinfo
-{
-   struct net_ifinfo_entry *entries;
-   size_t size;
-}; 
-
-typedef struct net_ifinfo net_ifinfo_t;
-
-void net_ifinfo_free(net_ifinfo_t *list);
-
-bool net_ifinfo_new(net_ifinfo_t *list);
-
-RETRO_END_DECLS
-
-
-#endif
diff --git a/libretro-common/include/net/net_natt.h b/libretro-common/include/net/net_natt.h
deleted file mode 100644
index 9c8b3d7..0000000
--- a/libretro-common/include/net/net_natt.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_natt.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_NET_NATT_H
-#define _LIBRETRO_SDK_NET_NATT_H
-
-#include <net/net_compat.h>
-#include <net/net_socket.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-struct natt_status {
-   /** nfds for select when checking for input */
-   int nfds;
-
-   /** The fdset to be selected upon to check for responses */
-   fd_set fds;
-
-   /** True if there might be a request outstanding */
-   bool request_outstanding;
-
-   /** True if we've resolved an external IPv4 address */
-   bool have_inet4;
-
-   /** External IPv4 address */
-   struct sockaddr_in ext_inet4_addr;
-
-   /** True if we've resolved an external IPv6 address */
-   bool have_inet6;
-
-#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
-   /** External IPv6 address */
-   struct sockaddr_in6 ext_inet6_addr;
-#endif
-
-   /** Internal status (currently unused) */
-   void *internal;
-};
-
-/**
- * Initialize global NAT traversal structures (must be called once to use other
- * functions) */
-void natt_init(void);
-
-/** Initialize a NAT traversal status object */
-bool natt_new(struct natt_status *status);
-
-/** Free a NAT traversal status object */
-void natt_free(struct natt_status *status);
-
-/**
- * Make a port forwarding request when only the port is known. Forwards any
- * address it can find. */
-bool natt_open_port_any(struct natt_status *status, uint16_t port,
-   enum socket_protocol proto);
-
-/** Check for port forwarding responses */
-bool natt_read(struct natt_status *status);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/net/net_socket.h b/libretro-common/include/net/net_socket.h
deleted file mode 100644
index 58ad050..0000000
--- a/libretro-common/include/net/net_socket.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_socket.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_NET_SOCKET_H
-#define _LIBRETRO_SDK_NET_SOCKET_H
-
-#include <stdint.h>
-#include <boolean.h>
-#include <string.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum socket_domain
-{
-   SOCKET_DOMAIN_INET = 0
-};
-
-enum socket_type
-{
-   SOCKET_TYPE_DATAGRAM = 0,
-   SOCKET_TYPE_STREAM,
-   SOCKET_TYPE_SEQPACKET
-};
-
-enum socket_protocol
-{
-   SOCKET_PROTOCOL_NONE = 0,
-   SOCKET_PROTOCOL_TCP,
-   SOCKET_PROTOCOL_UDP
-};
-
-typedef struct socket_target
-{
-   unsigned port;
-   const char *server;
-   enum socket_domain domain;
-   enum socket_protocol prot;
-} socket_target_t;
-
-int socket_init(void **address, uint16_t port, const char *server, enum socket_type type);
-
-int socket_close(int fd);
-
-bool socket_nonblock(int fd);
-
-int socket_select(int nfds, fd_set *readfs, fd_set *writefds,
-      fd_set *errorfds, struct timeval *timeout);
-
-int socket_send_all_blocking(int fd, const void *data_, size_t size, bool no_signal);
-
-ssize_t socket_send_all_nonblocking(int fd, const void *data_, size_t size,
-      bool no_signal);
-
-int socket_receive_all_blocking(int fd, void *data_, size_t size);
-
-ssize_t socket_receive_all_nonblocking(int fd, bool *error,
-      void *data_, size_t size);
-
-bool socket_bind(int fd, void *data);
-
-int socket_connect(int fd, void *data, bool timeout_enable);
-
-int socket_create(
-      const char *name,
-      enum socket_domain domain_type,
-      enum socket_type socket_type,
-      enum socket_protocol protocol_type);
-
-void socket_set_target(void *data, socket_target_t *in_addr);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/queues/fifo_queue.h b/libretro-common/include/queues/fifo_queue.h
deleted file mode 100644
index 911da76..0000000
--- a/libretro-common/include/queues/fifo_queue.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fifo_queue.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FIFO_BUFFER_H
-#define __LIBRETRO_SDK_FIFO_BUFFER_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
-struct fifo_buffer
-{
-   uint8_t *buffer;
-   size_t size;
-   size_t first;
-   size_t end;
-};
-
-typedef struct fifo_buffer fifo_buffer_t;
-
-fifo_buffer_t *fifo_new(size_t size);
-
-static INLINE void fifo_clear(fifo_buffer_t *buffer)
-{
-   buffer->first = 0;
-   buffer->end   = 0;
-}
-
-void fifo_write(fifo_buffer_t *buffer, const void *in_buf, size_t size);
-
-void fifo_read(fifo_buffer_t *buffer, void *in_buf, size_t size);
-
-static INLINE void fifo_free(fifo_buffer_t *buffer)
-{
-   if (!buffer)
-      return;
-
-   free(buffer->buffer);
-   free(buffer);
-}
-
-static INLINE size_t fifo_read_avail(fifo_buffer_t *buffer)
-{
-   return (buffer->end + ((buffer->end < buffer->first) ? buffer->size : 0)) - buffer->first;
-}
-
-static INLINE size_t fifo_write_avail(fifo_buffer_t *buffer)
-{
-   return (buffer->size - 1) - ((buffer->end + ((buffer->end < buffer->first) ? buffer->size : 0)) - buffer->first);
-}
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/libretro-common/include/queues/message_queue.h b/libretro-common/include/queues/message_queue.h
deleted file mode 100644
index 2339e93..0000000
--- a/libretro-common/include/queues/message_queue.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (message_queue.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_MSG_QUEUE_H
-#define __LIBRETRO_SDK_MSG_QUEUE_H
-
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct msg_queue msg_queue_t;
-
-/**
- * msg_queue_new:
- * @size              : maximum size of message
- *
- * Creates a message queue with maximum size different messages.
- *
- * Returns: NULL if allocation error, pointer to a message queue
- * if successful. Has to be freed manually.
- **/
-msg_queue_t *msg_queue_new(size_t size);
-
-/**
- * msg_queue_push:
- * @queue             : pointer to queue object
- * @msg               : message to add to the queue
- * @prio              : priority level of the message
- * @duration          : how many times the message can be pulled
- *                      before it vanishes (E.g. show a message for
- *                      3 seconds @ 60fps = 180 duration).
- *
- * Push a new message onto the queue.
- **/
-void msg_queue_push(msg_queue_t *queue, const char *msg,
-      unsigned prio, unsigned duration);
-
-/**
- * msg_queue_pull:
- * @queue             : pointer to queue object
- *
- * Pulls highest priority message in queue.
- *
- * Returns: NULL if no message in queue, otherwise a string
- * containing the message.
- **/
-const char *msg_queue_pull(msg_queue_t *queue);
-
-/**
- * msg_queue_clear:
- * @queue             : pointer to queue object
- *
- * Clears out everything in the queue.
- **/
-void msg_queue_clear(msg_queue_t *queue);
-
-/**
- * msg_queue_free:
- * @queue             : pointer to queue object
- *
- * Frees message queue..
- **/
-void msg_queue_free(msg_queue_t *queue);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/queues/task_queue.h b/libretro-common/include/queues/task_queue.h
deleted file mode 100644
index 28322ad..0000000
--- a/libretro-common/include/queues/task_queue.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (task_queue.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_TASK_QUEUE_H__
-#define __LIBRETRO_SDK_TASK_QUEUE_H__
-
-#include <stdint.h>
-#include <stddef.h>
-#include <boolean.h>
-
-#include <retro_common.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum task_type
-{
-   TASK_TYPE_NONE,
-   /* Only one blocking task can exist in the queue at a time.
-    * Attempts to add a new one while another is running is
-    * ignored.
-    */
-   TASK_TYPE_BLOCKING
-};
-
-
-typedef struct retro_task retro_task_t;
-typedef void (*retro_task_callback_t)(void *task_data,
-      void *user_data, const char *error);
-
-typedef void (*retro_task_handler_t)(retro_task_t *task);
-
-typedef bool (*retro_task_finder_t)(retro_task_t *task,
-      void *userdata);
-
-typedef void (*retro_task_queue_msg_t)(const char *msg, 
-      unsigned prio, unsigned duration, bool flush);
-
-typedef bool (*retro_task_retriever_t)(retro_task_t *task, void *data);
-
-typedef bool (*retro_task_condition_fn_t)(void *data);
-
-typedef struct
-{
-   char *source_file;
-} decompress_task_data_t;
-
-struct retro_task
-{
-   retro_task_handler_t  handler;
-
-   /* always called from the main loop */
-   retro_task_callback_t callback;
-
-   /* task cleanup handler to free allocated resources, will
-    * be called immediately after running the main callback */
-   retro_task_handler_t cleanup;
-
-   /* set to true by the handler to signal
-    * the task has finished executing. */
-   bool finished;
-
-   /* set to true by the task system
-    * to signal the task *must* end. */
-   bool cancelled;
-
-   /* if true no OSD messages will be displayed. */
-   bool mute;
-
-   /* created by the handler, destroyed by the user */
-   void *task_data;
-
-   /* owned by the user */
-   void *user_data;
-
-   /* created and destroyed by the code related to the handler */
-   void *state;
-
-   /* created by task handler; destroyed by main loop
-    * (after calling the callback) */
-   char *error;
-
-   /* -1 = unmettered, 0-100 progress value */
-   int8_t progress;
-
-   /* handler can modify but will be
-    * free()d automatically if non-NULL. */
-   char *title;
-
-   enum task_type type;
-
-   /* don't touch this. */
-   retro_task_t *next;
-};
-
-typedef struct task_finder_data
-{
-   retro_task_finder_t func;
-   void *userdata;
-} task_finder_data_t;
-
-typedef struct task_retriever_info
-{
-   struct task_retriever_info *next;
-   void *data;
-} task_retriever_info_t;
-
-typedef struct task_retriever_data
-{
-   retro_task_handler_t handler;
-   size_t element_size;
-   retro_task_retriever_t func;
-   task_retriever_info_t *list;
-} task_retriever_data_t;
-
-void *task_queue_retriever_info_next(task_retriever_info_t **link);
-
-void task_queue_retriever_info_free(task_retriever_info_t *list);
-
-/**
- * Signals a task to end without waiting for
- * it to complete. */
-void task_queue_cancel_task(void *task);
-
-void task_set_finished(retro_task_t *task, bool finished);
-
-void task_set_mute(retro_task_t *task, bool mute);
-
-void task_set_error(retro_task_t *task, char *error);
-
-void task_set_progress(retro_task_t *task, int8_t progress);
-
-void task_set_title(retro_task_t *task, char *title);
-
-void task_set_data(retro_task_t *task, void *data);
-
-void task_set_cancelled(retro_task_t *task, bool cancelled);
-
-void task_free_title(retro_task_t *task);
-
-bool task_get_cancelled(retro_task_t *task);
-
-bool task_get_finished(retro_task_t *task);
-
-bool task_get_mute(retro_task_t *task);
-
-char* task_get_error(retro_task_t *task);
-
-int8_t task_get_progress(retro_task_t *task);
-
-char* task_get_title(retro_task_t *task);
-
-void* task_get_data(retro_task_t *task);
-
-void task_queue_set_threaded(void);
-
-void task_queue_unset_threaded(void);
-
-bool task_queue_is_threaded(void);
-
-/**		
- * Calls func for every running task		
- * until it returns true.		
- * Returns a task or NULL if not found.		
- */
-bool task_queue_find(task_finder_data_t *find_data);
-
-/**		
- * Calls func for every running task when handler		
- * parameter matches task handler, allowing the		
- * list parameter to be filled with user-defined		
- * data.		
- */
-void task_queue_retrieve(task_retriever_data_t *data);
-
- /* Checks for finished tasks		
-  * Takes the finished tasks, if any,		
-  * and runs their callbacks.		
-  * This must only be called from the main thread. */
-void task_queue_check(void);
-
-/* Pushes a task		
- * The task will start as soon as possible. */		
-void task_queue_push(retro_task_t *task);
-
-/* Blocks until all tasks have finished
- * will return early if cond is not NULL
- * and cond(data) returns false.
- * This must only be called from the main thread. */
-void task_queue_wait(retro_task_condition_fn_t cond, void* data);
-
-
-/* Sends a signal to terminate all the tasks.		
- *		
- * This won't terminate the tasks immediately.		
- * They will finish as soon as possible.		
- *		
- * This must only be called from the main thread. */
-void task_queue_reset(void);
-
-/* Deinitializes the task system.
- * This deinitializes the task system.
- * The tasks that are running at
- * the moment will stay on hold */
-void task_queue_deinit(void);
-
-/* Initializes the task system.
- * This initializes the task system
- * and chooses an appropriate
- * implementation according to the settings.
- *
- * This must only be called from the main thread. */
-void task_queue_init(bool threaded, retro_task_queue_msg_t msg_push);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/retro_assert.h b/libretro-common/include/retro_assert.h
deleted file mode 100644
index 3ef0300..0000000
--- a/libretro-common/include/retro_assert.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_assert.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __RETRO_ASSERT_H
-#define __RETRO_ASSERT_H
-
-#include <assert.h>
-
-#ifdef RARCH_INTERNAL
-#define retro_assert(cond) do { \
-   if (!(cond)) { printf("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
-} while(0)
-#else
-#define retro_assert(cond) assert(cond)
-#endif
-
-#endif
diff --git a/libretro-common/include/retro_common.h b/libretro-common/include/retro_common.h
deleted file mode 100644
index 3385723..0000000
--- a/libretro-common/include/retro_common.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_common.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_COMMON_RETRO_COMMON_H
-#define _LIBRETRO_COMMON_RETRO_COMMON_H
-
-/*
-This file is designed to normalize the libretro-common compiling environment.
-It is not to be used in public API headers, as they should be designed as leanly as possible.
-Nonetheless.. in the meantime, if you do something like use ssize_t, which is not fully portable, 
-in a public API, you may need this.
-*/
-
-/* conditional compilation is handled inside here */
-#include <compat/msvc.h>
-
-#endif
-
diff --git a/libretro-common/include/retro_dirent.h b/libretro-common/include/retro_dirent.h
deleted file mode 100644
index ab02998..0000000
--- a/libretro-common/include/retro_dirent.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_dirent.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __RETRO_DIRENT_H
-#define __RETRO_DIRENT_H
-
-#include <retro_common_api.h>
-#include <retro_miscellaneous.h>
-
-#include <boolean.h>
-
-#if defined(_WIN32)
-#  ifdef _MSC_VER
-#    define setmode _setmode
-#  endif
-#  ifdef _XBOX
-#    include <xtl.h>
-#    define INVALID_FILE_ATTRIBUTES -1
-#  else
-#    include <io.h>
-#    include <fcntl.h>
-#    include <direct.h>
-#    include <windows.h>
-#  endif
-#elif defined(VITA)
-#  include <psp2/io/fcntl.h>
-#  include <psp2/io/dirent.h>
-#else
-#  if defined(PSP)
-#    include <pspiofilemgr.h>
-#  endif
-#  include <sys/types.h>
-#  include <sys/stat.h>
-#  include <dirent.h>
-#  include <unistd.h>
-#endif
-
-#ifdef __CELLOS_LV2__
-#include <cell/cell_fs.h>
-#endif
-
-RETRO_BEGIN_DECLS
-
-struct RDIR
-{
-#if defined(_WIN32)
-   WIN32_FIND_DATA entry;
-   HANDLE directory;
-   bool next;
-   char path[PATH_MAX_LENGTH];
-#elif defined(VITA) || defined(PSP)
-   SceUID directory;
-   SceIoDirent entry;
-#elif defined(__CELLOS_LV2__)
-   CellFsErrno error;
-   int directory;
-   CellFsDirent entry;
-#else
-   DIR *directory;
-   const struct dirent *entry;
-#endif
-};
-
-struct RDIR *retro_opendir(const char *name);
-
-int retro_readdir(struct RDIR *rdir);
-
-bool retro_dirent_error(struct RDIR *rdir);
-
-const char *retro_dirent_get_name(struct RDIR *rdir);
-
-/**
- *
- * retro_dirent_is_dir:
- * @rdir         : pointer to the directory entry.
- *
- * Is the directory listing entry a directory?
- *
- * Returns: true if directory listing entry is
- * a directory, false if not.
- */
-bool retro_dirent_is_dir(struct RDIR *rdir, const char *path);
-
-void retro_closedir(struct RDIR *rdir);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/retro_endianness.h b/libretro-common/include/retro_endianness.h
deleted file mode 100644
index baa3eec..0000000
--- a/libretro-common/include/retro_endianness.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_endianness.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_ENDIANNESS_H
-#define __LIBRETRO_SDK_ENDIANNESS_H
-
-#include <retro_inline.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(_MSC_VER)
-#define SWAP16 _byteswap_ushort
-#define SWAP32 _byteswap_ulong
-#else
-#define SWAP16(x) ((uint16_t)(                  \
-         (((uint16_t)(x) & 0x00ff) << 8)      | \
-         (((uint16_t)(x) & 0xff00) >> 8)        \
-          ))
-#define SWAP32(x) ((uint32_t)(           \
-         (((uint32_t)(x) & 0x000000ff) << 24) | \
-         (((uint32_t)(x) & 0x0000ff00) <<  8) | \
-         (((uint32_t)(x) & 0x00ff0000) >>  8) | \
-         (((uint32_t)(x) & 0xff000000) >> 24)   \
-         ))
-#endif
-
-#define SWAP64(val)                                             \
-	((((uint64_t)(val) & 0x00000000000000ffULL) << 56)      \
-	 | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40)    \
-	 | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24)    \
-	 | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8)     \
-	 | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8)     \
-	 | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24)    \
-	 | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40)    \
-	 | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56))
-
-/**
- * is_little_endian:
- *
- * Checks if the system is little endian or big-endian.
- *
- * Returns: greater than 0 if little-endian,
- * otherwise big-endian.
- **/
-#if defined(MSB_FIRST)
-#define is_little_endian() (0)
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define is_little_endian() (1)
-#else
-static INLINE uint8_t is_little_endian(void)
-{
-   union
-   {
-      uint16_t x;
-      uint8_t y[2];
-   } u;
-
-   u.x = 1;
-   return u.y[0];
-}
-#endif
-
-/**
- * swap_if_big64:
- * @val        : unsigned 64-bit value
- *
- * Byteswap unsigned 64-bit value if system is big-endian.
- *
- * Returns: Byteswapped value in case system is big-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_big64(val) (SWAP64(val))
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_big64(val) (val)
-#else
-static INLINE uint64_t swap_if_big64(uint64_t val)
-{
-   if (is_little_endian())
-      return val;
-   return SWAP64(val);
-}
-#endif
-
-/**
- * swap_if_big32:
- * @val        : unsigned 32-bit value
- *
- * Byteswap unsigned 32-bit value if system is big-endian.
- *
- * Returns: Byteswapped value in case system is big-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_big32(val) (SWAP32(val))
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_big32(val) (val)
-#else
-static INLINE uint32_t swap_if_big32(uint32_t val)
-{
-   if (is_little_endian())
-      return val;
-   return SWAP32(val);
-}
-#endif
-
-/**
- * swap_if_little64:
- * @val        : unsigned 64-bit value
- *
- * Byteswap unsigned 64-bit value if system is little-endian.
- *
- * Returns: Byteswapped value in case system is little-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_little64(val) (val)
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_little64(val) (SWAP64(val))
-#else
-static INLINE uint64_t swap_if_little64(uint64_t val)
-{
-   if (is_little_endian())
-      return SWAP64(val);
-   return val;
-}
-#endif
-
-/**
- * swap_if_little32:
- * @val        : unsigned 32-bit value
- *
- * Byteswap unsigned 32-bit value if system is little-endian.
- *
- * Returns: Byteswapped value in case system is little-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_little32(val) (val)
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_little32(val) (SWAP32(val))
-#else
-static INLINE uint32_t swap_if_little32(uint32_t val)
-{
-   if (is_little_endian())
-      return SWAP32(val);
-   return val;
-}
-#endif
-
-/**
- * swap_if_big16:
- * @val        : unsigned 16-bit value
- *
- * Byteswap unsigned 16-bit value if system is big-endian.
- *
- * Returns: Byteswapped value in case system is big-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_big16(val) (SWAP16(val))
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_big16(val) (val)
-#else
-static INLINE uint16_t swap_if_big16(uint16_t val)
-{
-   if (is_little_endian())
-      return val;
-   return SWAP16(val);
-}
-#endif
-
-/**
- * swap_if_little16:
- * @val        : unsigned 16-bit value
- *
- * Byteswap unsigned 16-bit value if system is little-endian.
- *
- * Returns: Byteswapped value in case system is little-endian,
- * otherwise returns same value.
- **/
-
-#if defined(MSB_FIRST)
-#define swap_if_little16(val) (val)
-#elif defined(__x86_64) || defined(__i386) || defined(_M_IX86) || defined(_M_X64)
-#define swap_if_little16(val) (SWAP16(val))
-#else
-static INLINE uint16_t swap_if_little16(uint16_t val)
-{
-   if (is_little_endian())
-      return SWAP16(val);
-   return val;
-}
-#endif
-
-/**
- * store32be:
- * @addr        : pointer to unsigned 32-bit buffer
- * @data        : unsigned 32-bit value to write
- *
- * Write data to address. Endian-safe. Byteswaps the data
- * first if necessary before storing it.
- **/
-static INLINE void store32be(uint32_t *addr, uint32_t data)
-{
-   *addr = swap_if_little32(data);
-}
-
-/**
- * load32be:
- * @addr        : pointer to unsigned 32-bit buffer
- *
- * Load value from address. Endian-safe.
- *
- * Returns: value from address, byte-swapped if necessary.
- **/
-static INLINE uint32_t load32be(const uint32_t *addr)
-{
-   return swap_if_little32(*addr);
-}
-
-#endif
diff --git a/libretro-common/include/retro_environment.h b/libretro-common/include/retro_environment.h
deleted file mode 100644
index 12ee429..0000000
--- a/libretro-common/include/retro_environment.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_environment.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_ENVIRONMENT_H
-#define __LIBRETRO_SDK_ENVIRONMENT_H
-
-/*
-This file is designed to create a normalized environment for compiling
-libretro-common's private implementations, or any other sources which might
-enjoy use of it's environment (RetroArch for instance).
-This should be an elaborately crafted environment so that sources don't
-need to be full of platform-specific workarounds.
-*/
-
-#if defined (__cplusplus)
-#if 0
-printf("This is C++, version %d.\n", __cplusplus);
-#endif
-/* The expected values would be
- *   199711L, for ISO/IEC 14882:1998 or 14882:2003
- */
-
-#elif defined(__STDC__)
-/* This is standard C. */
-
-#if (__STDC__ == 1)
-/* The implementation is ISO-conforming. */
-#define __STDC_ISO__
-#else
-/* The implementation is not ISO-conforming. */
-#endif
-
-#if defined(__STDC_VERSION__)
-#if (__STDC_VERSION__ >= 201112L)
-/* This is C11. */
-#define __STDC_C11__
-#elif (__STDC_VERSION__ >= 199901L)
-/* This is C99. */
-#define __STDC_C99__
-#elif (__STDC_VERSION__ >= 199409L)
-/* This is C89 with amendment 1. */
-#define __STDC_C89__
-#define __STDC_C89_AMENDMENT_1__
-#else
-/* This is C89 without amendment 1. */
-#define __STDC_C89__
-#endif
-#else /* !defined(__STDC_VERSION__) */
-/* This is C89. __STDC_VERSION__ is not defined. */
-#define __STDC_C89__
-#endif
-
-#else   /* !defined(__STDC__) */
-/* This is not standard C. __STDC__ is not defined. */
-#endif
-
-
-
-#endif
diff --git a/libretro-common/include/rhash.h b/libretro-common/include/rhash.h
deleted file mode 100644
index d739488..0000000
--- a/libretro-common/include/rhash.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rhash.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- *  sha1.h
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <paulej@packetizer.com>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha1.h 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This class implements the Secure Hashing Standard as defined
- *      in FIPS PUB 180-1 published April 17, 1995.
- *
- *      Many of the variable names in the SHA1Context, especially the
- *      single character names, were used because those were the names
- *      used in the publication.
- *
- *      Please read the file sha1.c for more information.
- *
- */
-
-#ifndef __RARCH_HASH_H
-#define __RARCH_HASH_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <compat/msvc.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <retro_inline.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * sha256_hash:
- * @out               : Output.
- * @in                : Input.
- * @size              : Size of @out.
- *
- * Hashes SHA256 and outputs a human readable string.
- **/
-void sha256_hash(char *out, const uint8_t *in, size_t size);
-
-typedef struct SHA1Context
-{
-   unsigned Message_Digest[5]; /* Message Digest (output)          */
-
-   unsigned Length_Low;        /* Message length in bits           */
-   unsigned Length_High;       /* Message length in bits           */
-
-   unsigned char Message_Block[64]; /* 512-bit message blocks      */
-   int Message_Block_Index;    /* Index into message block array   */
-
-   int Computed;               /* Is the digest computed?          */
-   int Corrupted;              /* Is the message digest corruped?  */
-} SHA1Context;
-
-int sha1_calculate(const char *path, char *result);
-
-uint32_t djb2_calculate(const char *str);
-
-/* Any 32-bit or wider unsigned integer data type will do */
-typedef unsigned int MD5_u32plus;
-
-typedef struct {
-	MD5_u32plus lo, hi;
-	MD5_u32plus a, b, c, d;
-	unsigned char buffer[64];
-	MD5_u32plus block[16];
-} MD5_CTX;
-
-/*
- * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
- * MD5 Message-Digest Algorithm (RFC 1321).
- *
- * Homepage:
- * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- *
- * Author:
- * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
- *
- * This software was written by Alexander Peslyak in 2001.  No copyright is
- * claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the
- * public domain is deemed null and void, then the software is
- * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See md5.c for more information.
- */
-
-void MD5_Init(MD5_CTX *ctx);
-void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
-void MD5_Final(unsigned char *result, MD5_CTX *ctx);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/rthreads/rthreads.h b/libretro-common/include/rthreads/rthreads.h
deleted file mode 100644
index 6a33f9e..0000000
--- a/libretro-common/include/rthreads/rthreads.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rthreads.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_RTHREADS_H__
-#define __LIBRETRO_SDK_RTHREADS_H__
-
-#include <retro_common_api.h>
-
-#include <boolean.h>
-#include <stdint.h>
-#include <retro_inline.h>
-#include <retro_miscellaneous.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct sthread sthread_t;
-typedef struct slock slock_t;
-typedef struct scond scond_t;
-
-#ifdef HAVE_THREAD_STORAGE
-typedef unsigned sthread_tls_t;
-#endif
-
-/**
- * sthread_create:
- * @start_routine           : thread entry callback function
- * @userdata                : pointer to userdata that will be made
- *                            available in thread entry callback function
- *
- * Create a new thread.
- *
- * Returns: pointer to new thread if successful, otherwise NULL.
- */
-sthread_t *sthread_create(void (*thread_func)(void*), void *userdata);
-
-/**
- * sthread_detach:
- * @thread                  : pointer to thread object 
- *
- * Detach a thread. When a detached thread terminates, its
- * resource sare automatically released back to the system
- * without the need for another thread to join with the 
- * terminated thread.
- *
- * Returns: 0 on success, otherwise it returns a non-zero error number.
- */
-int sthread_detach(sthread_t *thread);
-
-/**
- * sthread_join:
- * @thread                  : pointer to thread object 
- *
- * Join with a terminated thread. Waits for the thread specified by
- * @thread to terminate. If that thread has already terminated, then
- * it will return immediately. The thread specified by @thread must
- * be joinable.
- * 
- * Returns: 0 on success, otherwise it returns a non-zero error number.
- */
-void sthread_join(sthread_t *thread);
-
-/**
- * sthread_isself:
- * @thread                  : pointer to thread object
- *
- * Returns: true (1) if calling thread is the specified thread
- */
-bool sthread_isself(sthread_t *thread);
-
-/**
- * slock_new:
- *
- * Create and initialize a new mutex. Must be manually
- * freed.
- *
- * Returns: pointer to a new mutex if successful, otherwise NULL.
- **/
-slock_t *slock_new(void);
-
-/**
- * slock_free:
- * @lock                    : pointer to mutex object 
- *
- * Frees a mutex.
- **/
-void slock_free(slock_t *lock);
-
-/**
- * slock_lock:
- * @lock                    : pointer to mutex object 
- *
- * Locks a mutex. If a mutex is already locked by
- * another thread, the calling thread shall block until
- * the mutex becomes available.
-**/
-void slock_lock(slock_t *lock);
-
-/**
- * slock_unlock:
- * @lock                    : pointer to mutex object 
- *
- * Unlocks a mutex.
- **/
-void slock_unlock(slock_t *lock);
-
-/**
- * scond_new:
- *
- * Creates and initializes a condition variable. Must
- * be manually freed.
- *
- * Returns: pointer to new condition variable on success,
- * otherwise NULL.
- **/
-scond_t *scond_new(void);
-
-/**
- * scond_free:
- * @cond                    : pointer to condition variable object 
- *
- * Frees a condition variable.
-**/
-void scond_free(scond_t *cond);
-
-/**
- * scond_wait:
- * @cond                    : pointer to condition variable object 
- * @lock                    : pointer to mutex object 
- *
- * Block on a condition variable (i.e. wait on a condition). 
- **/
-void scond_wait(scond_t *cond, slock_t *lock);
-
-/**
- * scond_wait_timeout:
- * @cond                    : pointer to condition variable object 
- * @lock                    : pointer to mutex object 
- * @timeout_us              : timeout (in microseconds)
- *
- * Try to block on a condition variable (i.e. wait on a condition) until
- * @timeout_us elapses.
- *
- * Returns: false (0) if timeout elapses before condition variable is
- * signaled or broadcast, otherwise true (1).
- **/
-bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us);
-
-/**
- * scond_broadcast:
- * @cond                    : pointer to condition variable object 
- *
- * Broadcast a condition. Unblocks all threads currently blocked
- * on the specified condition variable @cond. 
- **/
-int scond_broadcast(scond_t *cond);
-
-/**
- * scond_signal:
- * @cond                    : pointer to condition variable object 
- *
- * Signal a condition. Unblocks at least one of the threads currently blocked
- * on the specified condition variable @cond. 
- **/
-void scond_signal(scond_t *cond);
-
-#ifdef HAVE_THREAD_STORAGE
-/**
- * @brief Creates a thread local storage key
- *
- * This function shall create thread-specific data key visible to all threads in
- * the process. The same key can be used by multiple threads to store
- * thread-local data.
- *
- * When the key is created NULL shall be associated with it in all active
- * threads. Whenever a new thread is spawned the all defined keys will be
- * associated with NULL on that thread.
- *
- * @param tls
- * @return whether the operation suceeded or not
- */
-bool sthread_tls_create(sthread_tls_t *tls);
-
-/**
- * @brief Deletes a thread local storage
- * @param tls
- * @return whether the operation suceeded or not
- */
-bool sthread_tls_delete(sthread_tls_t *tls);
-
-/**
- * @brief Retrieves thread specific data associated with a key
- *
- * There is no way to tell whether this function failed.
- *
- * @param tls
- * @return
- */
-void *sthread_tls_get(sthread_tls_t *tls);
-
-/**
- * @brief Binds thread specific data to a key
- * @param tls
- * @return whether the operation suceeded or not
- */
-bool sthread_tls_set(sthread_tls_t *tls, const void *data);
-#endif
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/string/stdstring.h b/libretro-common/include/string/stdstring.h
deleted file mode 100644
index 845d636..0000000
--- a/libretro-common/include/string/stdstring.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (stdstring.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_STDSTRING_H
-#define __LIBRETRO_SDK_STDSTRING_H
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <string.h>
-#include <boolean.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
-static INLINE bool string_is_empty(const char *data)
-{
-   return (data == NULL) || (*data == '\0');
-}
-
-static INLINE bool string_is_equal(const char *a, const char *b)
-{
-   if (!a || !b)
-      return false;
-   while(*a && (*a == *b))
-      a++, b++;
-   return (*(const unsigned char*)a - *(const unsigned char*)b) == 0;
-}
-
-#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
-#define string_is_equal_fast(a, b, size) (memcmp(a, b, size) == 0)
-
-static INLINE bool string_is_equal_noncase(const char *a, const char *b)
-{
-   int result;
-   const unsigned char *p1 = (const unsigned char*)a;
-   const unsigned char *p2 = (const unsigned char*)b;
-
-   if (!a || !b)
-      return false;
-   if (p1 == p2)
-      return false;
-
-   while ((result = tolower (*p1) - tolower (*p2++)) == 0)
-      if (*p1++ == '\0')
-         break;
-
-   return (result == 0);
-}
-
-char *string_to_upper(char *s);
-
-char *string_to_lower(char *s);
-
-char *string_ucwords(char* s);
-
-char *string_replace_substring(const char *in, const char *pattern,
-      const char *by);
-
-/* Remove leading whitespaces */
-char *string_trim_whitespace_left(char *const s);
-
-/* Remove trailing whitespaces */
-char *string_trim_whitespace_right(char *const s);
-
-/* Remove leading and trailing whitespaces */
-char *string_trim_whitespace(char *const s);
-
-char *word_wrap(char* buffer, const char *string, int line_width);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/utils/md5.h b/libretro-common/include/utils/md5.h
deleted file mode 100644
index 6e84851..0000000
--- a/libretro-common/include/utils/md5.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
- * MD5 Message-Digest Algorithm (RFC 1321).
- *
- * Homepage:
- * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- *
- * Author:
- * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
- *
- * This software was written by Alexander Peslyak in 2001.  No copyright is
- * claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the
- * public domain is deemed null and void, then the software is
- * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See md5.c for more information.
- */
-
-#ifdef HAVE_OPENSSL
-#include <openssl/md5.h>
-#elif !defined(_MD5_H)
-#define _MD5_H
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-
-/* Any 32-bit or wider unsigned integer data type will do */
-typedef unsigned int MD5_u32plus;
-
-typedef struct {
-	MD5_u32plus lo, hi;
-	MD5_u32plus a, b, c, d;
-	unsigned char buffer[64];
-	MD5_u32plus block[16];
-} MD5_CTX;
-
-extern void MD5_Init(MD5_CTX *ctx);
-extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
-extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/libretro-common/include/vulkan/vulkan_symbol_wrapper.h b/libretro-common/include/vulkan/vulkan_symbol_wrapper.h
deleted file mode 100644
index 06f404e..0000000
--- a/libretro-common/include/vulkan/vulkan_symbol_wrapper.h
+++ /dev/null
@@ -1,356 +0,0 @@
-
-/* This header is autogenerated by vulkan_loader_generator.py */
-#ifndef VULKAN_SYMBOL_WRAPPER_H
-#define VULKAN_SYMBOL_WRAPPER_H
-#define VK_NO_PROTOTYPES
-#include <vulkan/vulkan.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern PFN_vkCreateInstance vulkan_symbol_wrapper_vkCreateInstance;
-#define vkCreateInstance vulkan_symbol_wrapper_vkCreateInstance
-extern PFN_vkEnumerateInstanceExtensionProperties vulkan_symbol_wrapper_vkEnumerateInstanceExtensionProperties;
-#define vkEnumerateInstanceExtensionProperties vulkan_symbol_wrapper_vkEnumerateInstanceExtensionProperties
-extern PFN_vkEnumerateInstanceLayerProperties vulkan_symbol_wrapper_vkEnumerateInstanceLayerProperties;
-#define vkEnumerateInstanceLayerProperties vulkan_symbol_wrapper_vkEnumerateInstanceLayerProperties
-extern PFN_vkDestroyInstance vulkan_symbol_wrapper_vkDestroyInstance;
-#define vkDestroyInstance vulkan_symbol_wrapper_vkDestroyInstance
-extern PFN_vkEnumeratePhysicalDevices vulkan_symbol_wrapper_vkEnumeratePhysicalDevices;
-#define vkEnumeratePhysicalDevices vulkan_symbol_wrapper_vkEnumeratePhysicalDevices
-extern PFN_vkGetPhysicalDeviceFeatures vulkan_symbol_wrapper_vkGetPhysicalDeviceFeatures;
-#define vkGetPhysicalDeviceFeatures vulkan_symbol_wrapper_vkGetPhysicalDeviceFeatures
-extern PFN_vkGetPhysicalDeviceFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceFormatProperties;
-#define vkGetPhysicalDeviceFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceFormatProperties
-extern PFN_vkGetPhysicalDeviceImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceImageFormatProperties;
-#define vkGetPhysicalDeviceImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceImageFormatProperties
-extern PFN_vkGetPhysicalDeviceProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceProperties;
-#define vkGetPhysicalDeviceProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceProperties
-extern PFN_vkGetPhysicalDeviceQueueFamilyProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceQueueFamilyProperties;
-#define vkGetPhysicalDeviceQueueFamilyProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceQueueFamilyProperties
-extern PFN_vkGetPhysicalDeviceMemoryProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceMemoryProperties;
-#define vkGetPhysicalDeviceMemoryProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceMemoryProperties
-extern PFN_vkGetDeviceProcAddr vulkan_symbol_wrapper_vkGetDeviceProcAddr;
-#define vkGetDeviceProcAddr vulkan_symbol_wrapper_vkGetDeviceProcAddr
-extern PFN_vkCreateDevice vulkan_symbol_wrapper_vkCreateDevice;
-#define vkCreateDevice vulkan_symbol_wrapper_vkCreateDevice
-extern PFN_vkDestroyDevice vulkan_symbol_wrapper_vkDestroyDevice;
-#define vkDestroyDevice vulkan_symbol_wrapper_vkDestroyDevice
-extern PFN_vkEnumerateDeviceExtensionProperties vulkan_symbol_wrapper_vkEnumerateDeviceExtensionProperties;
-#define vkEnumerateDeviceExtensionProperties vulkan_symbol_wrapper_vkEnumerateDeviceExtensionProperties
-extern PFN_vkEnumerateDeviceLayerProperties vulkan_symbol_wrapper_vkEnumerateDeviceLayerProperties;
-#define vkEnumerateDeviceLayerProperties vulkan_symbol_wrapper_vkEnumerateDeviceLayerProperties
-extern PFN_vkGetDeviceQueue vulkan_symbol_wrapper_vkGetDeviceQueue;
-#define vkGetDeviceQueue vulkan_symbol_wrapper_vkGetDeviceQueue
-extern PFN_vkQueueSubmit vulkan_symbol_wrapper_vkQueueSubmit;
-#define vkQueueSubmit vulkan_symbol_wrapper_vkQueueSubmit
-extern PFN_vkQueueWaitIdle vulkan_symbol_wrapper_vkQueueWaitIdle;
-#define vkQueueWaitIdle vulkan_symbol_wrapper_vkQueueWaitIdle
-extern PFN_vkDeviceWaitIdle vulkan_symbol_wrapper_vkDeviceWaitIdle;
-#define vkDeviceWaitIdle vulkan_symbol_wrapper_vkDeviceWaitIdle
-extern PFN_vkAllocateMemory vulkan_symbol_wrapper_vkAllocateMemory;
-#define vkAllocateMemory vulkan_symbol_wrapper_vkAllocateMemory
-extern PFN_vkFreeMemory vulkan_symbol_wrapper_vkFreeMemory;
-#define vkFreeMemory vulkan_symbol_wrapper_vkFreeMemory
-extern PFN_vkMapMemory vulkan_symbol_wrapper_vkMapMemory;
-#define vkMapMemory vulkan_symbol_wrapper_vkMapMemory
-extern PFN_vkUnmapMemory vulkan_symbol_wrapper_vkUnmapMemory;
-#define vkUnmapMemory vulkan_symbol_wrapper_vkUnmapMemory
-extern PFN_vkFlushMappedMemoryRanges vulkan_symbol_wrapper_vkFlushMappedMemoryRanges;
-#define vkFlushMappedMemoryRanges vulkan_symbol_wrapper_vkFlushMappedMemoryRanges
-extern PFN_vkInvalidateMappedMemoryRanges vulkan_symbol_wrapper_vkInvalidateMappedMemoryRanges;
-#define vkInvalidateMappedMemoryRanges vulkan_symbol_wrapper_vkInvalidateMappedMemoryRanges
-extern PFN_vkGetDeviceMemoryCommitment vulkan_symbol_wrapper_vkGetDeviceMemoryCommitment;
-#define vkGetDeviceMemoryCommitment vulkan_symbol_wrapper_vkGetDeviceMemoryCommitment
-extern PFN_vkBindBufferMemory vulkan_symbol_wrapper_vkBindBufferMemory;
-#define vkBindBufferMemory vulkan_symbol_wrapper_vkBindBufferMemory
-extern PFN_vkBindImageMemory vulkan_symbol_wrapper_vkBindImageMemory;
-#define vkBindImageMemory vulkan_symbol_wrapper_vkBindImageMemory
-extern PFN_vkGetBufferMemoryRequirements vulkan_symbol_wrapper_vkGetBufferMemoryRequirements;
-#define vkGetBufferMemoryRequirements vulkan_symbol_wrapper_vkGetBufferMemoryRequirements
-extern PFN_vkGetImageMemoryRequirements vulkan_symbol_wrapper_vkGetImageMemoryRequirements;
-#define vkGetImageMemoryRequirements vulkan_symbol_wrapper_vkGetImageMemoryRequirements
-extern PFN_vkGetImageSparseMemoryRequirements vulkan_symbol_wrapper_vkGetImageSparseMemoryRequirements;
-#define vkGetImageSparseMemoryRequirements vulkan_symbol_wrapper_vkGetImageSparseMemoryRequirements
-extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceSparseImageFormatProperties;
-#define vkGetPhysicalDeviceSparseImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceSparseImageFormatProperties
-extern PFN_vkQueueBindSparse vulkan_symbol_wrapper_vkQueueBindSparse;
-#define vkQueueBindSparse vulkan_symbol_wrapper_vkQueueBindSparse
-extern PFN_vkCreateFence vulkan_symbol_wrapper_vkCreateFence;
-#define vkCreateFence vulkan_symbol_wrapper_vkCreateFence
-extern PFN_vkDestroyFence vulkan_symbol_wrapper_vkDestroyFence;
-#define vkDestroyFence vulkan_symbol_wrapper_vkDestroyFence
-extern PFN_vkResetFences vulkan_symbol_wrapper_vkResetFences;
-#define vkResetFences vulkan_symbol_wrapper_vkResetFences
-extern PFN_vkGetFenceStatus vulkan_symbol_wrapper_vkGetFenceStatus;
-#define vkGetFenceStatus vulkan_symbol_wrapper_vkGetFenceStatus
-extern PFN_vkWaitForFences vulkan_symbol_wrapper_vkWaitForFences;
-#define vkWaitForFences vulkan_symbol_wrapper_vkWaitForFences
-extern PFN_vkCreateSemaphore vulkan_symbol_wrapper_vkCreateSemaphore;
-#define vkCreateSemaphore vulkan_symbol_wrapper_vkCreateSemaphore
-extern PFN_vkDestroySemaphore vulkan_symbol_wrapper_vkDestroySemaphore;
-#define vkDestroySemaphore vulkan_symbol_wrapper_vkDestroySemaphore
-extern PFN_vkCreateEvent vulkan_symbol_wrapper_vkCreateEvent;
-#define vkCreateEvent vulkan_symbol_wrapper_vkCreateEvent
-extern PFN_vkDestroyEvent vulkan_symbol_wrapper_vkDestroyEvent;
-#define vkDestroyEvent vulkan_symbol_wrapper_vkDestroyEvent
-extern PFN_vkGetEventStatus vulkan_symbol_wrapper_vkGetEventStatus;
-#define vkGetEventStatus vulkan_symbol_wrapper_vkGetEventStatus
-extern PFN_vkSetEvent vulkan_symbol_wrapper_vkSetEvent;
-#define vkSetEvent vulkan_symbol_wrapper_vkSetEvent
-extern PFN_vkResetEvent vulkan_symbol_wrapper_vkResetEvent;
-#define vkResetEvent vulkan_symbol_wrapper_vkResetEvent
-extern PFN_vkCreateQueryPool vulkan_symbol_wrapper_vkCreateQueryPool;
-#define vkCreateQueryPool vulkan_symbol_wrapper_vkCreateQueryPool
-extern PFN_vkDestroyQueryPool vulkan_symbol_wrapper_vkDestroyQueryPool;
-#define vkDestroyQueryPool vulkan_symbol_wrapper_vkDestroyQueryPool
-extern PFN_vkGetQueryPoolResults vulkan_symbol_wrapper_vkGetQueryPoolResults;
-#define vkGetQueryPoolResults vulkan_symbol_wrapper_vkGetQueryPoolResults
-extern PFN_vkCreateBuffer vulkan_symbol_wrapper_vkCreateBuffer;
-#define vkCreateBuffer vulkan_symbol_wrapper_vkCreateBuffer
-extern PFN_vkDestroyBuffer vulkan_symbol_wrapper_vkDestroyBuffer;
-#define vkDestroyBuffer vulkan_symbol_wrapper_vkDestroyBuffer
-extern PFN_vkCreateBufferView vulkan_symbol_wrapper_vkCreateBufferView;
-#define vkCreateBufferView vulkan_symbol_wrapper_vkCreateBufferView
-extern PFN_vkDestroyBufferView vulkan_symbol_wrapper_vkDestroyBufferView;
-#define vkDestroyBufferView vulkan_symbol_wrapper_vkDestroyBufferView
-extern PFN_vkCreateImage vulkan_symbol_wrapper_vkCreateImage;
-#define vkCreateImage vulkan_symbol_wrapper_vkCreateImage
-extern PFN_vkDestroyImage vulkan_symbol_wrapper_vkDestroyImage;
-#define vkDestroyImage vulkan_symbol_wrapper_vkDestroyImage
-extern PFN_vkGetImageSubresourceLayout vulkan_symbol_wrapper_vkGetImageSubresourceLayout;
-#define vkGetImageSubresourceLayout vulkan_symbol_wrapper_vkGetImageSubresourceLayout
-extern PFN_vkCreateImageView vulkan_symbol_wrapper_vkCreateImageView;
-#define vkCreateImageView vulkan_symbol_wrapper_vkCreateImageView
-extern PFN_vkDestroyImageView vulkan_symbol_wrapper_vkDestroyImageView;
-#define vkDestroyImageView vulkan_symbol_wrapper_vkDestroyImageView
-extern PFN_vkCreateShaderModule vulkan_symbol_wrapper_vkCreateShaderModule;
-#define vkCreateShaderModule vulkan_symbol_wrapper_vkCreateShaderModule
-extern PFN_vkDestroyShaderModule vulkan_symbol_wrapper_vkDestroyShaderModule;
-#define vkDestroyShaderModule vulkan_symbol_wrapper_vkDestroyShaderModule
-extern PFN_vkCreatePipelineCache vulkan_symbol_wrapper_vkCreatePipelineCache;
-#define vkCreatePipelineCache vulkan_symbol_wrapper_vkCreatePipelineCache
-extern PFN_vkDestroyPipelineCache vulkan_symbol_wrapper_vkDestroyPipelineCache;
-#define vkDestroyPipelineCache vulkan_symbol_wrapper_vkDestroyPipelineCache
-extern PFN_vkGetPipelineCacheData vulkan_symbol_wrapper_vkGetPipelineCacheData;
-#define vkGetPipelineCacheData vulkan_symbol_wrapper_vkGetPipelineCacheData
-extern PFN_vkMergePipelineCaches vulkan_symbol_wrapper_vkMergePipelineCaches;
-#define vkMergePipelineCaches vulkan_symbol_wrapper_vkMergePipelineCaches
-extern PFN_vkCreateGraphicsPipelines vulkan_symbol_wrapper_vkCreateGraphicsPipelines;
-#define vkCreateGraphicsPipelines vulkan_symbol_wrapper_vkCreateGraphicsPipelines
-extern PFN_vkCreateComputePipelines vulkan_symbol_wrapper_vkCreateComputePipelines;
-#define vkCreateComputePipelines vulkan_symbol_wrapper_vkCreateComputePipelines
-extern PFN_vkDestroyPipeline vulkan_symbol_wrapper_vkDestroyPipeline;
-#define vkDestroyPipeline vulkan_symbol_wrapper_vkDestroyPipeline
-extern PFN_vkCreatePipelineLayout vulkan_symbol_wrapper_vkCreatePipelineLayout;
-#define vkCreatePipelineLayout vulkan_symbol_wrapper_vkCreatePipelineLayout
-extern PFN_vkDestroyPipelineLayout vulkan_symbol_wrapper_vkDestroyPipelineLayout;
-#define vkDestroyPipelineLayout vulkan_symbol_wrapper_vkDestroyPipelineLayout
-extern PFN_vkCreateSampler vulkan_symbol_wrapper_vkCreateSampler;
-#define vkCreateSampler vulkan_symbol_wrapper_vkCreateSampler
-extern PFN_vkDestroySampler vulkan_symbol_wrapper_vkDestroySampler;
-#define vkDestroySampler vulkan_symbol_wrapper_vkDestroySampler
-extern PFN_vkCreateDescriptorSetLayout vulkan_symbol_wrapper_vkCreateDescriptorSetLayout;
-#define vkCreateDescriptorSetLayout vulkan_symbol_wrapper_vkCreateDescriptorSetLayout
-extern PFN_vkDestroyDescriptorSetLayout vulkan_symbol_wrapper_vkDestroyDescriptorSetLayout;
-#define vkDestroyDescriptorSetLayout vulkan_symbol_wrapper_vkDestroyDescriptorSetLayout
-extern PFN_vkCreateDescriptorPool vulkan_symbol_wrapper_vkCreateDescriptorPool;
-#define vkCreateDescriptorPool vulkan_symbol_wrapper_vkCreateDescriptorPool
-extern PFN_vkDestroyDescriptorPool vulkan_symbol_wrapper_vkDestroyDescriptorPool;
-#define vkDestroyDescriptorPool vulkan_symbol_wrapper_vkDestroyDescriptorPool
-extern PFN_vkResetDescriptorPool vulkan_symbol_wrapper_vkResetDescriptorPool;
-#define vkResetDescriptorPool vulkan_symbol_wrapper_vkResetDescriptorPool
-extern PFN_vkAllocateDescriptorSets vulkan_symbol_wrapper_vkAllocateDescriptorSets;
-#define vkAllocateDescriptorSets vulkan_symbol_wrapper_vkAllocateDescriptorSets
-extern PFN_vkFreeDescriptorSets vulkan_symbol_wrapper_vkFreeDescriptorSets;
-#define vkFreeDescriptorSets vulkan_symbol_wrapper_vkFreeDescriptorSets
-extern PFN_vkUpdateDescriptorSets vulkan_symbol_wrapper_vkUpdateDescriptorSets;
-#define vkUpdateDescriptorSets vulkan_symbol_wrapper_vkUpdateDescriptorSets
-extern PFN_vkCreateFramebuffer vulkan_symbol_wrapper_vkCreateFramebuffer;
-#define vkCreateFramebuffer vulkan_symbol_wrapper_vkCreateFramebuffer
-extern PFN_vkDestroyFramebuffer vulkan_symbol_wrapper_vkDestroyFramebuffer;
-#define vkDestroyFramebuffer vulkan_symbol_wrapper_vkDestroyFramebuffer
-extern PFN_vkCreateRenderPass vulkan_symbol_wrapper_vkCreateRenderPass;
-#define vkCreateRenderPass vulkan_symbol_wrapper_vkCreateRenderPass
-extern PFN_vkDestroyRenderPass vulkan_symbol_wrapper_vkDestroyRenderPass;
-#define vkDestroyRenderPass vulkan_symbol_wrapper_vkDestroyRenderPass
-extern PFN_vkGetRenderAreaGranularity vulkan_symbol_wrapper_vkGetRenderAreaGranularity;
-#define vkGetRenderAreaGranularity vulkan_symbol_wrapper_vkGetRenderAreaGranularity
-extern PFN_vkCreateCommandPool vulkan_symbol_wrapper_vkCreateCommandPool;
-#define vkCreateCommandPool vulkan_symbol_wrapper_vkCreateCommandPool
-extern PFN_vkDestroyCommandPool vulkan_symbol_wrapper_vkDestroyCommandPool;
-#define vkDestroyCommandPool vulkan_symbol_wrapper_vkDestroyCommandPool
-extern PFN_vkResetCommandPool vulkan_symbol_wrapper_vkResetCommandPool;
-#define vkResetCommandPool vulkan_symbol_wrapper_vkResetCommandPool
-extern PFN_vkAllocateCommandBuffers vulkan_symbol_wrapper_vkAllocateCommandBuffers;
-#define vkAllocateCommandBuffers vulkan_symbol_wrapper_vkAllocateCommandBuffers
-extern PFN_vkFreeCommandBuffers vulkan_symbol_wrapper_vkFreeCommandBuffers;
-#define vkFreeCommandBuffers vulkan_symbol_wrapper_vkFreeCommandBuffers
-extern PFN_vkBeginCommandBuffer vulkan_symbol_wrapper_vkBeginCommandBuffer;
-#define vkBeginCommandBuffer vulkan_symbol_wrapper_vkBeginCommandBuffer
-extern PFN_vkEndCommandBuffer vulkan_symbol_wrapper_vkEndCommandBuffer;
-#define vkEndCommandBuffer vulkan_symbol_wrapper_vkEndCommandBuffer
-extern PFN_vkResetCommandBuffer vulkan_symbol_wrapper_vkResetCommandBuffer;
-#define vkResetCommandBuffer vulkan_symbol_wrapper_vkResetCommandBuffer
-extern PFN_vkCmdBindPipeline vulkan_symbol_wrapper_vkCmdBindPipeline;
-#define vkCmdBindPipeline vulkan_symbol_wrapper_vkCmdBindPipeline
-extern PFN_vkCmdSetViewport vulkan_symbol_wrapper_vkCmdSetViewport;
-#define vkCmdSetViewport vulkan_symbol_wrapper_vkCmdSetViewport
-extern PFN_vkCmdSetScissor vulkan_symbol_wrapper_vkCmdSetScissor;
-#define vkCmdSetScissor vulkan_symbol_wrapper_vkCmdSetScissor
-extern PFN_vkCmdSetLineWidth vulkan_symbol_wrapper_vkCmdSetLineWidth;
-#define vkCmdSetLineWidth vulkan_symbol_wrapper_vkCmdSetLineWidth
-extern PFN_vkCmdSetDepthBias vulkan_symbol_wrapper_vkCmdSetDepthBias;
-#define vkCmdSetDepthBias vulkan_symbol_wrapper_vkCmdSetDepthBias
-extern PFN_vkCmdSetBlendConstants vulkan_symbol_wrapper_vkCmdSetBlendConstants;
-#define vkCmdSetBlendConstants vulkan_symbol_wrapper_vkCmdSetBlendConstants
-extern PFN_vkCmdSetDepthBounds vulkan_symbol_wrapper_vkCmdSetDepthBounds;
-#define vkCmdSetDepthBounds vulkan_symbol_wrapper_vkCmdSetDepthBounds
-extern PFN_vkCmdSetStencilCompareMask vulkan_symbol_wrapper_vkCmdSetStencilCompareMask;
-#define vkCmdSetStencilCompareMask vulkan_symbol_wrapper_vkCmdSetStencilCompareMask
-extern PFN_vkCmdSetStencilWriteMask vulkan_symbol_wrapper_vkCmdSetStencilWriteMask;
-#define vkCmdSetStencilWriteMask vulkan_symbol_wrapper_vkCmdSetStencilWriteMask
-extern PFN_vkCmdSetStencilReference vulkan_symbol_wrapper_vkCmdSetStencilReference;
-#define vkCmdSetStencilReference vulkan_symbol_wrapper_vkCmdSetStencilReference
-extern PFN_vkCmdBindDescriptorSets vulkan_symbol_wrapper_vkCmdBindDescriptorSets;
-#define vkCmdBindDescriptorSets vulkan_symbol_wrapper_vkCmdBindDescriptorSets
-extern PFN_vkCmdBindIndexBuffer vulkan_symbol_wrapper_vkCmdBindIndexBuffer;
-#define vkCmdBindIndexBuffer vulkan_symbol_wrapper_vkCmdBindIndexBuffer
-extern PFN_vkCmdBindVertexBuffers vulkan_symbol_wrapper_vkCmdBindVertexBuffers;
-#define vkCmdBindVertexBuffers vulkan_symbol_wrapper_vkCmdBindVertexBuffers
-extern PFN_vkCmdDraw vulkan_symbol_wrapper_vkCmdDraw;
-#define vkCmdDraw vulkan_symbol_wrapper_vkCmdDraw
-extern PFN_vkCmdDrawIndexed vulkan_symbol_wrapper_vkCmdDrawIndexed;
-#define vkCmdDrawIndexed vulkan_symbol_wrapper_vkCmdDrawIndexed
-extern PFN_vkCmdDrawIndirect vulkan_symbol_wrapper_vkCmdDrawIndirect;
-#define vkCmdDrawIndirect vulkan_symbol_wrapper_vkCmdDrawIndirect
-extern PFN_vkCmdDrawIndexedIndirect vulkan_symbol_wrapper_vkCmdDrawIndexedIndirect;
-#define vkCmdDrawIndexedIndirect vulkan_symbol_wrapper_vkCmdDrawIndexedIndirect
-extern PFN_vkCmdDispatch vulkan_symbol_wrapper_vkCmdDispatch;
-#define vkCmdDispatch vulkan_symbol_wrapper_vkCmdDispatch
-extern PFN_vkCmdDispatchIndirect vulkan_symbol_wrapper_vkCmdDispatchIndirect;
-#define vkCmdDispatchIndirect vulkan_symbol_wrapper_vkCmdDispatchIndirect
-extern PFN_vkCmdCopyBuffer vulkan_symbol_wrapper_vkCmdCopyBuffer;
-#define vkCmdCopyBuffer vulkan_symbol_wrapper_vkCmdCopyBuffer
-extern PFN_vkCmdCopyImage vulkan_symbol_wrapper_vkCmdCopyImage;
-#define vkCmdCopyImage vulkan_symbol_wrapper_vkCmdCopyImage
-extern PFN_vkCmdBlitImage vulkan_symbol_wrapper_vkCmdBlitImage;
-#define vkCmdBlitImage vulkan_symbol_wrapper_vkCmdBlitImage
-extern PFN_vkCmdCopyBufferToImage vulkan_symbol_wrapper_vkCmdCopyBufferToImage;
-#define vkCmdCopyBufferToImage vulkan_symbol_wrapper_vkCmdCopyBufferToImage
-extern PFN_vkCmdCopyImageToBuffer vulkan_symbol_wrapper_vkCmdCopyImageToBuffer;
-#define vkCmdCopyImageToBuffer vulkan_symbol_wrapper_vkCmdCopyImageToBuffer
-extern PFN_vkCmdUpdateBuffer vulkan_symbol_wrapper_vkCmdUpdateBuffer;
-#define vkCmdUpdateBuffer vulkan_symbol_wrapper_vkCmdUpdateBuffer
-extern PFN_vkCmdFillBuffer vulkan_symbol_wrapper_vkCmdFillBuffer;
-#define vkCmdFillBuffer vulkan_symbol_wrapper_vkCmdFillBuffer
-extern PFN_vkCmdClearColorImage vulkan_symbol_wrapper_vkCmdClearColorImage;
-#define vkCmdClearColorImage vulkan_symbol_wrapper_vkCmdClearColorImage
-extern PFN_vkCmdClearDepthStencilImage vulkan_symbol_wrapper_vkCmdClearDepthStencilImage;
-#define vkCmdClearDepthStencilImage vulkan_symbol_wrapper_vkCmdClearDepthStencilImage
-extern PFN_vkCmdClearAttachments vulkan_symbol_wrapper_vkCmdClearAttachments;
-#define vkCmdClearAttachments vulkan_symbol_wrapper_vkCmdClearAttachments
-extern PFN_vkCmdResolveImage vulkan_symbol_wrapper_vkCmdResolveImage;
-#define vkCmdResolveImage vulkan_symbol_wrapper_vkCmdResolveImage
-extern PFN_vkCmdSetEvent vulkan_symbol_wrapper_vkCmdSetEvent;
-#define vkCmdSetEvent vulkan_symbol_wrapper_vkCmdSetEvent
-extern PFN_vkCmdResetEvent vulkan_symbol_wrapper_vkCmdResetEvent;
-#define vkCmdResetEvent vulkan_symbol_wrapper_vkCmdResetEvent
-extern PFN_vkCmdWaitEvents vulkan_symbol_wrapper_vkCmdWaitEvents;
-#define vkCmdWaitEvents vulkan_symbol_wrapper_vkCmdWaitEvents
-extern PFN_vkCmdPipelineBarrier vulkan_symbol_wrapper_vkCmdPipelineBarrier;
-#define vkCmdPipelineBarrier vulkan_symbol_wrapper_vkCmdPipelineBarrier
-extern PFN_vkCmdBeginQuery vulkan_symbol_wrapper_vkCmdBeginQuery;
-#define vkCmdBeginQuery vulkan_symbol_wrapper_vkCmdBeginQuery
-extern PFN_vkCmdEndQuery vulkan_symbol_wrapper_vkCmdEndQuery;
-#define vkCmdEndQuery vulkan_symbol_wrapper_vkCmdEndQuery
-extern PFN_vkCmdResetQueryPool vulkan_symbol_wrapper_vkCmdResetQueryPool;
-#define vkCmdResetQueryPool vulkan_symbol_wrapper_vkCmdResetQueryPool
-extern PFN_vkCmdWriteTimestamp vulkan_symbol_wrapper_vkCmdWriteTimestamp;
-#define vkCmdWriteTimestamp vulkan_symbol_wrapper_vkCmdWriteTimestamp
-extern PFN_vkCmdCopyQueryPoolResults vulkan_symbol_wrapper_vkCmdCopyQueryPoolResults;
-#define vkCmdCopyQueryPoolResults vulkan_symbol_wrapper_vkCmdCopyQueryPoolResults
-extern PFN_vkCmdPushConstants vulkan_symbol_wrapper_vkCmdPushConstants;
-#define vkCmdPushConstants vulkan_symbol_wrapper_vkCmdPushConstants
-extern PFN_vkCmdBeginRenderPass vulkan_symbol_wrapper_vkCmdBeginRenderPass;
-#define vkCmdBeginRenderPass vulkan_symbol_wrapper_vkCmdBeginRenderPass
-extern PFN_vkCmdNextSubpass vulkan_symbol_wrapper_vkCmdNextSubpass;
-#define vkCmdNextSubpass vulkan_symbol_wrapper_vkCmdNextSubpass
-extern PFN_vkCmdEndRenderPass vulkan_symbol_wrapper_vkCmdEndRenderPass;
-#define vkCmdEndRenderPass vulkan_symbol_wrapper_vkCmdEndRenderPass
-extern PFN_vkCmdExecuteCommands vulkan_symbol_wrapper_vkCmdExecuteCommands;
-#define vkCmdExecuteCommands vulkan_symbol_wrapper_vkCmdExecuteCommands
-extern PFN_vkDestroySurfaceKHR vulkan_symbol_wrapper_vkDestroySurfaceKHR;
-#define vkDestroySurfaceKHR vulkan_symbol_wrapper_vkDestroySurfaceKHR
-extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceSupportKHR;
-#define vkGetPhysicalDeviceSurfaceSupportKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceSupportKHR
-extern PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
-#define vkGetPhysicalDeviceSurfaceCapabilitiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceCapabilitiesKHR
-extern PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceFormatsKHR;
-#define vkGetPhysicalDeviceSurfaceFormatsKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceFormatsKHR
-extern PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfacePresentModesKHR;
-#define vkGetPhysicalDeviceSurfacePresentModesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfacePresentModesKHR
-extern PFN_vkCreateSwapchainKHR vulkan_symbol_wrapper_vkCreateSwapchainKHR;
-#define vkCreateSwapchainKHR vulkan_symbol_wrapper_vkCreateSwapchainKHR
-extern PFN_vkDestroySwapchainKHR vulkan_symbol_wrapper_vkDestroySwapchainKHR;
-#define vkDestroySwapchainKHR vulkan_symbol_wrapper_vkDestroySwapchainKHR
-extern PFN_vkGetSwapchainImagesKHR vulkan_symbol_wrapper_vkGetSwapchainImagesKHR;
-#define vkGetSwapchainImagesKHR vulkan_symbol_wrapper_vkGetSwapchainImagesKHR
-extern PFN_vkAcquireNextImageKHR vulkan_symbol_wrapper_vkAcquireNextImageKHR;
-#define vkAcquireNextImageKHR vulkan_symbol_wrapper_vkAcquireNextImageKHR
-extern PFN_vkQueuePresentKHR vulkan_symbol_wrapper_vkQueuePresentKHR;
-#define vkQueuePresentKHR vulkan_symbol_wrapper_vkQueuePresentKHR
-extern PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPropertiesKHR;
-#define vkGetPhysicalDeviceDisplayPropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPropertiesKHR
-extern PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
-#define vkGetPhysicalDeviceDisplayPlanePropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPlanePropertiesKHR
-extern PFN_vkGetDisplayPlaneSupportedDisplaysKHR vulkan_symbol_wrapper_vkGetDisplayPlaneSupportedDisplaysKHR;
-#define vkGetDisplayPlaneSupportedDisplaysKHR vulkan_symbol_wrapper_vkGetDisplayPlaneSupportedDisplaysKHR
-extern PFN_vkGetDisplayModePropertiesKHR vulkan_symbol_wrapper_vkGetDisplayModePropertiesKHR;
-#define vkGetDisplayModePropertiesKHR vulkan_symbol_wrapper_vkGetDisplayModePropertiesKHR
-extern PFN_vkCreateDisplayModeKHR vulkan_symbol_wrapper_vkCreateDisplayModeKHR;
-#define vkCreateDisplayModeKHR vulkan_symbol_wrapper_vkCreateDisplayModeKHR
-extern PFN_vkGetDisplayPlaneCapabilitiesKHR vulkan_symbol_wrapper_vkGetDisplayPlaneCapabilitiesKHR;
-#define vkGetDisplayPlaneCapabilitiesKHR vulkan_symbol_wrapper_vkGetDisplayPlaneCapabilitiesKHR
-extern PFN_vkCreateDisplayPlaneSurfaceKHR vulkan_symbol_wrapper_vkCreateDisplayPlaneSurfaceKHR;
-#define vkCreateDisplayPlaneSurfaceKHR vulkan_symbol_wrapper_vkCreateDisplayPlaneSurfaceKHR
-extern PFN_vkCreateSharedSwapchainsKHR vulkan_symbol_wrapper_vkCreateSharedSwapchainsKHR;
-#define vkCreateSharedSwapchainsKHR vulkan_symbol_wrapper_vkCreateSharedSwapchainsKHR
-extern PFN_vkCreateDebugReportCallbackEXT vulkan_symbol_wrapper_vkCreateDebugReportCallbackEXT;
-#define vkCreateDebugReportCallbackEXT vulkan_symbol_wrapper_vkCreateDebugReportCallbackEXT
-extern PFN_vkDestroyDebugReportCallbackEXT vulkan_symbol_wrapper_vkDestroyDebugReportCallbackEXT;
-#define vkDestroyDebugReportCallbackEXT vulkan_symbol_wrapper_vkDestroyDebugReportCallbackEXT
-extern PFN_vkDebugReportMessageEXT vulkan_symbol_wrapper_vkDebugReportMessageEXT;
-#define vkDebugReportMessageEXT vulkan_symbol_wrapper_vkDebugReportMessageEXT
-extern PFN_vkDebugMarkerSetObjectTagEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectTagEXT;
-#define vkDebugMarkerSetObjectTagEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectTagEXT
-extern PFN_vkDebugMarkerSetObjectNameEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectNameEXT;
-#define vkDebugMarkerSetObjectNameEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectNameEXT
-extern PFN_vkCmdDebugMarkerBeginEXT vulkan_symbol_wrapper_vkCmdDebugMarkerBeginEXT;
-#define vkCmdDebugMarkerBeginEXT vulkan_symbol_wrapper_vkCmdDebugMarkerBeginEXT
-extern PFN_vkCmdDebugMarkerEndEXT vulkan_symbol_wrapper_vkCmdDebugMarkerEndEXT;
-#define vkCmdDebugMarkerEndEXT vulkan_symbol_wrapper_vkCmdDebugMarkerEndEXT
-extern PFN_vkCmdDebugMarkerInsertEXT vulkan_symbol_wrapper_vkCmdDebugMarkerInsertEXT;
-#define vkCmdDebugMarkerInsertEXT vulkan_symbol_wrapper_vkCmdDebugMarkerInsertEXT
-
-void vulkan_symbol_wrapper_init(PFN_vkGetInstanceProcAddr get_instance_proc_addr);
-PFN_vkGetInstanceProcAddr vulkan_symbol_wrapper_instance_proc_addr(void);
-VkBool32 vulkan_symbol_wrapper_load_global_symbols(void);
-VkBool32 vulkan_symbol_wrapper_load_core_instance_symbols(VkInstance instance);
-VkBool32 vulkan_symbol_wrapper_load_core_symbols(VkInstance instance);
-VkBool32 vulkan_symbol_wrapper_load_core_device_symbols(VkDevice device);
-VkBool32 vulkan_symbol_wrapper_load_instance_symbol(VkInstance instance, const char *name, PFN_vkVoidFunction *ppSymbol);
-VkBool32 vulkan_symbol_wrapper_load_device_symbol(VkDevice device, const char *name, PFN_vkVoidFunction *ppSymbol);
-
-#define VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, name, pfn) vulkan_symbol_wrapper_load_instance_symbol(instance, name, (PFN_vkVoidFunction*) &(pfn))
-#define VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_EXTENSION_SYMBOL(instance, name) vulkan_symbol_wrapper_load_instance_symbol(instance, #name, (PFN_vkVoidFunction*) & name)
-#define VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, name, pfn) vulkan_symbol_wrapper_load_device_symbol(device, name, (PFN_vkVoidFunction*) &(pfn))
-#define VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_EXTENSION_SYMBOL(device, name) vulkan_symbol_wrapper_load_device_symbol(device, #name, (PFN_vkVoidFunction*) & name)
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 55ee9ab..6b4b9d3 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -122,8 +122,6 @@ static retro_log_printf_t log_cb;
 static retro_video_refresh_t video_cb;
 static retro_input_poll_t input_poll_cb;
 static retro_input_state_t input_state_cb;
-static retro_game_read_t retro_game_read_cb;
-static retro_game_seek_t retro_game_seek_cb;
 static retro_environment_t environ_cb;
 static retro_audio_sample_batch_t audio_cb;
 
@@ -1765,8 +1763,6 @@ void retro_set_audio_sample(retro_audio_sample_t cb) { (void)cb; }
 void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audio_cb = cb; }
 void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; }
 void retro_set_input_state(retro_input_state_t cb) { input_state_cb = cb; }
-void retro_set_game_read(retro_game_read_t cb) { retro_game_read_cb = cb; }
-void retro_set_game_seek(retro_game_seek_t cb) { retro_game_seek_cb = cb; }
 
 void retro_get_system_info(struct retro_system_info *info)
 {