diff options
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_fragshader.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/atifragshader.c (renamed from src/mesa/shader/atifragshader.c) | 2 | ||||
| -rw-r--r-- | src/mesa/main/atifragshader.h (renamed from src/mesa/shader/atifragshader.h) | 0 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/shared.c | 6 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_atifragshader.c | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 0c3c2b30c0f..8899610dd3e 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/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 85c1b7bdd19..68e67377d99 100644 --- 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 137223acc8b..cf421bf3c07 100644 --- 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 index 21bb9589cb0..550f50b7a00 100644 --- 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 index 31c335ec815..31c335ec815 100644 --- a/src/mesa/shader/atifragshader.h +++ b/src/mesa/main/atifragshader.h diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 37a97513453..1a7b6f07630 100644 --- 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 b327faec36a..a44d2d51c49 100644 --- 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 4ad9dbfe55c..41104cd0aa5 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/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 0f06cdf9f9d..fa280e72e40 100644 --- 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" |