From 2ce73b31b6aa416c7e0678a79d7d999155451a75 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Sun, 26 Dec 2021 13:28:40 +0100 Subject: [PATCH] LibGL: Extract platform types to `glplatform.h` --- Userland/Libraries/LibGL/GL/gl.h | 31 ++---------------- Userland/Libraries/LibGL/GL/glplatform.h | 41 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 Userland/Libraries/LibGL/GL/glplatform.h diff --git a/Userland/Libraries/LibGL/GL/gl.h b/Userland/Libraries/LibGL/GL/gl.h index 7d83a314c8..058391964c 100644 --- a/Userland/Libraries/LibGL/GL/gl.h +++ b/Userland/Libraries/LibGL/GL/gl.h @@ -7,14 +7,12 @@ #pragma once +#include + #ifdef __cplusplus extern "C" { #endif -#ifndef GLAPI -# define GLAPI extern -#endif - #define GL_VERSION_1_0 1 #define GL_VERSION_1_1 1 #define GL_VERSION_1_2 1 @@ -348,31 +346,6 @@ extern "C" { #define GL_MODELVIEW_MATRIX 0x0BA6 #define GL_PROJECTION_MATRIX 0x0BA7 -// -// OpenGL typedefs -// -// Defines types used by all OpenGL applications -// https://www.khronos.org/opengl/wiki/OpenGL_Type -typedef char GLchar; -typedef char GLbyte; -typedef unsigned char GLuchar; -typedef unsigned char GLubyte; -typedef unsigned char GLboolean; -typedef short GLshort; -typedef unsigned short GLushort; -typedef int GLint; -typedef unsigned int GLuint; -typedef int GLfixed; -typedef long long GLint64; -typedef unsigned long long GLuint64; -typedef int GLsizei; -typedef void GLvoid; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef unsigned int GLenum; -typedef unsigned int GLbitfield; - GLAPI void glBegin(GLenum mode); GLAPI void glClear(GLbitfield mask); GLAPI void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); diff --git a/Userland/Libraries/LibGL/GL/glplatform.h b/Userland/Libraries/LibGL/GL/glplatform.h new file mode 100644 index 0000000000..80df593ef8 --- /dev/null +++ b/Userland/Libraries/LibGL/GL/glplatform.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021, Jelle Raaijmakers + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#ifndef GLAPI +# define GLAPI extern +#endif +#define GLAPIENTRY +#define APIENTRY GLAPIENTRY +#ifndef APIENTRYP +# define APIENTRYP APIENTRY* +#endif + +// +// OpenGL typedefs +// +// Defines types used by all OpenGL applications +// https://www.khronos.org/opengl/wiki/OpenGL_Type +typedef char GLchar; +typedef char GLbyte; +typedef unsigned char GLuchar; +typedef unsigned char GLubyte; +typedef unsigned char GLboolean; +typedef short GLshort; +typedef unsigned short GLushort; +typedef int GLint; +typedef unsigned int GLuint; +typedef int GLfixed; +typedef long long GLint64; +typedef unsigned long long GLuint64; +typedef int GLsizei; +typedef void GLvoid; +typedef float GLfloat; +typedef float GLclampf; +typedef double GLdouble; +typedef unsigned int GLenum; +typedef unsigned int GLbitfield;