瀏覽代碼

glsl: Remove never used sin_reduced/cos_reduced.

These were added in commit f2616e56, presumably in preparation for
translating ARB vp/fp into GLSL IR. That never happened, and neither did
a lowering pass that actually generated these instructions.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
tags/10.6-branchpoint
Matt Turner 10 年之前
父節點
當前提交
5c71cf8531

+ 0
- 4
src/glsl/ir.cpp 查看文件

@@ -240,8 +240,6 @@ ir_expression::ir_expression(int op, ir_rvalue *op0)
case ir_unop_round_even:
case ir_unop_sin:
case ir_unop_cos:
case ir_unop_sin_reduced:
case ir_unop_cos_reduced:
case ir_unop_dFdx:
case ir_unop_dFdx_coarse:
case ir_unop_dFdx_fine:
@@ -542,8 +540,6 @@ static const char *const operator_strs[] = {
"round_even",
"sin",
"cos",
"sin_reduced",
"cos_reduced",
"dFdx",
"dFdxCoarse",
"dFdxFine",

+ 0
- 2
src/glsl/ir.h 查看文件

@@ -1314,8 +1314,6 @@ enum ir_expression_operation {
/*@{*/
ir_unop_sin,
ir_unop_cos,
ir_unop_sin_reduced, /**< Reduced range sin. [-pi, pi] */
ir_unop_cos_reduced, /**< Reduced range cos. [-pi, pi] */
/*@}*/

/**

+ 0
- 2
src/glsl/ir_constant_expression.cpp 查看文件

@@ -781,7 +781,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
break;

case ir_unop_sin:
case ir_unop_sin_reduced:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (unsigned c = 0; c < op[0]->type->components(); c++) {
data.f[c] = sinf(op[0]->value.f[c]);
@@ -789,7 +788,6 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
break;

case ir_unop_cos:
case ir_unop_cos_reduced:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (unsigned c = 0; c < op[0]->type->components(); c++) {
data.f[c] = cosf(op[0]->value.f[c]);

+ 0
- 2
src/glsl/ir_validate.cpp 查看文件

@@ -334,8 +334,6 @@ ir_validate::visit_leave(ir_expression *ir)
break;
case ir_unop_sin:
case ir_unop_cos:
case ir_unop_sin_reduced:
case ir_unop_cos_reduced:
case ir_unop_dFdx:
case ir_unop_dFdx_coarse:
case ir_unop_dFdx_fine:

+ 0
- 6
src/glsl/nir/glsl_to_nir.cpp 查看文件

@@ -1087,12 +1087,6 @@ nir_visitor::visit(ir_expression *ir)
case ir_unop_round_even: emit(nir_op_fround_even, dest_size, srcs); break;
case ir_unop_sin: emit(nir_op_fsin, dest_size, srcs); break;
case ir_unop_cos: emit(nir_op_fcos, dest_size, srcs); break;
case ir_unop_sin_reduced:
emit(nir_op_fsin_reduced, dest_size, srcs);
break;
case ir_unop_cos_reduced:
emit(nir_op_fcos_reduced, dest_size, srcs);
break;
case ir_unop_dFdx: emit(nir_op_fddx, dest_size, srcs); break;
case ir_unop_dFdy: emit(nir_op_fddy, dest_size, srcs); break;
case ir_unop_dFdx_fine: emit(nir_op_fddx_fine, dest_size, srcs); break;

+ 0
- 2
src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp 查看文件

@@ -232,8 +232,6 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
case ir_unop_round_even:
case ir_unop_sin:
case ir_unop_cos:
case ir_unop_sin_reduced:
case ir_unop_cos_reduced:
case ir_unop_dFdx:
case ir_unop_dFdx_coarse:
case ir_unop_dFdx_fine:

+ 0
- 2
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp 查看文件

@@ -817,11 +817,9 @@ fs_visitor::visit(ir_expression *ir)
case ir_unop_log:
unreachable("not reached: should be handled by ir_explog_to_explog2");
case ir_unop_sin:
case ir_unop_sin_reduced:
emit_math(SHADER_OPCODE_SIN, this->result, op[0]);
break;
case ir_unop_cos:
case ir_unop_cos_reduced:
emit_math(SHADER_OPCODE_COS, this->result, op[0]);
break;


+ 0
- 2
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp 查看文件

@@ -1411,11 +1411,9 @@ vec4_visitor::visit(ir_expression *ir)
case ir_unop_log:
unreachable("not reached: should be handled by ir_explog_to_explog2");
case ir_unop_sin:
case ir_unop_sin_reduced:
emit_math(SHADER_OPCODE_SIN, result_dst, op[0]);
break;
case ir_unop_cos:
case ir_unop_cos_reduced:
emit_math(SHADER_OPCODE_COS, result_dst, op[0]);
break;


+ 0
- 6
src/mesa/program/ir_to_mesa.cpp 查看文件

@@ -1122,12 +1122,6 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
case ir_unop_cos:
emit_scalar(ir, OPCODE_COS, result_dst, op[0]);
break;
case ir_unop_sin_reduced:
emit_scs(ir, OPCODE_SIN, result_dst, op[0]);
break;
case ir_unop_cos_reduced:
emit_scs(ir, OPCODE_COS, result_dst, op[0]);
break;

case ir_unop_dFdx:
emit(ir, OPCODE_DDX, result_dst, op[0]);

+ 0
- 6
src/mesa/state_tracker/st_glsl_to_tgsi.cpp 查看文件

@@ -1611,12 +1611,6 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
case ir_unop_cos:
emit_scalar(ir, TGSI_OPCODE_COS, result_dst, op[0]);
break;
case ir_unop_sin_reduced:
emit_scs(ir, TGSI_OPCODE_SIN, result_dst, op[0]);
break;
case ir_unop_cos_reduced:
emit_scs(ir, TGSI_OPCODE_COS, result_dst, op[0]);
break;
case ir_unop_saturate: {
glsl_to_tgsi_instruction *inst;
inst = emit(ir, TGSI_OPCODE_MOV, result_dst, op[0]);

Loading…
取消
儲存