random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2026-07-23 07:17:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace glew with glad

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/gl/gl3device.cpp
+17 -36
View File
@@ -11,12 +11,7 @@
#include "../rwpipeline.h"
#include "../rwobjects.h"
#ifdef RW_OPENGL
#include <GL/glew.h>
#ifdef LIBRW_SDL2
#include <SDL.h>
#else
#include <GLFW/glfw3.h>
#endif
#include "rwgl3.h"
#include "rwgl3shader.h"
#include "rwgl3impl.h"
@@ -1541,7 +1536,6 @@ static struct {
static int
startSDL2(void)
{
GLenum status;
SDL_Window *win;
SDL_GLContext ctx;
DisplayMode *mode;
@@ -1576,23 +1570,16 @@ startSDL2(void)
return 0;
}
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));
/* 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.glcontext = ctx;
*glGlobals.pWindow = win;
@@ -1712,7 +1699,6 @@ static struct {
static int
startGLFW(void)
{
GLenum status;
GLFWwindow *win;
DisplayMode *mode;
@@ -1746,21 +1732,16 @@ startGLFW(void)
return 0;
}
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));
/* 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.pWindow = win;
glGlobals.presentWidth = 0;