From c81d54bd4654b4db80bb54f860e2bb97e6fa6bb8 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 20 Dec 2016 00:39:45 +0100 Subject: [PATCH] (libretro-common) Cleanups --- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- libretro-common/glsym/glgen.py | 7 ----- libretro-common/glsym/glsym_es2.c | 4 --- libretro-common/include/glsym/glsym_es2.h | 32 ----------------------- 5 files changed, 2 insertions(+), 45 deletions(-) diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index cc207e32c8..875c32fd39 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit cc207e32c8668bfe5a5cc514394e7df8f020ecf6 +Subproject commit 875c32fd39a06f624814effe5eab691b078429f5 diff --git a/deps/glslang/glslang b/deps/glslang/glslang index ec2e27adf8..be8462149a 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit ec2e27adf86a911c5af6c676a539166b5674a09d +Subproject commit be8462149a3c150fc89db84e57ef06de3ab90d47 diff --git a/libretro-common/glsym/glgen.py b/libretro-common/glsym/glgen.py index 898dcb3a10..3e2c810c05 100755 --- a/libretro-common/glsym/glgen.py +++ b/libretro-common/glsym/glgen.py @@ -107,13 +107,6 @@ if __name__ == '__main__': f.write('typedef GLint GLfixed;\n') f.write('#endif\n') - f.write('#if defined(OSX) && !defined(MAC_OS_X_VERSION_10_7)\n') - f.write('typedef long long int GLint64;\n') - f.write('typedef unsigned long long int GLuint64;\n') - f.write('typedef unsigned long long int GLuint64EXT;\n') - f.write('typedef struct __GLsync *GLsync;\n') - f.write('#endif\n') - dump(f, typedefs) dump(f, overrides) dump(f, externs) diff --git a/libretro-common/glsym/glsym_es2.c b/libretro-common/glsym/glsym_es2.c index b247b8f372..851554994d 100644 --- a/libretro-common/glsym/glsym_es2.c +++ b/libretro-common/glsym/glsym_es2.c @@ -100,8 +100,6 @@ const struct rglgen_sym_map rglgen_symbol_map[] = { SYM(GetQueryivEXT), SYM(GetQueryObjectivEXT), SYM(GetQueryObjectuivEXT), - SYM(GetQueryObjecti64vEXT), - SYM(GetQueryObjectui64vEXT), SYM(DrawBuffersEXT), SYM(EnableiEXT), SYM(DisableiEXT), @@ -306,8 +304,6 @@ RGLSYMGLQUERYCOUNTEREXTPROC __rglgen_glQueryCounterEXT; RGLSYMGLGETQUERYIVEXTPROC __rglgen_glGetQueryivEXT; RGLSYMGLGETQUERYOBJECTIVEXTPROC __rglgen_glGetQueryObjectivEXT; RGLSYMGLGETQUERYOBJECTUIVEXTPROC __rglgen_glGetQueryObjectuivEXT; -RGLSYMGLGETQUERYOBJECTI64VEXTPROC __rglgen_glGetQueryObjecti64vEXT; -RGLSYMGLGETQUERYOBJECTUI64VEXTPROC __rglgen_glGetQueryObjectui64vEXT; RGLSYMGLDRAWBUFFERSEXTPROC __rglgen_glDrawBuffersEXT; RGLSYMGLENABLEIEXTPROC __rglgen_glEnableiEXT; RGLSYMGLDISABLEIEXTPROC __rglgen_glDisableiEXT; diff --git a/libretro-common/include/glsym/glsym_es2.h b/libretro-common/include/glsym/glsym_es2.h index 08aedbdbdc..666d84dd29 100644 --- a/libretro-common/include/glsym/glsym_es2.h +++ b/libretro-common/include/glsym/glsym_es2.h @@ -23,32 +23,6 @@ typedef void *GLeglImageOES; typedef GLint GLfixed; #endif -#if (__STDC_VERSION__ <= 199409L) || (OSX && !MAC_OS_X_VERSION_10_7) -#ifndef GLint64 -typedef long long int GLint64; -#endif - -#ifndef GLuint64 -typedef unsigned long long int GLuint64; -#endif - -#ifndef GLuint64EXT -typedef unsigned long long int GLuint64EXT; -#endif - -typedef struct __GLsync *GLsync; -#else - -#ifndef GLint64 -typedef int64_t GLint64; -#endif - -#ifndef GLuint64 -typedef uint64_t GLuint64; -#endif - -#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); @@ -147,8 +121,6 @@ typedef void (GL_APIENTRYP RGLSYMGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum targe 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); @@ -352,8 +324,6 @@ typedef void (GL_APIENTRYP RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC #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 @@ -557,8 +527,6 @@ 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;