diff options
| -rw-r--r-- | src/mesa/program/prog_execute.c | 20 | ||||
| -rw-r--r-- | src/mesa/program/prog_instruction.c | 1 | ||||
| -rw-r--r-- | src/mesa/program/prog_instruction.h | 1 | ||||
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 7 | ||||
| -rw-r--r-- | src/mesa/program/programopt.c | 1 |
5 files changed, 0 insertions, 30 deletions
diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c index d336c51ca20..0755ac873e8 100644 --- a/src/mesa/program/prog_execute.c +++ b/src/mesa/program/prog_execute.c @@ -1253,26 +1253,6 @@ _mesa_execute_program(struct gl_context * ctx, store_vector4(inst, machine, color); } break; - case OPCODE_TXP_NV: /* GL_NV_fragment_program only */ - /* Texture lookup w/ projective divide, as above, but do not - * do the divide by w if sampling from a cube map. - */ - { - GLfloat texcoord[4], color[4]; - - fetch_vector4(&inst->SrcReg[0], machine, texcoord); - if (inst->TexSrcTarget != TEXTURE_CUBE_INDEX && - texcoord[3] != 0.0F) { - texcoord[0] /= texcoord[3]; - texcoord[1] /= texcoord[3]; - texcoord[2] /= texcoord[3]; - } - - fetch_texel(ctx, machine, inst, texcoord, 0.0, color); - - store_vector4(inst, machine, color); - } - break; case OPCODE_TRUNC: /* truncate toward zero */ { GLfloat a[4], result[4]; diff --git a/src/mesa/program/prog_instruction.c b/src/mesa/program/prog_instruction.c index 612c0c25ba1..0b80383b147 100644 --- a/src/mesa/program/prog_instruction.c +++ b/src/mesa/program/prog_instruction.c @@ -184,7 +184,6 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = { { OPCODE_TXD, "TXD", 3, 1 }, { OPCODE_TXL, "TXL", 1, 1 }, { OPCODE_TXP, "TXP", 1, 1 }, - { OPCODE_TXP_NV, "TXP_NV", 1, 1 }, { OPCODE_TRUNC, "TRUNC", 1, 1 }, { OPCODE_XPD, "XPD", 2, 1 } }; diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h index ceec16c41a8..9dc869bfbb2 100644 --- a/src/mesa/program/prog_instruction.h +++ b/src/mesa/program/prog_instruction.h @@ -173,7 +173,6 @@ enum prog_opcode { OPCODE_TXD, /* X X */ OPCODE_TXL, /* 3 2 X */ OPCODE_TXP, /* X X */ - OPCODE_TXP_NV, /* 3 X */ OPCODE_TRUNC, /* X */ OPCODE_XPD, /* X X */ MAX_OPCODE diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index 74cbbfb1cc6..fa31dfc846b 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -592,11 +592,6 @@ ptn_tex(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src, op = nir_texop_tex; num_srcs = 2; break; - case OPCODE_TXP_NV: - assert(!"not handled"); - op = nir_texop_tex; - num_srcs = 2; - break; default: fprintf(stderr, "unknown tex op %d\n", prog_inst->Opcode); abort(); @@ -743,7 +738,6 @@ static const nir_op op_trans[MAX_OPCODE] = { [OPCODE_TXD] = 0, [OPCODE_TXL] = 0, [OPCODE_TXP] = 0, - [OPCODE_TXP_NV] = 0, [OPCODE_XPD] = 0, }; @@ -882,7 +876,6 @@ ptn_emit_instruction(struct ptn_compile *c, struct prog_instruction *prog_inst) case OPCODE_TXD: case OPCODE_TXL: case OPCODE_TXP: - case OPCODE_TXP_NV: ptn_tex(b, dest, src, prog_inst); break; diff --git a/src/mesa/program/programopt.c b/src/mesa/program/programopt.c index 24dde57725e..4dd9998a887 100644 --- a/src/mesa/program/programopt.c +++ b/src/mesa/program/programopt.c @@ -426,7 +426,6 @@ is_texture_instruction(const struct prog_instruction *inst) case OPCODE_TXD: case OPCODE_TXL: case OPCODE_TXP: - case OPCODE_TXP_NV: return GL_TRUE; default: return GL_FALSE; |