Cleanup|Client: Untangled some GL header includes (wrt GL deferring)

skyjake · May 1, 2014 · f52a94c · f52a94c
1 parent 2e9b880
commit f52a94c
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 25 deletions.
diff --git a/doomsday/client/include/gl/sys_opengl.h b/doomsday/client/include/gl/sys_opengl.h
@@ -46,7 +46,7 @@
 
 #if defined(UNIX) && defined(MACOSX)
 #  define GL_GLEXT_PROTOTYPES
-#  include <OpenGL/gl.h>
+#  include <de/graphics/opengl.h>
 #  include <OpenGL/glext.h>
 #  include <OpenGL/OpenGL.h>
 #  define GL_CALL

diff --git a/doomsday/client/include/resource/bitmapfont.h b/doomsday/client/include/resource/bitmapfont.h
@@ -21,7 +21,6 @@
 #define CLIENT_RESOURCE_BITMAPFONT_H
 
 #include "abstractfont.h"
-#include "gl/gl_main.h"
 #include <de/Rectangle>
 #include <de/String>
 #include <de/Vector>
@@ -41,7 +40,7 @@ class BitmapFont : public AbstractFont
     void setFilePath(de::String resourcePath);
 
     /// @return  GL-texture name.
-    GLuint textureGLName() const;
+    uint textureGLName() const;
     de::Vector2i const &textureDimensions() const;
     de::Vector2ui const &textureMargin() const;
 

diff --git a/doomsday/client/include/resource/texturevariantspec.h b/doomsday/client/include/resource/texturevariantspec.h
@@ -25,7 +25,7 @@
 #endif
 
 #include "dd_types.h"
-#include "gl/sys_opengl.h"
+//#include "gl/sys_opengl.h"
 #include <de/String>
 
 typedef enum {
@@ -111,8 +111,8 @@ struct variantspecification_t
     /// Color palette translation.
     int tClass, tMap;
 
-    GLint glMinFilter() const;
-    GLint glMagFilter() const;
+    int glMinFilter() const;
+    int glMagFilter() const;
     int logicalAnisoLevel() const;
 
     variantspecification_t();

diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -54,9 +54,7 @@
 #ifdef __CLIENT__
 #  include "gl/gl_defer.h"
 #  include "gl/gl_texmanager.h"
-#endif
-
-#ifdef __CLIENT__
+#  include "gl/gl_main.h"
 #  include "render/cameralensfx.h"
 #  include "render/r_draw.h" // R_InitViewWindow
 #  include "render/r_main.h" // R_Init, R_ResetViewer

diff --git a/doomsday/client/src/gl/dgl_common.cpp b/doomsday/client/src/gl/dgl_common.cpp
@@ -24,6 +24,9 @@
 #include <cstdlib>
 #include <cmath>
 
+#include <de/GLState>
+#include <de/GLInfo>
+
 #include "de_base.h"
 #include "de_console.h"
 #include "de_graphics.h"
@@ -35,9 +38,6 @@
 #include "api_gl.h"
 #include "gl/gl_texmanager.h"
 
-#include <de/GLState>
-#include <de/GLInfo>
-
 using namespace de;
 
 /**

diff --git a/doomsday/client/src/render/projector.cpp b/doomsday/client/src/render/projector.cpp
@@ -19,7 +19,7 @@
 
 #include "clientapp.h"
 #include "render/projector.h"
-
+#include "render/viewports.h"
 #include "render/r_main.h"
 #include "render/rend_main.h"
 

diff --git a/doomsday/client/src/render/rend_particle.cpp b/doomsday/client/src/render/rend_particle.cpp
@@ -27,6 +27,7 @@
 
 #include "filesys/fs_main.h"
 
+#include "gl/gl_main.h"
 #include "gl/gl_texmanager.h"
 #include "gl/texturecontent.h"
 
@@ -40,6 +41,7 @@
 #include "resource/image.h"
 
 #include "render/r_main.h"
+#include "render/viewports.h"
 #include "render/rend_main.h"
 #include "render/rend_model.h"
 #include "render/vlight.h"

diff --git a/doomsday/client/src/render/sky.cpp b/doomsday/client/src/render/sky.cpp
@@ -26,6 +26,7 @@
 #include "def_data.h"
 #include "client/cl_def.h"
 
+#include "gl/gl_main.h"
 #include "gl/gl_tex.h"
 
 #include "MaterialSnapshot"
@@ -351,8 +352,6 @@ DENG2_PIMPL(Sky)
         }
     }
 
-#ifdef __CLIENT__
-
     void drawModels()
     {
         DENG_ASSERT_IN_MAIN_THREAD();
@@ -409,8 +408,6 @@ DENG2_PIMPL(Sky)
         glPopMatrix();
     }
 
-#endif // __CLIENT__
-
     /// Observes Layer MaterialChange
     void skyLayerMaterialChanged(Layer &layer)
     {
@@ -623,8 +620,6 @@ void Sky::runTick()
     }
 }
 
-#ifdef __CLIENT__
-
 // Look up the precalculated vertex.
 static inline Vector3f &skyVertex(int r, int c)
 {
@@ -974,8 +969,6 @@ void Sky::draw()
     if(usingFog) glDisable(GL_FOG);
 }
 
-#endif // __CLIENT__
-
 static Sky sky;
 Sky *theSky = &sky;
 

diff --git a/doomsday/client/src/resource/bitmapfont.cpp b/doomsday/client/src/resource/bitmapfont.cpp
@@ -22,7 +22,7 @@
 
 #include "dd_main.h" // isDedicated
 #include "filesys/fs_main.h"
-#include "gl/gl_texmanager.h" // GL_NewTextureWithParams
+#include "gl/gl_main.h" // GL_NewTextureWithParams
 #include "sys_system.h" // novideo
 #include "FontManifest"
 #include "uri.hh"
@@ -362,7 +362,7 @@ void BitmapFont::setFilePath(String newFilePath)
     }
 }
 
-GLuint BitmapFont::textureGLName() const
+uint BitmapFont::textureGLName() const
 {
     return d->texGLName;
 }

diff --git a/doomsday/client/src/resource/texturevariant.cpp b/doomsday/client/src/resource/texturevariant.cpp
@@ -93,7 +93,7 @@ bool variantspecification_t::operator == (variantspecification_t const &other) c
     return 1; // Equal.
 }
 
-GLint variantspecification_t::glMinFilter() const
+int variantspecification_t::glMinFilter() const
 {
     if(minFilter >= 0) // Constant logical value.
     {
@@ -103,7 +103,7 @@ GLint variantspecification_t::glMinFilter() const
     return mipmapped? glmode[mipmapping] : GL_LINEAR;
 }
 
-GLint variantspecification_t::glMagFilter() const
+int variantspecification_t::glMagFilter() const
 {
     if(magFilter >= 0) // Constant logical value.
     {