diff options
author | Matt Turner <[email protected]> | 2016-02-27 11:06:25 -0800 |
---|---|---|
committer | Matt Turner <[email protected]> | 2016-03-01 11:41:29 -0800 |
commit | 7b50b0457db3acffcc2a7de092df346fa314aa95 (patch) | |
tree | 5ed9937b2b888336d52a7808166e03cde938096b /src/mesa/program/program_parse_extra.c | |
parent | 9e11ff7e11c87dd19d2274644bca7a869ff2143d (diff) |
program: Remove condition-code and precision support.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Acked-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/program/program_parse_extra.c')
-rw-r--r-- | src/mesa/program/program_parse_extra.c | 103 |
1 files changed, 1 insertions, 102 deletions
diff --git a/src/mesa/program/program_parse_extra.c b/src/mesa/program/program_parse_extra.c index 71f86d13ace..1c5f5794dd5 100644 --- a/src/mesa/program/program_parse_extra.c +++ b/src/mesa/program/program_parse_extra.c @@ -38,46 +38,10 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state, const char *suffix, struct prog_instruction *inst) { - inst->CondUpdate = 0; - inst->CondDst = 0; inst->Saturate = GL_FALSE; - inst->Precision = FLOAT32; - /* The first possible suffix element is the precision specifier from - * NV_fragment_program_option. - */ - if (state->option.NV_fragment) { - switch (suffix[0]) { - case 'H': - inst->Precision = FLOAT16; - suffix++; - break; - case 'R': - inst->Precision = FLOAT32; - suffix++; - break; - case 'X': - inst->Precision = FIXED12; - suffix++; - break; - default: - break; - } - } - - /* The next possible suffix element is the condition code modifier selection - * from NV_fragment_program_option. - */ - if (state->option.NV_fragment) { - if (suffix[0] == 'C') { - inst->CondUpdate = 1; - suffix++; - } - } - - - /* The final possible suffix element is the saturation selector from + /* The only possible suffix element is the saturation selector from * ARB_fragment_program. */ if (state->mode == ARB_fragment) { @@ -95,60 +59,6 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state, int -_mesa_parse_cc(const char *s) -{ - int cond = 0; - - switch (s[0]) { - case 'E': - if (s[1] == 'Q') { - cond = COND_EQ; - } - break; - - case 'F': - if (s[1] == 'L') { - cond = COND_FL; - } - break; - - case 'G': - if (s[1] == 'E') { - cond = COND_GE; - } else if (s[1] == 'T') { - cond = COND_GT; - } - break; - - case 'L': - if (s[1] == 'E') { - cond = COND_LE; - } else if (s[1] == 'T') { - cond = COND_LT; - } - break; - - case 'N': - if (s[1] == 'E') { - cond = COND_NE; - } - break; - - case 'T': - if (s[1] == 'R') { - cond = COND_TR; - } - break; - - default: - break; - } - - return ((cond == 0) || (s[2] != '\0')) ? 0 : cond; -} - - -int _mesa_ARBvp_parse_option(struct asm_parser_state *state, const char *option) { if (strcmp(option, "ARB_position_invariant") == 0) { @@ -269,17 +179,6 @@ _mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option) state->option.DrawBuffers = 1; return 1; } - } else if (strncmp(option, "NV_fragment_program", 19) == 0) { - option += 19; - - /* Other NV_fragment_program strings may be supported later. - */ - if (option[0] == '\0') { - if (state->ctx->Extensions.NV_fragment_program_option) { - state->option.NV_fragment = 1; - return 1; - } - } } return 0; |