mesa: move atifragshader.[ch] to main/

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0c3c2b3..8899610 100644 (file)
--- 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/atifragshader.c',
                'main/attrib.c',
                'main/arrayobj.c',
                'main/blend.c',
@@ -197,7 +198,6 @@ if env['platform'] != 'winddk':
        shader_sources = [
                'shader/arbprogparse.c',
                'shader/arbprogram.c',
-               'shader/atifragshader.c',
                'shader/hash_table.c',
                'shader/lex.yy.c',
                'shader/nvfragparse.c',

diff --git a/src/mesa/drivers/dri/r200/r200_fragshader.c b/src/mesa/drivers/dri/r200/r200_fragshader.c
index 85c1b7b..68e6737 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_fragshader.c
+++ b/src/mesa/drivers/dri/r200/r200_fragshader.c
@@ -26,10 +26,10 @@
  **************************************************************************/
 
 #include "main/glheader.h"
+#include "main/atifragshader.h"
 #include "main/macros.h"
 #include "main/enums.h"
 #include "tnl/t_context.h"
-#include "shader/atifragshader.h"
 #include "shader/program.h"
 #include "r200_context.h"
 #include "r200_ioctl.h"

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 137223a..cf421bf 100644 (file)
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -36,7 +36,7 @@
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
 #include "shader/arbprogram.h"
 #endif
-#include "shader/atifragshader.h"
+#include "atifragshader.h"
 #include "attrib.h"
 #include "blend.h"
 #if FEATURE_ARB_vertex_buffer_object

diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/main/atifragshader.c
similarity index 99%
rename from src/mesa/shader/atifragshader.c
rename to src/mesa/main/atifragshader.c
index 21bb958..550f50b 100644 (file)
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -29,7 +29,7 @@
 #include "main/enums.h"
 #include "main/mtypes.h"
 #include "main/dispatch.h"
-#include "atifragshader.h"
+#include "main/atifragshader.h"
 
 #if FEATURE_ATI_fragment_shader
 

diff --git a/src/mesa/shader/atifragshader.h b/src/mesa/main/atifragshader.h
similarity index 100%
rename from src/mesa/shader/atifragshader.h
rename to src/mesa/main/atifragshader.h

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 37a9751..1a7b6f0 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -34,6 +34,9 @@
 #include "api_arrayelt.h"
 #include "api_exec.h"
 #include "api_loopback.h"
+#if FEATURE_ATI_fragment_shader
+#include "atifragshader.h"
+#endif
 #include "config.h"
 #include "mfeatures.h"
 #if FEATURE_ARB_vertex_buffer_object
@@ -61,9 +64,6 @@
 #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
 #include "shader/nvprogram.h"
 #endif
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
-#endif
 
 #include "math/m_matrix.h"
 

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index b327fae..a44d2d5 100644 (file)
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -33,13 +33,13 @@
 #include "mtypes.h"
 #include "hash.h"
 #include "arrayobj.h"
+#if FEATURE_ATI_fragment_shader
+#include "atifragshader.h"
+#endif
 #include "bufferobj.h"
 #include "shared.h"
 #include "shader/program.h"
 #include "dlist.h"
-#if FEATURE_ATI_fragment_shader
-#include "shader/atifragshader.h"
-#endif
 #include "shaderobj.h"
 #if FEATURE_ARB_sync
 #include "syncobj.h"

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 4ad9dbf..41104cd 100644 (file)
--- 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/atifragshader.c \
        main/attrib.c \
        main/arrayobj.c \
        main/blend.c \
@@ -228,7 +229,6 @@ STATETRACKER_SOURCES = \
 SHADER_SOURCES = \
        shader/arbprogparse.c \
        shader/arbprogram.c \
-       shader/atifragshader.c \
        shader/hash_table.c \
        shader/lex.yy.c \
        shader/nvfragparse.c \

diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 0f06cdf..fa280e7 100644 (file)
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/src/mesa/swrast/s_atifragshader.c
@@ -23,7 +23,7 @@
 #include "main/colormac.h"
 #include "main/context.h"
 #include "main/macros.h"
-#include "shader/atifragshader.h"
+#include "main/atifragshader.h"
 #include "swrast/s_atifragshader.h"