diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
| commit | 19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch) | |
| tree | 0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/mesa/program | |
| parent | 480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff) | |
| parent | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff) | |
| download | vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2 vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 9 nov 2012
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/prog_instruction.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/prog_instruction.h | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/prog_print.c | 6 |
3 files changed, 0 insertions, 10 deletions
diff --git a/mesalib/src/mesa/program/prog_instruction.c b/mesalib/src/mesa/program/prog_instruction.c index 0bd45b09b..ab93932ef 100644 --- a/mesalib/src/mesa/program/prog_instruction.c +++ b/mesalib/src/mesa/program/prog_instruction.c @@ -171,9 +171,7 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = { { OPCODE_DPH, "DPH", 2, 1 }, { OPCODE_DST, "DST", 2, 1 }, { OPCODE_ELSE, "ELSE", 0, 0 }, - { OPCODE_EMIT_VERTEX, "EMIT_VERTEX", 0, 0 }, { OPCODE_END, "END", 0, 0 }, - { OPCODE_END_PRIMITIVE, "END_PRIMITIVE", 0, 0 }, { OPCODE_ENDIF, "ENDIF", 0, 0 }, { OPCODE_ENDLOOP,"ENDLOOP", 0, 0 }, { OPCODE_ENDSUB, "ENDSUB", 0, 0 }, diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h index 8bb0c6541..a7bba75f1 100644 --- a/mesalib/src/mesa/program/prog_instruction.h +++ b/mesalib/src/mesa/program/prog_instruction.h @@ -165,9 +165,7 @@ typedef enum prog_opcode { OPCODE_DPH, /* X X 1.1 */ OPCODE_DST, /* X X X X */ OPCODE_ELSE, /* opt */ - OPCODE_EMIT_VERTEX,/* X */ OPCODE_END, /* X X X X opt */ - OPCODE_END_PRIMITIVE,/* X */ OPCODE_ENDIF, /* opt */ OPCODE_ENDLOOP, /* opt */ OPCODE_ENDSUB, /* opt */ diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c index dbaa4d017..7e7e081f7 100644 --- a/mesalib/src/mesa/program/prog_print.c +++ b/mesalib/src/mesa/program/prog_print.c @@ -810,12 +810,6 @@ _mesa_fprint_instruction_opt(FILE *f, fprintf(f, "# %s\n", inst->Comment); } break; - case OPCODE_EMIT_VERTEX: - fprintf(f, "EMIT_VERTEX\n"); - break; - case OPCODE_END_PRIMITIVE: - fprintf(f, "END_PRIMITIVE\n"); - break; /* XXX may need other special-case instructions */ default: if (inst->Opcode < MAX_OPCODE) { |