Move all OpenGL includes into one file.

diff --git a/blur_effect.cpp b/blur_effect.cpp
index e6a9a313ec8fd82918d7719570d96a194814beb9..22e7d0ba781f40e4cd2ef385bb194005cf39fc70 100644 (file)
--- a/blur_effect.cpp
+++ b/blur_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <math.h>
 #include <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 #include <assert.h>
 
 #include "blur_effect.h"
 #include "util.h"
 #include <assert.h>
 
 #include "blur_effect.h"
 #include "util.h"

+#include "opengl.h"

 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16
 
 // Must match blur_effect.frag.
 #define NUM_TAPS 16

diff --git a/effect.cpp b/effect.cpp
index 1bbb89f08417821b9ffbdd2759763cd4517d3a9a..6f3121d8afa6e873012da7629aa68717a9827d4f 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,5 +1,3 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>


@@ -7,8 +5,7 @@
 #include "effect_chain.h"
 #include "util.h"
 
 #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)
 {
 
 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 d14176b2b1f4dc5f74f56388766cdfb2d5d14362..a9734ccf37c1bb811b8175f46452265ee86c7a1d 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include <GL/gl.h>
+#include "opengl.h"

 
 class EffectChain;
 
 
 class EffectChain;
 

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 13f46344af85a07fb79376afa01a3d45e305b88d..312b27da9eef4a9ee59f09f4f5752a69e4464a1f 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -4,9 +4,6 @@
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 

-#include <GL/gl.h>
-#include <GL/glext.h>
-

 #include <algorithm>
 #include <set>
 #include <stack>
 #include <algorithm>
 #include <set>
 #include <stack>


@@ -18,6 +15,7 @@
 #include "gamma_compression_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "input.h"
 #include "gamma_compression_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "input.h"

+#include "opengl.h"

 
 EffectChain::EffectChain(unsigned width, unsigned height)
        : width(width),
 
 EffectChain::EffectChain(unsigned width, unsigned height)
        : width(width),

diff --git a/flat_input.cpp b/flat_input.cpp
index c7f417b873ddc64496d07e5311fa24e1c91c1127..f8e36ca2f610eecc607d1da1bdfd291ae8c9a1ec 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <string.h>
 #include <string.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 #include <assert.h>
 
 #include "flat_input.h"
 #include "util.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),
 
 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 2dc827885cb46a8a005427c18a9e247087abd781..c26386c644ffa5cc2756646b825975fb4a29168e 100644 (file)
--- 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 <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 
 #include "lift_gamma_gain_effect.h"
 #include "util.h"
 
 #include "lift_gamma_gain_effect.h"
 #include "util.h"

+#include "opengl.h"

 
 LiftGammaGainEffect::LiftGammaGainEffect()
        : lift(0.0f, 0.0f, 0.0f),
 
 LiftGammaGainEffect::LiftGammaGainEffect()
        : lift(0.0f, 0.0f, 0.0f),

diff --git a/main.cpp b/main.cpp
index 4fbcdf39d8e5ee3ff6cc8447f2db860ff409f907..d9a116d56425c710b3ac06f9425faae7b3dd2ce6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,12 +18,10 @@
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
 
 #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 "effect.h"
 #include "effect_chain.h"
 #include "util.h"

+#include "opengl.h"

 #include "widgets.h"
 
 #include "flat_input.h"
 #include "widgets.h"
 
 #include "flat_input.h"

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 6fdfa5156d8f51aac3c27f41b115c58550ce2c76..561048d416fd0241af4e4bac1c9edc34e9a4c1e3 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <math.h>
 #include <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"

+#include "opengl.h"

 
 SandboxEffect::SandboxEffect()
        : parm(0.0f)
 
 SandboxEffect::SandboxEffect()
        : parm(0.0f)

diff --git a/util.cpp b/util.cpp
index 70c9af2dc0d91be4951db50e90f9c6d79e77ba36..8dcf219b3ee6be7cd8592f26268eefb33bae3fcb 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -1,13 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <stdio.h>
 #include <assert.h>
 
 #include <stdio.h>
 #include <assert.h>
 

-#include <GL/gl.h>
-#include <GL/glext.h>
-

 #include <math.h>
 #include "util.h"
 #include <math.h>
 #include "util.h"

+#include "opengl.h"

 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {

diff --git a/util.h b/util.h
index a1e0e66e4c3269e8799f273203730cbcd7c64604..209a7dca42958a9313ed3f5d441267d9000e187a 100644 (file)
--- a/util.h
+++ b/util.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
 
 #include <string>
 

-#include <GL/gl.h>
+#include "opengl.h"

 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index b3a6c04ed6678b2e167c39aeaacd6319143256ba..4ac564a1f6a720219afe4cd11fd9d013b0191dce 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,11 +1,8 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <math.h>
 #include <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 
 #include "vignette_effect.h"
 #include "util.h"
 
 #include "vignette_effect.h"
 #include "util.h"

+#include "opengl.h"

 
 VignetteEffect::VignetteEffect()
        : center(0.5f, 0.5f),
 
 VignetteEffect::VignetteEffect()
        : center(0.5f, 0.5f),

diff --git a/widgets.cpp b/widgets.cpp
index 09d878ed4fa065ce1fb112b9d405d16335c34d3d..fb49993b23349743e049c7fa4bcebb2c3acefded 100644 (file)
--- a/widgets.cpp
+++ b/widgets.cpp
@@ -1,11 +1,8 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <math.h>
 #include <math.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 
 #include "widgets.h"
 #include "util.h"
 
 #include "widgets.h"
 #include "util.h"

+#include "opengl.h"

 
 #define HSV_WHEEL_SIZE 128
 
 
 #define HSV_WHEEL_SIZE 128
 

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index a0b9abf2933fa602e75a4dac7715f6c3cf962839..a625fe3474c70f712f14db97397fedd79682dfc0 100644 (file)
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-

 #include <string.h>
 #include <string.h>

-#include <GL/gl.h>
-#include <GL/glext.h>

 #include <assert.h>
 
 #include "ycbcr_input.h"
 #include "util.h"
 #include <assert.h>
 
 #include "ycbcr_input.h"
 #include "util.h"

+#include "opengl.h"

 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,