From 5f2f57f6eef36f7573aac882d63075d365777eb8 Mon Sep 17 00:00:00 2001 From: Allanis Date: Thu, 16 May 2013 15:59:46 +0100 Subject: [PATCH] [Change] Some more minor cleanup that noone cares about. --- src/opengl.c | 4 +--- src/opengl.h | 4 ++++ src/space.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/opengl.c b/src/opengl.c index c0c24b9..7f08b07 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -13,9 +13,6 @@ #include "pack.h" #include "opengl.h" -#define SCREEN_W gl_screen.w -#define SCREEN_H gl_screen.h - // offsets to Adjust the pilot's place onscreen //to be in the middle, even with the GUI. extern double gui_xoff; @@ -724,6 +721,7 @@ int gl_init(void) { gl_screen.tex_max); DEBUG("Renderer: %s", glGetString(GL_RENDERER)); + DEBUG("Version: %s", glGetString(GL_VERSION)); if(!gl_has(OPENGL_FRAG_SHADER)) DEBUG("No fragment shader extension detected"); DEBUG(""); diff --git a/src/opengl.h b/src/opengl.h index 8ed3964..d03b41b 100644 --- a/src/opengl.h +++ b/src/opengl.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include "colour.h" @@ -36,6 +37,9 @@ typedef struct glInfo_ { } glInfo; extern glInfo gl_screen; // Local structure set with gl_init etc. +#define SCREEN_W gl_screen.w +#define SCREEN_H gl_screen.h + #define COLOUR(x) glColor4d((x).r, (x).g, (x).b, (x).a) #define ACOLOUR(x,a) glColor4d((x).r, (x).g, (x).b, a) diff --git a/src/space.c b/src/space.c index ae429ea..8b2b389 100644 --- a/src/space.c +++ b/src/space.c @@ -4,6 +4,7 @@ #include "xml.h" #include "lephisto.h" +#include "opengl.h" #include "log.h" #include "physics.h" #include "rng.h"