mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 13:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] opengl: remove glu dependency

Browse source 
We only use gluOrtho2D, which is trivially replaced with glOrtho, and
gluErrorString which can be replaced with a small lookup table.
This commit is contained in:
Quantum 2021-02-18 21:40:05 -05:00 committed by Geoffrey McRae
parent ec921d7f39
commit 2973319bff
2 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/renderers/OpenGL/CMakeLists.txt
View file

@ -4,7 +4,6 @@ project(renderer_Opengl LANGUAGES C)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(RENDERER_OPENGL_PKGCONFIG REQUIRED pkg_check_modules(RENDERER_OPENGL_PKGCONFIG REQUIRED
gl gl
glu
) )
add_library(renderer_OpenGL STATIC add_library(renderer_OpenGL STATIC

40
client/renderers/OpenGL/opengl.c
View file

@ -27,7 +27,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <SDL2/SDL_ttf.h> #include <SDL2/SDL_ttf.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glx.h> #include <GL/glx.h>
#include "common/debug.h" #include "common/debug.h"
@ -319,7 +318,7 @@ void opengl_on_resize(void * opaque, const int width, const int height,
glViewport(0, 0, this->window.x, this->window.y); glViewport(0, 0, this->window.x, this->window.y);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
gluOrtho2D(0, this->window.x, this->window.y, 0); glOrtho(0, this->window.x, this->window.y, 0, -1, 1);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
@ -842,7 +841,40 @@ static bool _check_gl_error(unsigned int line, const char * name)
if (error == GL_NO_ERROR) if (error == GL_NO_ERROR)
return false; return false;
const GLubyte * errStr = gluErrorString(error); const char * errStr;
switch (error)
{
case GL_INVALID_ENUM:
errStr = "GL_INVALID_ENUM";
break;
case GL_INVALID_VALUE:
errStr = "GL_INVALID_VALUE";
break;
case GL_INVALID_OPERATION:
errStr = "GL_INVALID_OPERATION";
break;
case GL_STACK_OVERFLOW:
errStr = "GL_STACK_OVERFLOW";
break;
case GL_STACK_UNDERFLOW:
errStr = "GL_STACK_UNDERFLOW";
break;
case GL_OUT_OF_MEMORY:
errStr = "GL_OUT_OF_MEMORY";
break;
case GL_TABLE_TOO_LARGE:
errStr = "GL_TABLE_TOO_LARGE";
break;
default:
errStr = "unknown error";
}
DEBUG_ERROR("%d: %s = %d (%s)", line, name, error, errStr); DEBUG_ERROR("%d: %s = %d (%s)", line, name, error, errStr);
return true; return true;
} }
@ -1270,7 +1302,7 @@ static bool draw_frame(struct Inst * this)
break; break;
case GL_WAIT_FAILED: case GL_WAIT_FAILED:
DEBUG_ERROR("Wait failed %s", gluErrorString(glGetError())); DEBUG_ERROR("Wait failed %d", glGetError());
break; break;
} }