Unify vertex/fragment program instuctions.
Based on patch by Ian (#4967) but also unify instruction opcodes.
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index b4ac8f5..4b88178 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -37,9 +37,8 @@
 #include "mtypes.h"
 #include "program.h"
 #include "nvfragparse.h"
-#include "nvfragprog.h"
+#include "program_instruction.h"
 #include "nvvertparse.h"
-#include "nvvertprog.h"
 #include "atifragshader.h"