summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/SConscript2
-rw-r--r--src/mesa/drivers/common/meta.c2
-rw-r--r--src/mesa/drivers/dri/common/dri_metaops.c2
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_bitmap.c2
-rw-r--r--src/mesa/main/api_exec.c2
-rw-r--r--src/mesa/main/arbprogram.c (renamed from src/mesa/shader/arbprogram.c)10
-rw-r--r--src/mesa/main/arbprogram.h (renamed from src/mesa/shader/arbprogram.h)0
-rw-r--r--src/mesa/main/dlist.c2
-rw-r--r--src/mesa/sources.mak2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 8899610dd3..4580265cd6 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -31,6 +31,7 @@ if env['platform'] != 'winddk':
'main/api_noop.c',
'main/api_validate.c',
'main/accum.c',
+ 'main/arbprogram.c',
'main/atifragshader.c',
'main/attrib.c',
'main/arrayobj.c',
@@ -197,7 +198,6 @@ if env['platform'] != 'winddk':
shader_sources = [
'shader/arbprogparse.c',
- 'shader/arbprogram.c',
'shader/hash_table.c',
'shader/lex.yy.c',
'shader/nvfragparse.c',
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index f808e15b33..93848287dd 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -34,6 +34,7 @@
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/imports.h"
+#include "main/arbprogram.h"
#include "main/arrayobj.h"
#include "main/blend.h"
#include "main/bufferobj.h"
@@ -62,7 +63,6 @@
#include "main/varray.h"
#include "main/viewport.h"
#include "shader/program.h"
-#include "shader/arbprogram.h"
#include "swrast/swrast.h"
#include "drivers/common/meta.h"
diff --git a/src/mesa/drivers/dri/common/dri_metaops.c b/src/mesa/drivers/dri/common/dri_metaops.c
index dfb7d64040..9151c03b5e 100644
--- a/src/mesa/drivers/dri/common/dri_metaops.c
+++ b/src/mesa/drivers/dri/common/dri_metaops.c
@@ -26,6 +26,7 @@
*
**************************************************************************/
+#include "main/arbprogram.h"
#include "main/arrayobj.h"
#include "main/bufferobj.h"
#include "main/enable.h"
@@ -33,7 +34,6 @@
#include "main/texstate.h"
#include "main/varray.h"
#include "main/viewport.h"
-#include "shader/arbprogram.h"
#include "shader/program.h"
#include "dri_metaops.h"
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index 076fee89bd..0e2fe893fe 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -26,6 +26,7 @@
**************************************************************************/
#include "main/glheader.h"
+#include "main/arbprogram.h"
#include "main/enums.h"
#include "main/image.h"
#include "main/colormac.h"
@@ -44,7 +45,6 @@
#include "main/attrib.h"
#include "main/enable.h"
#include "main/viewport.h"
-#include "shader/arbprogram.h"
#include "swrast/swrast.h"
#include "intel_screen.h"
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index cf421bf3c0..505a05d55e 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -34,7 +34,7 @@
#include "api_loopback.h"
#include "api_exec.h"
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "shader/arbprogram.h"
+#include "arbprogram.h"
#endif
#include "atifragshader.h"
#include "attrib.h"
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/main/arbprogram.c
index 8c0b94488e..b6577b81fb 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -35,11 +35,11 @@
#include "main/imports.h"
#include "main/macros.h"
#include "main/mtypes.h"
-#include "arbprogram.h"
-#include "arbprogparse.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "program.h"
+#include "main/arbprogram.h"
+#include "shader/arbprogparse.h"
+#include "shader/nvfragparse.h"
+#include "shader/nvvertparse.h"
+#include "shader/program.h"
diff --git a/src/mesa/shader/arbprogram.h b/src/mesa/main/arbprogram.h
index df16513e39..df16513e39 100644
--- a/src/mesa/shader/arbprogram.h
+++ b/src/mesa/main/arbprogram.h
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 1a7b6f0763..c5f362b536 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -59,7 +59,7 @@
#include "mtypes.h"
#include "varray.h"
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-#include "shader/arbprogram.h"
+#include "arbprogram.h"
#endif
#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
#include "shader/nvprogram.h"
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 41104cd0aa..f2f111e838 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -12,6 +12,7 @@ MAIN_SOURCES = \
main/api_noop.c \
main/api_validate.c \
main/accum.c \
+ main/arbprogram.c \
main/atifragshader.c \
main/attrib.c \
main/arrayobj.c \
@@ -228,7 +229,6 @@ STATETRACKER_SOURCES = \
SHADER_SOURCES = \
shader/arbprogparse.c \
- shader/arbprogram.c \
shader/hash_table.c \
shader/lex.yy.c \
shader/nvfragparse.c \