mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-08-24 15:53:45 +02:00
67 lines
1.6 KiB
Diff
67 lines
1.6 KiB
Diff
# Makes the Khronos OpenGL headers use the OpenGL types defined by PortableGL to avoid type conflicts when both the Khronos OpenGL headers and the PortableGL headers are being used.
|
|
|
|
--- a/api/GLES3/gl3.h
|
|
+++ b/api/GLES3/gl3.h
|
|
@@ -1,6 +1,6 @@
|
|
#ifndef __gles2_gl3_h_
|
|
#define __gles2_gl3_h_ 1
|
|
-
|
|
+#include <portablegl.h>
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
@@ -40,26 +40,26 @@ extern "C" {
|
|
#ifndef GL_ES_VERSION_2_0
|
|
#define GL_ES_VERSION_2_0 1
|
|
#include <KHR/khrplatform.h>
|
|
-typedef khronos_int8_t GLbyte;
|
|
-typedef khronos_float_t GLclampf;
|
|
-typedef khronos_int32_t GLfixed;
|
|
-typedef khronos_int16_t GLshort;
|
|
-typedef khronos_uint16_t GLushort;
|
|
-typedef void GLvoid;
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
typedef struct __GLsync *GLsync;
|
|
-typedef khronos_int64_t GLint64;
|
|
-typedef khronos_uint64_t GLuint64;
|
|
-typedef unsigned int GLenum;
|
|
-typedef unsigned int GLuint;
|
|
-typedef char GLchar;
|
|
-typedef khronos_float_t GLfloat;
|
|
-typedef khronos_ssize_t GLsizeiptr;
|
|
-typedef khronos_intptr_t GLintptr;
|
|
-typedef unsigned int GLbitfield;
|
|
-typedef int GLint;
|
|
-typedef unsigned char GLboolean;
|
|
-typedef int GLsizei;
|
|
-typedef khronos_uint8_t GLubyte;
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
+
|
|
#define GL_DEPTH_BUFFER_BIT 0x00000100
|
|
#define GL_STENCIL_BUFFER_BIT 0x00000400
|
|
#define GL_COLOR_BUFFER_BIT 0x00004000
|
|
@@ -651,7 +651,7 @@ GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei
|
|
|
|
#ifndef GL_ES_VERSION_3_0
|
|
#define GL_ES_VERSION_3_0 1
|
|
-typedef khronos_uint16_t GLhalf;
|
|
+
|
|
#define GL_READ_BUFFER 0x0C02
|
|
#define GL_UNPACK_ROW_LENGTH 0x0CF2
|
|
#define GL_UNPACK_SKIP_ROWS 0x0CF3
|