summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-09-04 23:38:03 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-09-04 23:38:03 +0000
commit0d08399d8df6d7c52b1d85b0b54ec8d4c4fa6a28 (patch)
tree0388da1ceab869a659496edd5921e41b6d3d443b
parent0ac157ddc44e840682190c6c1fb803cb6a36a016 (diff)
move SWIZZLE_ZERO/ONE tokens to program.h
-rw-r--r--src/mesa/main/nvvertprog.h5
-rw-r--r--src/mesa/main/program.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/main/nvvertprog.h b/src/mesa/main/nvvertprog.h
index 0dbee780df..820b3e5692 100644
--- 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 02d962c796..2445fcc9a4 100644
--- 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