summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/SConscript2
-rw-r--r--src/mesa/main/api_exec.c4
-rw-r--r--src/mesa/main/dlist.c2
-rw-r--r--src/mesa/main/nvprogram.c (renamed from src/mesa/shader/nvprogram.c)14
-rw-r--r--src/mesa/main/nvprogram.h (renamed from src/mesa/shader/nvprogram.h)0
-rw-r--r--src/mesa/shader/nvvertparse.c2
-rw-r--r--src/mesa/sources.mak2
7 files changed, 13 insertions, 13 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 4580265cd6..b65c86da82 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -75,6 +75,7 @@ if env['platform'] != 'winddk':
'main/mipmap.c',
'main/mm.c',
'main/multisample.c',
+ 'main/nvprogram.c',
'main/pixel.c',
'main/pixelstore.c',
'main/points.c',
@@ -201,7 +202,6 @@ if env['platform'] != 'winddk':
'shader/hash_table.c',
'shader/lex.yy.c',
'shader/nvfragparse.c',
- 'shader/nvprogram.c',
'shader/nvvertparse.c',
'shader/program.c',
'shader/program_parse.tab.c',
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 505a05d55e..37d1ba4506 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -92,10 +92,10 @@
#include "varray.h"
#include "viewport.h"
#if FEATURE_NV_vertex_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
#endif
#if FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
#endif
#if FEATURE_ARB_shader_objects
#include "shaderapi.h"
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index c5f362b536..727414d529 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -62,7 +62,7 @@
#include "arbprogram.h"
#endif
#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
#endif
#include "math/m_matrix.h"
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/main/nvprogram.c
index 19020be42c..7781648f4b 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/main/nvprogram.c
@@ -42,13 +42,13 @@
#include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "program.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "arbprogparse.h"
-#include "nvprogram.h"
+#include "main/nvprogram.h"
+#include "shader/arbprogparse.h"
+#include "shader/nvfragparse.h"
+#include "shader/nvvertparse.h"
+#include "shader/program.h"
+#include "shader/prog_instruction.h"
+#include "shader/prog_parameter.h"
diff --git a/src/mesa/shader/nvprogram.h b/src/mesa/main/nvprogram.h
index 8ee59661bd..8ee59661bd 100644
--- a/src/mesa/shader/nvprogram.h
+++ b/src/mesa/main/nvprogram.h
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 7332fc4780..e2afcfd4ce 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -40,7 +40,7 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/imports.h"
-#include "nvprogram.h"
+#include "main/nvprogram.h"
#include "nvvertparse.h"
#include "prog_instruction.h"
#include "prog_parameter.h"
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index f2f111e838..38b781cb4c 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -57,6 +57,7 @@ MAIN_SOURCES = \
main/mipmap.c \
main/mm.c \
main/multisample.c \
+ main/nvprogram.c \
main/pixel.c \
main/pixelstore.c \
main/points.c \
@@ -232,7 +233,6 @@ SHADER_SOURCES = \
shader/hash_table.c \
shader/lex.yy.c \
shader/nvfragparse.c \
- shader/nvprogram.c \
shader/nvvertparse.c \
shader/program.c \
shader/program_parse.tab.c \