Replace glew with glad

This commit is contained in:
Adrian Graber 2021-01-31 13:48:59 +01:00
parent a4df4d8b5d
commit e62a124b8c
20 changed files with 4454 additions and 83 deletions

View File

@ -1,8 +1,6 @@
image: Visual Studio 2017 image: Visual Studio 2017
configuration: Release configuration: Release
environment: environment:
GLEW_BASE: glew-2.1.0
GLEW_URL: https://github.com/nigels-com/glew/releases/download/glew-2.1.0/%GLEW_BASE%-win32.zip
GLFW_BASE: glfw-3.2.1.bin.WIN64 GLFW_BASE: glfw-3.2.1.bin.WIN64
GLFW_URL: https://github.com/glfw/glfw/releases/download/3.2.1/%GLFW_BASE%.zip GLFW_URL: https://github.com/glfw/glfw/releases/download/3.2.1/%GLFW_BASE%.zip
SDL2_BASE: SDL2-devel-2.0.8-VC SDL2_BASE: SDL2-devel-2.0.8-VC
@ -20,8 +18,6 @@ environment:
install: install:
- appveyor DownloadFile %GLFW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%.zip" - appveyor DownloadFile %GLFW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%.zip"
- 7z x "%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%.zip" - 7z x "%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%.zip"
- appveyor DownloadFile %GLEW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE%.zip"
- 7z x "%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE%.zip"
- appveyor DownloadFile %SDL2_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%SDL2_BASE%.zip" - appveyor DownloadFile %SDL2_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%SDL2_BASE%.zip"
- 7z x "%APPVEYOR_BUILD_FOLDER%/%SDL2_BASE%.zip" - 7z x "%APPVEYOR_BUILD_FOLDER%/%SDL2_BASE%.zip"
- appveyor DownloadFile %PREMAKE5_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/premake5.zip" - appveyor DownloadFile %PREMAKE5_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/premake5.zip"
@ -30,7 +26,7 @@ install:
before_build: before_build:
- mkdir "%APPVEYOR_BUILD_FOLDER%/build" - mkdir "%APPVEYOR_BUILD_FOLDER%/build"
- cd "%APPVEYOR_BUILD_FOLDER%" - cd "%APPVEYOR_BUILD_FOLDER%"
- premake5 vs2017 --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir64=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE% --sdl2dir=%APPVEYOR_BUILD_FOLDER%/%SDL2_DIRAME% %PREMAKE5_EXTRA_ARGS% - premake5 vs2017 --glfwdir64=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE% --sdl2dir=%APPVEYOR_BUILD_FOLDER%/%SDL2_DIRAME% %PREMAKE5_EXTRA_ARGS%
build: build:
project: c:\projects\librw\build\librw.sln project: c:\projects\librw\build\librw.sln
verbosity: minimal verbosity: minimal

View File

@ -28,7 +28,6 @@ RUN mkdir -p "$PS2DEV" "$PS2SDK" \
wget \ wget \
zip \ zip \
zlib1g-dev \ zlib1g-dev \
libglew-dev \
libglfw3-dev \ libglfw3-dev \
libsdl2-dev \ libsdl2-dev \
&& git clone -b $TOOLCHAIN_GIT_BRANCH $TOOLCHAIN_GIT_URL /toolchain \ && git clone -b $TOOLCHAIN_GIT_BRANCH $TOOLCHAIN_GIT_URL /toolchain \

View File

@ -10,7 +10,6 @@ if(LIBRW_PLATFORM_GL3)
set(OpenGL_GL_PREFERENCE GLVND) set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
if(LIBRW_GL3_GFXLIB STREQUAL "GLFW") if(LIBRW_GL3_GFXLIB STREQUAL "GLFW")
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
elseif(LIBRW_GL3_GFXLIB STREQUAL "SDL2") elseif(LIBRW_GL3_GFXLIB STREQUAL "SDL2")

View File

@ -54,7 +54,6 @@ class LibrwConan(ConanFile):
def requirements(self): def requirements(self):
if self.options.platform == "gl3": if self.options.platform == "gl3":
self.requires("glew/2.1.0")
if self.options.gl3_gfxlib == "glfw": if self.options.gl3_gfxlib == "glfw":
self.requires("glfw/3.3.2") self.requires("glfw/3.3.2")
elif self.options.gl3_gfxlib == "sdl2": elif self.options.gl3_gfxlib == "sdl2":

View File

