gl_common,glx_common: IWYU

Author: MartinPulec

src/gl_context.c

@@ -35,25 +35,21 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif
+#include "gl_context.h"
 
-#include <stdio.h>
+#include <stdio.h>         // for NULL, fprintf, stderr
+#include <stdlib.h>        // for free, atoi
+#include <string.h>        // for strtok_r
 
 #ifdef __APPLE__
 #include "mac_gl_common.h"
 #elif defined __linux__
-#include "x11_common.h"
 #include "glx_common.h"
 #else // _WIN32
 #include "win32_gl_common.h"
 #endif
 
 #include "debug.h"
-#include "gl_context.h"
 #include "utils/macros.h"
 
 /**
@@ -72,14 +68,14 @@ bool init_gl_context(struct gl_context *context, int which) {
         if(which == GL_CONTEXT_ANY) {
                 debug_msg("Trying OpenGL 3.1 first.\n");
                 context->context = glx_init(MK_OPENGL_VERSION(3,1));
-                context->legacy = FALSE;
+                context->legacy = false;
         }
         if(!context->context) {
                 if(which != GL_CONTEXT_LEGACY) {
                         debug_msg("OpenGL 3.1 profile failed to initialize, falling back to legacy profile.\n");
                 }
                 context->context = glx_init(OPENGL_VERSION_UNSPECIFIED);
-                context->legacy = TRUE;
+                context->legacy = true;
         }
         if(context->context) {
                 glx_validate(context->context);
@@ -92,14 +88,14 @@ bool init_gl_context(struct gl_context *context, int which) {
                         if(!context->context) {
                                 debug_msg("OpenGL 3.2 Core profile failed to initialize, falling back to legacy profile.\n");
                         } else {
-                                context->legacy = FALSE;
+                                context->legacy = false;
                         }
                 }
         }
 
         if(!context->context) {
                 context->context = mac_gl_init(MAC_GL_PROFILE_LEGACY);
-                context->legacy = TRUE;
+                context->legacy = true;
         }
 #else // _WIN32
         if(which == GL_CONTEXT_ANY) {
@@ -108,7 +104,7 @@ bool init_gl_context(struct gl_context *context, int which) {
                 context->context = win32_context_init(OPENGL_VERSION_LEGACY);
         }
 
-        context->legacy = TRUE;
+        context->legacy = true;
 #endif
 
         {

src/gl_context.h

@@ -48,6 +48,15 @@
 #include <Availability.h>
 #endif
 
+#ifdef __cplusplus
+#include <cstdio>     // for fprintf, stderr
+#include <cstdlib>    // for abort
+#else
+#include <stdbool.h>
+#include <stdio.h>    // for fprintf, stderr
+#include <stdlib.h>   // for abort
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus

src/glx_common.c

@@ -35,18 +35,21 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#endif
-#include "debug.h"
+#include "glx_common.h"
 
 #include <GL/glew.h>
+#include <GL/glx.h>
+#include <X11/X.h>       // for None, AllocNone, CWBorderPixel, CWColormap
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <GL/glx.h>
+#include <assert.h>
+#include <stdbool.h>     // for false, true
+#include <stdio.h>       // for fprintf, stderr
+#include <stdlib.h>
+#include <string.h>
+
+#include "debug.h"
 #include "x11_common.h"
-#include "glx_common.h"
 
 #ifdef HAVE_GPUPERFAPI
 #include "GPUPerfAPI.h"
@@ -134,7 +137,7 @@ static int isExtensionSupported(const char *extList, const char *extension)
   /* Extension names should not have spaces. */
   where = strchr(extension, ' ');
   if ( where || *extension == '\0' )
-    return FALSE;
+    return false;
 
   /* It takes a bit of care to be fool-proof about parsing the
      OpenGL extensions string. Don't be fooled by sub-strings,
@@ -149,20 +152,20 @@ static int isExtensionSupported(const char *extList, const char *extension)
 
     if ( where == start || *(where - 1) == ' ' )
       if ( *terminator == ' ' || *terminator == '\0' )
-        return TRUE;
+        return true;
 
     start = terminator;
   }
 
-  return FALSE;
+  return false;
 }
 
-static int ctxErrorOccurred = FALSE;
+static int ctxErrorOccurred = false;
 static int ctxErrorHandler( Display *dpy, XErrorEvent *ev )
 {
         UNUSED(dpy);
         UNUSED(ev);
-    ctxErrorOccurred = TRUE;
+    ctxErrorOccurred = true;
     return 0;
 }
 
@@ -322,7 +325,7 @@ void *glx_init(glx_opengl_version_t version)
   // Note this error handler is global.  All display connections in all threads
   // of a process use the same error handler, so be sure to guard against other
   // threads issuing X commands while this code is running.
-  ctxErrorOccurred = FALSE;
+  ctxErrorOccurred = false;
   oldHandler = XSetErrorHandler(&ctxErrorHandler);
 
   // Check for the GLX_ARB_create_context extension string and the function.
@@ -374,7 +377,7 @@ void *glx_init(glx_opengl_version_t version)
         // GLX_CONTEXT_MINOR_VERSION_ARB = 0
         context_attribs[3] = 0;
 
-        ctxErrorOccurred = FALSE;
+        ctxErrorOccurred = false;
 
         debug_msg( "Failed to create GL 3.0 context"
                 " ... using old-style GLX context\n" );

src/glx_common.h

@@ -35,6 +35,12 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+ #ifdef __cplusplus
+ #include <csdint>
+ #else
+ #include <stdint.h>
+ #endif
+
 typedef uint32_t glx_opengl_version_t;
 #define OPENGL_VERSION_UNSPECIFIED 0u
 #define MK_OPENGL_VERSION(major,minor) (major << 8u | minor)