Merge commit '950525a37032877e080ee0f4455c0c4cda550d45'

This commit is contained in:
twinaphex 2018-06-17 20:11:37 +02:00
commit 76db13fda4
3 changed files with 654 additions and 8 deletions

File diff suppressed because it is too large Load Diff

View File

@ -107,6 +107,13 @@ 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)

View File

@ -33,6 +33,18 @@ RETRO_BEGIN_DECLS
#define glTexCoord2f rglTexCoord2f
/* more forward-compatible GL subset symbols */
#define glGetInteger64v rglGetInteger64v
#define glGenSamplers rglGenSamplers
#define glBindSampler rglBindSampler
#define glSamplerParameteri rglSamplerParameteri
#define glGetBufferSubData rglGetBufferSubData
#define glUniform2uiv rglUniform2uiv
#define glTextureView rglTextureView
#define glGetQueryObjectuiv rglGetQueryObjectuiv
#define glGenQueries rglGenQueries
#define glDeleteQueries rglDeleteQueries
#define glBeginQuery rglBeginQuery
#define glEndQuery rglEndQuery
#define glBlitFramebuffer rglBlitFramebuffer
#define glVertexAttrib4f rglVertexAttrib4f
#define glVertexAttrib4fv rglVertexAttrib4fv
@ -135,13 +147,14 @@ RETRO_BEGIN_DECLS
#define glUniformBlockBinding rglUniformBlockBinding
#define glGetUniformBlockIndex rglGetUniformBlockIndex
#define glGetActiveUniformBlockiv rglGetActiveUniformBlockiv
#define glBindBufferBase rglBindBufferBase
#define glBindBufferBase rglBindBufferBase
#define glGetUniformIndices rglGetUniformIndices
#define glGetActiveUniformsiv rglGetActiveUniformsiv
#define glGetError rglGetError
#define glClear rglClear
#define glPolygonMode rglPolygonMode
#define glLineWidth rglLineWidth
#define glTexImage3D rglTexImage3D
#define glTexImage2DMultisample rglTexImage2DMultisample
#define glTexStorage2DMultisample rglTexStorage2DMultisample
#define glMemoryBarrier rglMemoryBarrier
@ -329,6 +342,27 @@ void rglVertexAttrib4f(GLuint name, GLfloat x, GLfloat y,
void rglVertexAttrib4fv(GLuint name, GLfloat* v);
void rglDeleteProgram(GLuint program);
void rglDeleteBuffers(GLsizei n, const GLuint *buffers);
void rglUniform2uiv( GLint location,
GLsizei count,
const GLuint *value);
void rglTextureView( GLuint texture,
GLenum target,
GLuint origtexture,
GLenum internalformat,
GLuint minlevel,
GLuint numlevels,
GLuint minlayer,
GLuint numlayers);
void rglGenQueries( GLsizei n,
GLuint * ids);
void rglDeleteQueries( GLsizei n,
const GLuint * ids);
void rglBeginQuery( GLenum target,
GLuint id);
void rglEndQuery( GLenum target);
void rglGetQueryObjectuiv( GLuint id,
GLenum pname,
GLuint * params);
void rglBlitFramebuffer(
GLint srcX0, GLint srcY0,
GLint srcX1, GLint srcY1,
@ -383,6 +417,16 @@ GLenum rglGetError(void);
void rglClear(GLbitfield mask);
void rglPolygonMode(GLenum face, GLenum mode);
void rglLineWidth(GLfloat width);
void rglTexImage3D( GLenum target,
GLint level,
GLint internalFormat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border,
GLenum format,
GLenum type,
const GLvoid * data);
void rglTexImage2DMultisample( GLenum target,
GLsizei samples,
GLenum internalformat,
@ -408,6 +452,19 @@ 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);
void rglGetBufferSubData( GLenum target,
GLintptr offset,
GLsizeiptr size,
GLvoid * data);
void rglSamplerParameteri( GLuint sampler,
GLenum pname,
GLint param);
void rglBindSampler( GLuint unit,
GLuint sampler);
void rglGenSamplers( GLsizei n,
GLuint *samplers);
void rglGetInteger64v( GLenum pname,
GLint64 * data);
RETRO_END_DECLS