aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Kaiser <[email protected]>2010-09-30 07:50:43 -0700
committerBrian Paul <[email protected]>2010-09-30 09:36:31 -0600
commit9674929bce0c0ea4862b468d0a1a7e58b2664049 (patch)
tree113eccf2811547a87dde36009fe1b7e7cda331aa /src
parent8c92a80b6210bf7d977816690476ff336b350c79 (diff)
main: remove duplicated includes
Remove duplicated includes. Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/api_exec.c5
-rw-r--r--src/mesa/main/dlist.c1
-rw-r--r--src/mesa/main/renderbuffer.c1
3 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index b87aa47d88b..ae653e1914e 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -91,10 +91,7 @@
#include "mtypes.h"
#include "varray.h"
#include "viewport.h"
-#if FEATURE_NV_vertex_program
-#include "nvprogram.h"
-#endif
-#if FEATURE_NV_fragment_program
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
#include "nvprogram.h"
#endif
#if FEATURE_ARB_shader_objects
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 3a730f0e406..cccec248539 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -52,7 +52,6 @@
#include "hash.h"
#include "image.h"
#include "light.h"
-#include "dlist.h"
#include "macros.h"
#include "queryobj.h"
#include "teximage.h"
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index adc1199d87a..118fb52bb2e 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -46,7 +46,6 @@
#include "fbobject.h"
#include "formats.h"
#include "mtypes.h"
-#include "fbobject.h"
#include "renderbuffer.h"