diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-05 17:10:45 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-05 17:10:45 +0000 |
| commit | 7e807510d8c3e88ee7ae6c697393201cf08f992f (patch) | |
| tree | e9b016baa0c63f333efd586619568731dc3db747 /src/mesa/shader/arbprogparse.h | |
| parent | 73347516be1a515380af1a71cbeaec51001a46dc (diff) | |
| download | external_mesa3d-7e807510d8c3e88ee7ae6c697393201cf08f992f.zip external_mesa3d-7e807510d8c3e88ee7ae6c697393201cf08f992f.tar.gz external_mesa3d-7e807510d8c3e88ee7ae6c697393201cf08f992f.tar.bz2 | |
Unify vertex/fragment program instuctions.
Based on patch by Ian (#4967) but also unify instruction opcodes.
Diffstat (limited to 'src/mesa/shader/arbprogparse.h')
| -rw-r--r-- | src/mesa/shader/arbprogparse.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/shader/arbprogparse.h b/src/mesa/shader/arbprogparse.h index 59f8e3b..5dbf31a 100644 --- a/src/mesa/shader/arbprogparse.h +++ b/src/mesa/shader/arbprogparse.h @@ -28,8 +28,7 @@ #include "context.h" #include "mtypes.h" -#include "nvvertprog.h" -#include "nvfragprog.h" +#include "program_instruction.h" #define MAX_INSTRUCTIONS 256 @@ -53,7 +52,7 @@ struct arb_program GLuint MinorVersion; /* ARB_vertex_program specifics */ - struct vp_instruction VPInstructions[MAX_INSTRUCTIONS]; + struct prog_instruction VPInstructions[MAX_INSTRUCTIONS]; /* Options currently recognized by the parser */ /* ARB_fp */ @@ -64,7 +63,7 @@ struct arb_program GLboolean HintPositionInvariant; /* ARB_fragment_program specifics */ - struct fp_instruction FPInstructions[MAX_INSTRUCTIONS]; + struct prog_instruction FPInstructions[MAX_INSTRUCTIONS]; GLbitfield TexturesUsed[MAX_TEXTURE_IMAGE_UNITS]; GLuint NumAluInstructions; GLuint NumTexInstructions; |