move SWIZZLE_ZERO/ONE tokens to program.h

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
 {

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