From ab636361e865c389fe60584562372ec39ac4c511 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sun, 7 Oct 2012 12:44:58 +0200
Subject: [PATCH] Move all OpenGL includes into one file.

---
 blur_effect.cpp            | 5 +----
 effect.cpp                 | 5 +----
 effect.h                   | 2 +-
 effect_chain.cpp           | 4 +---
 flat_input.cpp             | 5 +----
 lift_gamma_gain_effect.cpp | 5 +----
 main.cpp                   | 4 +---
 sandbox_effect.cpp         | 5 +----
 util.cpp                   | 6 +-----
 util.h                     | 2 +-
 vignette_effect.cpp        | 5 +----
 widgets.cpp                | 5 +----
 ycbcr_input.cpp            | 5 +----
 13 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/blur_effect.cpp b/blur_effect.cpp
index e6a9a31..22e7d0b 100644
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "blur_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
diff --git a/effect.cpp b/effect.cpp
index 1bbb89f..6f3121d 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,5 +1,3 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -7,8 +5,7 @@
 #include "effect_chain.h"
 #include "util.h"
 
-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "opengl.h"
 
 GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
diff --git a/effect.h b/effect.h
index d14176b..a9734cc 100644
--- a/effect.h
+++ b/effect.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include <GL/gl.h>
+#include "opengl.h"
 
 class EffectChain;
 
diff --git a/effect_chain.cpp b/effect_chain.cpp
index 13f4634..312b27d 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -4,9 +4,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include <algorithm>
 #include <set>
 #include <stack>
@@ -18,6 +15,7 @@
 #include "gamma_compression_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "input.h"
+#include "opengl.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
 	: width(width),
diff --git a/flat_input.cpp b/flat_input.cpp
index c7f417b..f8e36ca 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "flat_input.h"
 #include "util.h"
+#include "opengl.h"
 
 FlatInput::FlatInput(ImageFormat image_format, unsigned width, unsigned height)
 	: image_format(image_format),
diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 2dc8278..c26386c 100644
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -1,11 +1,8 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "lift_gamma_gain_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 LiftGammaGainEffect::LiftGammaGainEffect()
 	: lift(0.0f, 0.0f, 0.0f),
diff --git a/main.cpp b/main.cpp
index 4fbcdf3..d9a116d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,12 +18,10 @@
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
+#include "opengl.h"
 #include "widgets.h"
 
 #include "flat_input.h"
diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 6fdfa51..561048d 100644
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 SandboxEffect::SandboxEffect()
 	: parm(0.0f)
diff --git a/util.cpp b/util.cpp
index 70c9af2..8dcf219 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,13 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <assert.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include <math.h>
 #include "util.h"
+#include "opengl.h"
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
diff --git a/util.h b/util.h
index a1e0e66..209a7dc 100644
--- a/util.h
+++ b/util.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include <GL/gl.h>
+#include "opengl.h"
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index b3a6c04..4ac564a 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,11 +1,8 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "vignette_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 VignetteEffect::VignetteEffect()
 	: center(0.5f, 0.5f),
diff --git a/widgets.cpp b/widgets.cpp
index 09d878e..fb49993 100644
--- a/widgets.cpp
+++ b/widgets.cpp
@@ -1,11 +1,8 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "widgets.h"
 #include "util.h"
+#include "opengl.h"
 
 #define HSV_WHEEL_SIZE 128
 
diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index a0b9abf..a625fe3 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "ycbcr_input.h"
 #include "util.h"
+#include "opengl.h"
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
-- 
2.39.2