Merge pull request #1766 from JeffProgrammer/gladdev

Replace Epoxy with Glad

Engine/source/gfx/gl/gfxGLDevice.cpp

@@ -84,6 +84,10 @@ void loadGLExtensions(void *context)
 void STDCALL glDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, 
 	const GLchar *message, const void *userParam)
 {
+    // JTH [11/24/2016]: This is a temporary fix so that we do not get spammed for redundant fbo changes.
+    // This only happens on Intel cards. This should be looked into sometime in the near future.
+    if (dStrStartsWith(message, "API_ID_REDUNDANT_FBO"))
+        return;
     if (severity == GL_DEBUG_SEVERITY_HIGH)
         Con::errorf("OPENGL: %s", message);
     else if (severity == GL_DEBUG_SEVERITY_MEDIUM)
@@ -113,7 +117,8 @@ void GFXGLDevice::initGLState()
    mCardProfiler = new GFXGLCardProfiler();
    mCardProfiler->init(); 
    glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (GLint*)&mMaxShaderTextures);
-   glGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&mMaxFFTextures);
+   // JTH: Needs removed, ffp
+   //glGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&mMaxFFTextures);
    glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, (GLint*)&mMaxTRColors);
    mMaxTRColors = getMin( mMaxTRColors, (U32)(GFXTextureTarget::MaxRenderSlotId-1) );
    
@@ -617,7 +622,7 @@ void GFXGLDevice::setLightMaterialInternal(const GFXLightMaterial mat)
 
 void GFXGLDevice::setGlobalAmbientInternal(ColorF color)
 {
-   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, (GLfloat*)&color);
+   // ONLY NEEDED ON FFP
 }
 
 void GFXGLDevice::setTextureInternal(U32 textureUnit, const GFXTextureObject*texture)
@@ -673,12 +678,12 @@ void GFXGLDevice::setClipRect( const RectI &inRect )
    const F32 right = mClip.point.x + mClip.extent.x;
    const F32 bottom = mClip.extent.y;
    const F32 top = 0.0f;
-   const F32 near = 0.0f;
-   const F32 far = 1.0f;
+   const F32 nearPlane = 0.0f;
+   const F32 farPlane = 1.0f;
    
    const F32 tx = -(right + left)/(right - left);
    const F32 ty = -(top + bottom)/(top - bottom);
-   const F32 tz = -(far + near)/(far - near);
+   const F32 tz = -(farPlane + nearPlane)/(farPlane - nearPlane);
    
    static Point4F pt;
    pt.set(2.0f / (right - left), 0.0f, 0.0f, 0.0f);
@@ -687,7 +692,7 @@ void GFXGLDevice::setClipRect( const RectI &inRect )
    pt.set(0.0f, 2.0f/(top - bottom), 0.0f, 0.0f);
    mProjectionMatrix.setColumn(1, pt);
    
-   pt.set(0.0f, 0.0f, -2.0f/(far - near), 0.0f);
+   pt.set(0.0f, 0.0f, -2.0f/(farPlane - nearPlane), 0.0f);
    mProjectionMatrix.setColumn(2, pt);
    
    pt.set(tx, ty, tz, 1.0f);

Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp

@@ -106,6 +106,10 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
        AssertFatal(0, err );
    }
 
+   // Init GL
+   loadGLCore();
+   loadGLExtensions(tempContext);
+
    //check minimun Opengl 3.2
    int major, minor;
    glGetIntegerv(GL_MAJOR_VERSION, &major);
@@ -114,8 +118,6 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
    {
       return;
    }
-
-   loadGLCore();
     
    GFXAdapter *toAdd = new GFXAdapter;
    toAdd->mIndex = 0;
@@ -163,7 +165,7 @@ void GFXGLDevice::init( const GFXVideoMode &mode, PlatformWindow *window )
     PlatformGL::MakeCurrentGL( sdlWindow, mContext );
         
     loadGLCore();
-    loadGLExtensions(0);
+    loadGLExtensions(mContext);
     
     // It is very important that extensions be loaded before we call initGLState()
     initGLState();

Engine/source/gfx/gl/tGL/tGL.cpp

@@ -33,11 +33,10 @@ namespace GL
 {
    void gglPerformBinds()
    {
-      // JTH: epoxy has one oddity with windows. You need to bind the context
-      // after creating the context to udpate the internals of epoxy.
-#ifdef TORQUE_OS_WIN
-      epoxy_handle_external_wglMakeCurrent();
-#endif
+      if (!gladLoadGL()) 
+      {
+	     AssertFatal(false, "Unable to load GLAD. Make sure your OpenGL drivers are up to date!");
+      }
    }
 
    void gglPerformExtensionBinds(void *context)

Engine/source/gfx/gl/tGL/tGL.h

@@ -23,11 +23,10 @@
 #ifndef T_GL_H
 #define T_GL_H
 
-#include <epoxy/gl.h>
+#include <glad/glad.h>
 
-// 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)
+// JTH: When we use glad, extensions are chached into simple booleans (ints)
+#define gglHasExtension(EXTENSION) GLAD_GL_##EXTENSION
 
 #endif
 

Engine/source/gfx/gl/tGL/tWGL.h

@@ -28,9 +28,9 @@
 #ifdef TORQUE_OPENGL
 
 #include "tGL.h"
-#include <epoxy/wgl.h>
+#include <glad/glad_wgl.h>
 
-#define gglHasWExtension(window, EXTENSION) epoxy_has_wgl_extension(window, "WGL_" # EXTENSION)
+#define gglHasWExtension(window, EXTENSION) GLAD_WGL_##EXTENSION
 
 #endif //TORQUE_OPENGL
 

Engine/source/gfx/gl/tGL/tXGL.h

@@ -28,9 +28,9 @@
 #ifdef TORQUE_OS_LINUX
 
 #include "tGL.h"
-#include <epoxy/glx.h>
+#include <glad/glad_glx.h>
 
-#define gglHasXExtension(display, screen, EXTENSION) epoxy_has_glx_extension(display, screen, "GLX_" # EXTENSION)
+#define gglHasXExtension(display, screen, EXTENSION) GLAD_GLX_##EXTENSION
 
 #endif //TORQUE_OS_LINUX
 

Engine/source/platformSDL/sdlPlatformGL.cpp

@@ -65,11 +65,6 @@ namespace PlatformGL
            Con::printf( err );
            AssertFatal(0, err );
        }
-
-       #ifdef TORQUE_OS_WIN
-		    // JTH: Update the internals of epoxy on windows.
-		    epoxy_handle_external_wglMakeCurrent();
-       #endif
    }
 
    void setVSync(const int i)