diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/program/prog_print.c | 60 | ||||
| -rw-r--r-- | src/mesa/program/prog_print.h | 1 |
2 files changed, 5 insertions, 56 deletions
diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index a560b53537f..99623c1f152 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -379,40 +379,6 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode, } break; - case PROG_PRINT_NV: - switch (f) { - case PROGRAM_INPUT: - if (prog->Target == GL_VERTEX_PROGRAM_ARB) - sprintf(str, "v[%d]", index); - else - sprintf(str, "f[%d]", index); - break; - case PROGRAM_OUTPUT: - sprintf(str, "o[%d]", index); - break; - case PROGRAM_TEMPORARY: - sprintf(str, "R%d", index); - break; - case PROGRAM_ENV_PARAM: - sprintf(str, "c[%d]", index); - break; - case PROGRAM_VARYING: /* extension */ - sprintf(str, "varying[%s%d]", addr, index); - break; - case PROGRAM_UNIFORM: /* extension */ - sprintf(str, "uniform[%s%d]", addr, index); - break; - case PROGRAM_CONSTANT: /* extension */ - sprintf(str, "constant[%s%d]", addr, index); - break; - case PROGRAM_STATE_VAR: /* extension */ - sprintf(str, "state[%s%d]", addr, index); - break; - default: - _mesa_problem(NULL, "bad file in reg_string()"); - } - break; - default: _mesa_problem(NULL, "bad mode in reg_string()"); } @@ -788,15 +754,9 @@ _mesa_fprint_instruction_opt(FILE *f, break; case OPCODE_BGNSUB: - if (mode == PROG_PRINT_NV) { - fprintf(f, "%s:\n", inst->Comment); /* comment is label */ - return indent; - } - else { - fprintf(f, "BGNSUB"); - fprint_comment(f, inst); - return indent + 3; - } + fprintf(f, "BGNSUB"); + fprint_comment(f, inst); + return indent + 3; case OPCODE_ENDSUB: if (mode == PROG_PRINT_DEBUG) { fprintf(f, "ENDSUB"); @@ -804,13 +764,8 @@ _mesa_fprint_instruction_opt(FILE *f, } break; case OPCODE_CAL: - if (mode == PROG_PRINT_NV) { - fprintf(f, "CAL %s; # (goto %d)\n", inst->Comment, inst->BranchTarget); - } - else { - fprintf(f, "CAL %u", inst->BranchTarget); - fprint_comment(f, inst); - } + fprintf(f, "CAL %u", inst->BranchTarget); + fprint_comment(f, inst); break; case OPCODE_RET: fprintf(f, "RET (%s%s)", @@ -893,17 +848,12 @@ _mesa_fprint_program_opt(FILE *f, case GL_VERTEX_PROGRAM_ARB: if (mode == PROG_PRINT_ARB) fprintf(f, "!!ARBvp1.0\n"); - else if (mode == PROG_PRINT_NV) - fprintf(f, "!!VP1.0\n"); else fprintf(f, "# Vertex Program/Shader %u\n", prog->Id); break; case GL_FRAGMENT_PROGRAM_ARB: - case GL_FRAGMENT_PROGRAM_NV: if (mode == PROG_PRINT_ARB) fprintf(f, "!!ARBfp1.0\n"); - else if (mode == PROG_PRINT_NV) - fprintf(f, "!!FP1.0\n"); else fprintf(f, "# Fragment Program/Shader %u\n", prog->Id); break; diff --git a/src/mesa/program/prog_print.h b/src/mesa/program/prog_print.h index b95ec2be570..3e400eb46b8 100644 --- a/src/mesa/program/prog_print.h +++ b/src/mesa/program/prog_print.h @@ -42,7 +42,6 @@ struct prog_instruction; */ typedef enum { PROG_PRINT_ARB, - PROG_PRINT_NV, PROG_PRINT_DEBUG } gl_prog_print_mode; |