[Mesa-dev] [PATCH] mesa: Remove PROG_EMIT_VERTEX and PROG_END_PRIMITIVE opcodes.

[Kenneth Graunke]

These were only used for geometry shader support back in the days before
the new GLSL compiler.  Future geometry shader support will not use
these.
---
 src/mesa/program/prog_instruction.c      | 2 --
 src/mesa/program/prog_instruction.h      | 2 --
 src/mesa/program/prog_print.c            | 6 ------
 src/mesa/state_tracker/st_mesa_to_tgsi.c | 4 ----
 4 files changed, 14 deletions(-)

diff --git a/src/mesa/program/prog_instruction.c b/src/mesa/program/prog_instruction.c
index 0bd45b0..ab93932 100644
--- a/src/mesa/program/prog_instruction.c
+++ b/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/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h
index 8bb0c65..a7bba75 100644
--- a/src/mesa/program/prog_instruction.h
+++ b/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/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index dbaa4d0..7e7e081 100644
--- a/src/mesa/program/prog_print.c
+++ b/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) {
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 0acab43..0822be7 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -563,10 +563,6 @@ translate_opcode( unsigned op )
       return TGSI_OPCODE_DST;
    case OPCODE_ELSE:
       return TGSI_OPCODE_ELSE;
-   case OPCODE_EMIT_VERTEX:
-      return TGSI_OPCODE_EMIT;
-   case OPCODE_END_PRIMITIVE:
-      return TGSI_OPCODE_ENDPRIM;
    case OPCODE_ENDIF:
       return TGSI_OPCODE_ENDIF;
    case OPCODE_ENDLOOP:
-- 
1.8.0