opengl graphics module files now always include OpenGL.h rather than GLee.h

src/modules/graphics/opengl/Graphics.h

@@ -26,7 +26,7 @@
 #include <cmath>
 
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 // LOVE
 #include "graphics/Graphics.h"
@@ -37,7 +37,6 @@
 
 #include "window/Window.h"
 
-#include "OpenGL.h"
 #include "Font.h"
 #include "Image.h"
 #include "Quad.h"

src/modules/graphics/opengl/Image.h

@@ -28,10 +28,8 @@
 #include "image/ImageData.h"
 #include "graphics/Image.h"
 
-#include "OpenGL.h"
-
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 namespace love
 {

src/modules/graphics/opengl/OpenGL.h

@@ -18,8 +18,8 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#ifndef LOVE_COMMON_OPENGL_H
-#define LOVE_COMMON_OPENGL_H
+#ifndef LOVE_GRAPHICS_OPENGL_OPENGL_H
+#define LOVE_GRAPHICS_OPENGL_OPENGL_H
 
 #include "GLee.h"
 

src/modules/graphics/opengl/ParticleSystem.cpp

@@ -22,7 +22,7 @@
 
 #include "common/math.h"
 
-#include "GLee.h"
+#include "OpenGL.h"
 #include <cmath>
 #include <cstdlib>
 

src/modules/graphics/opengl/Quad.cpp

@@ -21,8 +21,8 @@
 #include "Quad.h"
 #include "common/Matrix.h"
 
-// GLee
-#include "GLee.h"
+// OpenGL
+#include "OpenGL.h"
 
 // STD
 #include <cstring> // For memcpy

src/modules/graphics/opengl/ShaderEffect.cpp

@@ -114,7 +114,6 @@ GLuint ShaderEffect::createShader(const ShaderSource &source)
 		shadertypename = "fragment";
 		break;
 	default:
-		// tesselation control and evaluation shaders aren't recognized by current version of GLee
 		throw love::Exception("Cannot create shader object: unknown shader type.");
 		break;
 	}

src/modules/graphics/opengl/SpriteBatch.cpp

@@ -23,6 +23,9 @@
 // STD
 #include <iostream>
 
+// OpenGL
+#include "OpenGL.h"
+
 // LOVE
 #include "Image.h"
 #include "Quad.h"

src/modules/graphics/opengl/SpriteBatch.h

@@ -34,9 +34,6 @@
 #include "graphics/Volatile.h"
 #include "graphics/Color.h"
 
-// OpenGL
-#include "GLee.h"
-
 namespace love
 {
 namespace graphics

src/modules/graphics/opengl/VertexBuffer.h

@@ -26,7 +26,7 @@
 #include "graphics/Volatile.h"
 
 // OpenGL
-#include "GLee.h"
+#include "OpenGL.h"
 
 namespace love
 {

src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -19,7 +19,7 @@
  **/
 
 #include "wrap_Graphics.h"
-#include "GLee.h"
+#include "OpenGL.h"
 #include "graphics/DrawQable.h"
 #include "image/ImageData.h"
 #include "font/Rasterizer.h"