@ -1,10 +1,3 @@
newoption {
trigger = "glewdir",
value = "PATH",
description = "Directory of GLEW",
default = "../glew-2.1.0",
}
newoption { newoption {
trigger = "gfxlib", trigger = "gfxlib",
value = "LIBRARY", value = "LIBRARY",
@ -95,8 +88,6 @@ workspace "librw"
system "linux" system "linux"
filter { "platforms:win*gl3" } filter { "platforms:win*gl3" }
defines { "GLEW_STATIC" }
includedirs { path.join(_OPTIONS["glewdir"], "include") }
includedirs { path.join(_OPTIONS["sdl2dir"], "include") } includedirs { path.join(_OPTIONS["sdl2dir"], "include") }
filter { "platforms:win-x86-gl3" } filter { "platforms:win-x86-gl3" }
includedirs { path.join(_OPTIONS["glfwdir32"], "include") } includedirs { path.join(_OPTIONS["glfwdir32"], "include") }
@ -135,23 +126,16 @@ project "dumprwtree"
function findlibs() function findlibs()
filter { "platforms:linux*gl3" } filter { "platforms:linux*gl3" }
links { "GL", "GLEW" } links { "GL" }
if _OPTIONS["gfxlib"] == "glfw" then if _OPTIONS["gfxlib"] == "glfw" then
links { "glfw" } links { "glfw" }
else else
links { "SDL2" } links { "SDL2" }
end end
filter { "platforms:win*gl3", "action:vs*" }
defines { "GLEW_STATIC" }
links { "glew32s" }
filter { "platforms:win*gl3", "action:not vs*" }
links { "glew32" }
filter { "platforms:win-amd64-gl3" } filter { "platforms:win-amd64-gl3" }
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
libdirs { path.join(_OPTIONS["glfwdir64"], "lib-vc2015") } libdirs { path.join(_OPTIONS["glfwdir64"], "lib-vc2015") }
libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x64") } libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x64") }
filter { "platforms:win-x86-gl3" } filter { "platforms:win-x86-gl3" }
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
libdirs { path.join(_OPTIONS["glfwdir32"], "lib-vc2015") } libdirs { path.join(_OPTIONS["glfwdir32"], "lib-vc2015") }
libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x86") } libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x86") }
filter { "platforms:win*gl3" } filter { "platforms:win*gl3" }

View File

