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/main/mtypes.h | |
| parent | 73347516be1a515380af1a71cbeaec51001a46dc (diff) | |
Unify vertex/fragment program instuctions.
Based on patch by Ian (#4967) but also unify instruction opcodes.
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 3271cb0772..2d08b11cc6 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1744,8 +1744,7 @@ enum register_file /** Vertex and fragment instructions */ -struct vp_instruction; -struct fp_instruction; +struct prog_instruction; struct atifs_instruction; struct atifs_setupinst; struct program_parameter_list; @@ -1781,7 +1780,7 @@ struct program struct vertex_program { struct program Base; /* base class */ - struct vp_instruction *Instructions; /* Compiled instructions */ + struct prog_instruction *Instructions; /* Compiled instructions */ GLboolean IsNVProgram; /* GL_NV_vertex_program ? */ GLboolean IsPositionInvariant; /* GL_NV_vertex_program1_1 */ GLbitfield InputsRead; /* Bitmask of which input regs are read */ @@ -1795,7 +1794,7 @@ struct vertex_program struct fragment_program { struct program Base; /**< base class */ - struct fp_instruction *Instructions; /**< Compiled instructions */ + struct prog_instruction *Instructions; /**< Compiled instructions */ GLbitfield InputsRead; /**< Bitmask of which input regs are read */ GLbitfield OutputsWritten; /**< Bitmask of which output regs are written to */ GLbitfield TexturesUsed[MAX_TEXTURE_IMAGE_UNITS]; /**< TEXTURE_x_INDEX bitmask */ |