move SWIZZLE_ZERO/ONE tokens to program.h

diff --git a/src/mesa/main/nvvertprog.h b/src/mesa/main/nvvertprog.h
index 0dbee780dfd58e24b1055a5c3f79634c880c95ac..820b3e5692bd5ae2f43bcfbab00e113585e0ec5b 100644 (file)
--- a/src/mesa/main/nvvertprog.h
+++ b/src/mesa/main/nvvertprog.h
@@ -34,11 +34,6 @@
 #define NVVERTPROG_H
 
 
-/* for GL_ARB_v_p SWZ instruction */
-#define SWIZZLE_ZERO 100
-#define SWIZZLE_ONE  101
-
-
 /* Vertex program opcodes */
 enum vp_opcode
 {

diff --git a/src/mesa/main/program.h b/src/mesa/main/program.h
index 02d962c7965f2288ad8c23d42b966af298b33990..2445fcc9a44d849e6bd29843e0589a9c105c342f 100644 (file)
--- a/src/mesa/main/program.h
+++ b/src/mesa/main/program.h
@@ -35,6 +35,10 @@
 #include "mtypes.h"
 
 
+/* for GL_ARB_v_p and GL_ARB_f_p SWZ instruction */
+#define SWIZZLE_ZERO 100
+#define SWIZZLE_ONE  101
+
 
 /*
  * Internal functions