@ -78,6 +78,7 @@ add_library(librw
gl/rwgl3shader.h gl/rwgl3shader.h
gl/rwwdgl.h gl/rwwdgl.h
gl/wdgl.cpp gl/wdgl.cpp
gl/glad/glad.c
lodepng/lodepng.h lodepng/lodepng.h
lodepng/lodepng.cpp lodepng/lodepng.cpp
@ -147,12 +148,10 @@ set_target_properties(librw
if(LIBRW_PLATFORM_GL3) if(LIBRW_PLATFORM_GL3)
set(OpenGL_GL_PREFERENCE GLVND) set(OpenGL_GL_PREFERENCE GLVND)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
target_link_libraries(librw target_link_libraries(librw
PUBLIC PUBLIC
OpenGL::GL OpenGL::GL
GLEW::GLEW
) )
if (LIBRW_GL3_GFXLIB STREQUAL "GLFW") if (LIBRW_GL3_GFXLIB STREQUAL "GLFW")
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)

View File

@ -9,9 +9,7 @@
#include "../rwpipeline.h" #include "../rwpipeline.h"
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwengine.h" #include "../rwengine.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"

View File

@ -11,12 +11,7 @@
#include "../rwpipeline.h" #include "../rwpipeline.h"
#include "../rwobjects.h" #include "../rwobjects.h"
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include <GL/glew.h>
#ifdef LIBRW_SDL2
#include <SDL.h>
#else
#include <GLFW/glfw3.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "rwgl3impl.h" #include "rwgl3impl.h"
@ -1541,7 +1536,6 @@ static struct {
static int static int
startSDL2(void) startSDL2(void)
{ {
GLenum status;
SDL_Window *win; SDL_Window *win;
SDL_GLContext ctx; SDL_GLContext ctx;
DisplayMode *mode; DisplayMode *mode;
@ -1576,23 +1570,16 @@ startSDL2(void)
return 0; return 0;
} }
ctx = SDL_GL_CreateContext(win); ctx = SDL_GL_CreateContext(win);
if (!gladLoadGLLoader((GLADloadproc) SDL_GL_GetProcAddress)){
RWERROR((ERR_GENERAL, "gladLoadGLLoader failed"));
SDL_GL_DeleteContext(ctx);
SDL_DestroyWindow(win);
return 0;
}
printf("OpenGL version: %s\n", glGetString(GL_VERSION)); printf("OpenGL version: %s\n", glGetString(GL_VERSION));
/* Init GLEW */
glewExperimental = GL_TRUE;
status = glewInit();
if(status != GLEW_OK){
RWERROR((ERR_GENERAL, glewGetErrorString(status)));
SDL_GL_DeleteContext(ctx);
SDL_DestroyWindow(win);
return 0;
}
if(!GLEW_VERSION_3_3){
RWERROR((ERR_GENERAL, "OpenGL 3.3 needed"));
SDL_GL_DeleteContext(ctx);
SDL_DestroyWindow(win);
return 0;
}
glGlobals.window = win; glGlobals.window = win;
glGlobals.glcontext = ctx; glGlobals.glcontext = ctx;
*glGlobals.pWindow = win; *glGlobals.pWindow = win;
@ -1712,7 +1699,6 @@ static struct {
static int static int
startGLFW(void) startGLFW(void)
{ {
GLenum status;
GLFWwindow *win; GLFWwindow *win;
DisplayMode *mode; DisplayMode *mode;
@ -1746,21 +1732,16 @@ startGLFW(void)
return 0; return 0;
} }
glfwMakeContextCurrent(win); glfwMakeContextCurrent(win);
/* Init GLAD */
if(!gladLoadGLLoader((GLADloadproc) glfwGetProcAddress)) {
RWERROR((ERR_GENERAL, "gladLoadGLLoader failed"));
glfwDestroyWindow(win);
return 0;
}
printf("OpenGL version: %s\n", glGetString(GL_VERSION)); printf("OpenGL version: %s\n", glGetString(GL_VERSION));
/* Init GLEW */
glewExperimental = GL_TRUE;
status = glewInit();
if(status != GLEW_OK){
RWERROR((ERR_GENERAL, glewGetErrorString(status)));
glfwDestroyWindow(win);
return 0;
}
if(!GLEW_VERSION_3_3){
RWERROR((ERR_GENERAL, "OpenGL 3.3 needed"));
glfwDestroyWindow(win);
return 0;
}
glGlobals.window = win; glGlobals.window = win;
*glGlobals.pWindow = win; *glGlobals.pWindow = win;
glGlobals.presentWidth = 0; glGlobals.presentWidth = 0;

View File

@ -11,7 +11,6 @@
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwengine.h" #include "../rwengine.h"
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include <GL/glew.h>
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3impl.h" #include "rwgl3impl.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"

View File

@ -12,9 +12,7 @@
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwanim.h" #include "../rwanim.h"
#include "../rwplugins.h" #include "../rwplugins.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "rwgl3plg.h" #include "rwgl3plg.h"

View File

@ -9,9 +9,7 @@
#include "../rwpipeline.h" #include "../rwpipeline.h"
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwengine.h" #include "../rwengine.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"

View File

@ -9,9 +9,7 @@
#include "../rwpipeline.h" #include "../rwpipeline.h"
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwengine.h" #include "../rwengine.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "rwgl3impl.h" #include "rwgl3impl.h"

View File

@ -10,7 +10,6 @@
#include "../rwpipeline.h" #include "../rwpipeline.h"
#include "../rwobjects.h" #include "../rwobjects.h"
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include <GL/glew.h>
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"

View File

@ -10,7 +10,6 @@
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwengine.h" #include "../rwengine.h"
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include <GL/glew.h>
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"

View File

@ -12,9 +12,7 @@
#include "../rwobjects.h" #include "../rwobjects.h"
#include "../rwanim.h" #include "../rwanim.h"
#include "../rwplugins.h" #include "../rwplugins.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#endif
#include "rwgl3.h" #include "rwgl3.h"
#include "rwgl3shader.h" #include "rwgl3shader.h"
#include "rwgl3plg.h" #include "rwgl3plg.h"

1490
src/gl/glad/glad.c Normal file

File diff suppressed because it is too large Load Diff

2647
src/gl/glad/glad.h Normal file

File diff suppressed because it is too large Load Diff

290
src/gl/glad/khrplatform.h Normal file
View File

@ -0,0 +1,290 @@
#ifndef __khrplatform_h_
#define __khrplatform_h_
/*
** Copyright (c) 2008-2018 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
** "Materials"), to deal in the Materials without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Materials, and to
** permit persons to whom the Materials are 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 Materials.
**
** THE MATERIALS ARE 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
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
/* Khronos platform-specific types and definitions.
*
* The master copy of khrplatform.h is maintained in the Khronos EGL
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
* The last semantic modification to khrplatform.h was at commit ID:
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file.
* Please submit changes by filing pull requests or issues on
* the EGL Registry repository linked above.
*
*
* See the Implementer's Guidelines for information about where this file
* should be located on your system and for more details of its use:
* http://www.khronos.org/registry/implementers_guide.pdf
*
* This file should be included as
* #include <KHR/khrplatform.h>
* by Khronos client API header files that use its types and defines.
*
* The types in khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
* khronos_uint16_t unsigned 16 bit
* khronos_int32_t signed 32 bit
* khronos_uint32_t unsigned 32 bit
* khronos_int64_t signed 64 bit
* khronos_uint64_t unsigned 64 bit
* khronos_intptr_t signed same number of bits as a pointer
* khronos_uintptr_t unsigned same number of bits as a pointer
* khronos_ssize_t signed size
* khronos_usize_t unsigned size
* khronos_float_t signed 32 bit floating point
* khronos_time_ns_t unsigned 64 bit time in nanoseconds
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
* nanoseconds
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
* khronos_boolean_enum_t enumerated boolean type. This should
* only be used as a base type when a client API's boolean type is
* an enum. Client APIs which use an integer or other type for
* booleans cannot use this as the base type for their boolean.
*
* Tokens defined in khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* Calling convention macros defined in this file:
* KHRONOS_APICALL
* KHRONOS_APIENTRY
* KHRONOS_APIATTRIBUTES
*
* These may be used in function prototypes as:
*
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
* int arg1,
* int arg2) KHRONOS_APIATTRIBUTES;
*/
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
# define KHRONOS_STATIC 1
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL
*-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype.
*/
#if defined(KHRONOS_STATIC)
/* If the preprocessor constant KHRONOS_STATIC is defined, make the
* header compatible with static linking. */
# define KHRONOS_APICALL
#elif defined(_WIN32)
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
#elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else
# define KHRONOS_APICALL
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIENTRY
*-------------------------------------------------------------------------
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
# define KHRONOS_APIENTRY
#endif
/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIATTRIBUTES
*-------------------------------------------------------------------------
* This follows the closing parenthesis of the function prototype arguments.
*/
#if defined (__ARMCC_2__)
#define KHRONOS_APIATTRIBUTES __softfp
#else
#define KHRONOS_APIATTRIBUTES
#endif
/*-------------------------------------------------------------------------
* basic type definitions
*-----------------------------------------------------------------------*/
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
/*
* Using <stdint.h>
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__VMS ) || defined(__sgi)
/*
* Using <inttypes.h>
*/
#include <inttypes.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
/*
* Win32
*/
typedef __int32 khronos_int32_t;
typedef unsigned __int32 khronos_uint32_t;
typedef __int64 khronos_int64_t;
typedef unsigned __int64 khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif defined(__sun__) || defined(__digital__)
/*
* Sun or Digital
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#if defined(__arch64__) || defined(_LP64)
typedef long int khronos_int64_t;
typedef unsigned long int khronos_uint64_t;
#else
typedef long long int khronos_int64_t;
typedef unsigned long long int khronos_uint64_t;
#endif /* __arch64__ */
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#elif 0
/*
* Hypothetical platform with no float or int64 support
*/
typedef int khronos_int32_t;
typedef unsigned int khronos_uint32_t;
#define KHRONOS_SUPPORT_INT64 0
#define KHRONOS_SUPPORT_FLOAT 0
#else
/*
* Generic fallback
*/
#include <stdint.h>
typedef int32_t khronos_int32_t;
typedef uint32_t khronos_uint32_t;
typedef int64_t khronos_int64_t;
typedef uint64_t khronos_uint64_t;
#define KHRONOS_SUPPORT_INT64 1
#define KHRONOS_SUPPORT_FLOAT 1
#endif
/*
* Types that are (so far) the same on all platforms
*/
typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;
/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef _WIN64
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t;
typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t;
#endif
#if KHRONOS_SUPPORT_FLOAT
/*
* Float type
*/
typedef float khronos_float_t;
#endif
#if KHRONOS_SUPPORT_INT64
/* Time types
*
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned.
*/
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
typedef khronos_int64_t khronos_stime_nanoseconds_t;
#endif
/*
* Dummy value used to pad enum types to 32 bits.
*/
#ifndef KHRONOS_MAX_ENUM
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
#endif
/*
* Enumerated boolean type
*
* Values other than zero should be considered to be true. Therefore
* comparisons should not be made against KHRONOS_TRUE.
*/
typedef enum {
KHRONOS_FALSE = 0,
KHRONOS_TRUE = 1,
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
} khronos_boolean_enum_t;
#endif /* __khrplatform_h_ */

View File

@ -1,5 +1,5 @@
#ifdef RW_GL3 #ifdef RW_GL3
#include <GL/glew.h> #include "glad/glad.h"
#ifdef LIBRW_SDL2 #ifdef LIBRW_SDL2
#include <SDL.h> #include <SDL.h>
#else #else

View File

@ -14,7 +14,7 @@
#include "rwwdgl.h" #include "rwwdgl.h"
#ifdef RW_OPENGL #ifdef RW_OPENGL
#include <GL/glew.h> #include "glad/glad.h"
#endif #endif
#define PLUGIN_ID 2 #define PLUGIN_ID 2