From 4cf6a30e058d28643cf2d3472bcd067a56161c05 Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Fri, 25 Mar 2016 13:44:22 -0400 Subject: [PATCH] cleanup --- Engine/source/gfx/gl/tGL/tGL.h | 13 +++++-------- Engine/source/gfx/gl/tGL/tXGL.h | 5 +++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Engine/source/gfx/gl/tGL/tGL.h b/Engine/source/gfx/gl/tGL/tGL.h index bb21422b7..8a0731ae5 100644 --- a/Engine/source/gfx/gl/tGL/tGL.h +++ b/Engine/source/gfx/gl/tGL/tGL.h @@ -22,15 +22,12 @@ #ifndef T_GL_H #define T_GL_H -#include "GL/glew.h" -#if defined (TORQUE_OS_WIN) -// This doesn't work on Mesa drivers. -#define gglHasExtension(EXTENSION) GLEW_##EXTENSION -#else -// Slower but reliably detects extensions on Mesa. -#define gglHasExtension(EXTENSION) glewGetExtension("GL_" # EXTENSION) -#endif +#include + +// JTH: This is slow, we should probably check extensions once and cache them +// directly inside of some compatability table. +#define gglHasExtension(EXTENSION) epoxy_has_gl_extension("GL_" #EXTENSION) #endif diff --git a/Engine/source/gfx/gl/tGL/tXGL.h b/Engine/source/gfx/gl/tGL/tXGL.h index 0cf2df966..370d59d0d 100644 --- a/Engine/source/gfx/gl/tGL/tXGL.h +++ b/Engine/source/gfx/gl/tGL/tXGL.h @@ -28,9 +28,10 @@ #ifdef TORQUE_OS_LINUX #include "tGL.h" -#include "GL/glxew.h" +#include -#define gglHasXExtension(EXTENSION) GLXEW##EXTENSION +// TODO glx +#define gglHasXExtension(EXTENSION) #endif //TORQUE_OS_LINUX