OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: s/comparitor/comparator/

Browse Source 
git grep -l comparitor | xargs sed -i 's/comparitor/comparator/g'

Just happened to notice this in a patch that was sent and included one
of the tokens in question.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Acked-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Ilia Mirkin
2016-12-12 08:32:38 -05:00
parent a0ce9ff8c4
commit fd249c803e
31 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/glsl/builtin_functions.cpp
View File

@@ -1697,7 +1697,7 @@ builtin_builder::create_builtins()
_texture(ir_tex, v130, glsl_type::float_type, glsl_type::sampler1DArrayShadow_type, glsl_type::vec3_type),
_texture(ir_tex, v130, glsl_type::float_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec4_type),
/* samplerCubeArrayShadow is special; it has an extra parameter
* for the shadow comparitor since there is no vec5 type.
* for the shadow comparator since there is no vec5 type.
*/
_textureCubeArrayShadow(),
@@ -4659,7 +4659,7 @@ builtin_builder::_texture(ir_texture_opcode opcode,
if (coord_size == coord_type->vector_elements) {
tex->coordinate = var_ref(P);
} else {
/* The incoming coordinate also has the projector or shadow comparitor,
/* The incoming coordinate also has the projector or shadow comparator,
* so we need to swizzle those away.
*/
tex->coordinate = swizzle_for_size(P, coord_size);
@@ -4676,12 +4676,12 @@ builtin_builder::_texture(ir_texture_opcode opcode,
*/
ir_variable *refz = in_var(glsl_type::float_type, "refz");
sig->parameters.push_tail(refz);
tex->shadow_comparitor = var_ref(refz);
tex->shadow_comparator = var_ref(refz);
} else {
/* The shadow comparitor is normally in the Z component, but a few types
/* The shadow comparator is normally in the Z component, but a few types
* have sufficiently large coordinates that it's in W.
*/
tex->shadow_comparitor = swizzle(P, MAX2(coord_size, SWIZZLE_Z), 1);
tex->shadow_comparator = swizzle(P, MAX2(coord_size, SWIZZLE_Z), 1);
}
}
@@ -4754,7 +4754,7 @@ builtin_builder::_textureCubeArrayShadow()
tex->set_sampler(var_ref(s), glsl_type::float_type);
tex->coordinate = var_ref(P);
tex->shadow_comparitor = var_ref(compare);
tex->shadow_comparator = var_ref(compare);
body.emit(ret(tex));

8
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -1898,7 +1898,7 @@ nir_visitor::visit(ir_texture *ir)
if (ir->projector != NULL)
num_srcs++;
if (ir->shadow_comparitor != NULL)
if (ir->shadow_comparator != NULL)
num_srcs++;
if (ir->offset != NULL)
num_srcs++;
@@ -1946,10 +1946,10 @@ nir_visitor::visit(ir_texture *ir)
src_number++;
}
if (ir->shadow_comparitor != NULL) {
if (ir->shadow_comparator != NULL) {
instr->src[src_number].src =
nir_src_for_ssa(evaluate_rvalue(ir->shadow_comparitor));
instr->src[src_number].src_type = nir_tex_src_comparitor;
nir_src_for_ssa(evaluate_rvalue(ir->shadow_comparator));
instr->src[src_number].src_type = nir_tex_src_comparator;
src_number++;
}

6
src/compiler/glsl/ir.h
View File

@@ -1787,7 +1787,7 @@ enum ir_texture_opcode {
*
* Texel offset (0 or an expression)
* | Projection divisor
* | | Shadow comparitor
* | | Shadow comparator
* | | |
* v v v
* (tex <type> <sampler> <coordinate> 0 1 ( ))
@@ -1808,7 +1808,7 @@ public:
ir_texture(enum ir_texture_opcode op)
: ir_rvalue(ir_type_texture),
op(op), sampler(NULL), coordinate(NULL), projector(NULL),
shadow_comparitor(NULL), offset(NULL)
shadow_comparator(NULL), offset(NULL)
{
memset(&lod_info, 0, sizeof(lod_info));
}
@@ -1863,7 +1863,7 @@ public:
* If there is no shadow comparison, this will be \c NULL. For the
* \c ir_txf opcode, this *must* be \c NULL.
*/
ir_rvalue *shadow_comparitor;
ir_rvalue *shadow_comparator;
/** Texel offset. */
ir_rvalue *offset;

4
src/compiler/glsl/ir_clone.cpp
View File

@@ -209,8 +209,8 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
new_tex->coordinate = this->coordinate->clone(mem_ctx, ht);
if (this->projector)
new_tex->projector = this->projector->clone(mem_ctx, ht);
if (this->shadow_comparitor) {
new_tex->shadow_comparitor = this->shadow_comparitor->clone(mem_ctx, ht);
if (this->shadow_comparator) {
new_tex->shadow_comparator = this->shadow_comparator->clone(mem_ctx, ht);
}
if (this->offset != NULL)

2
src/compiler/glsl/ir_equals.cpp
View File

@@ -143,7 +143,7 @@ ir_texture::equals(const ir_instruction *ir, enum ir_node_type ignore) const
if (!possibly_null_equals(projector, other->projector, ignore))
return false;
if (!possibly_null_equals(shadow_comparitor, other->shadow_comparitor, ignore))
if (!possibly_null_equals(shadow_comparator, other->shadow_comparator, ignore))
return false;
if (!possibly_null_equals(offset, other->offset, ignore))

4
src/compiler/glsl/ir_hv_accept.cpp
View File

@@ -178,8 +178,8 @@ ir_texture::accept(ir_hierarchical_visitor *v)
return (s == visit_continue_with_parent) ? visit_continue : s;
}
if (this->shadow_comparitor) {
s = this->shadow_comparitor->accept(v);
if (this->shadow_comparator) {
s = this->shadow_comparator->accept(v);
if (s != visit_continue)
return (s == visit_continue_with_parent) ? visit_continue : s;
}

4
src/compiler/glsl/ir_print_visitor.cpp
View File

@@ -324,9 +324,9 @@ void ir_print_visitor::visit(ir_texture *ir)
else
fprintf(f, "1");
if (ir->shadow_comparitor) {
if (ir->shadow_comparator) {
fprintf(f, " ");
ir->shadow_comparitor->accept(this);
ir->shadow_comparator->accept(this);
} else {
fprintf(f, " ()");
}

8
src/compiler/glsl/ir_reader.cpp
View File

@@ -1047,11 +1047,11 @@ ir_reader::read_texture(s_expression *expr)
}
if (s_shadow->subexpressions.is_empty()) {
tex->shadow_comparitor = NULL;
tex->shadow_comparator = NULL;
} else {
tex->shadow_comparitor = read_rvalue(s_shadow);
if (tex->shadow_comparitor == NULL) {
ir_read_error(NULL, "when reading shadow comparitor in (%s ..)",
tex->shadow_comparator = read_rvalue(s_shadow);
if (tex->shadow_comparator == NULL) {
ir_read_error(NULL, "when reading shadow comparator in (%s ..)",
tex->opcode_string());
return NULL;
}

2
src/compiler/glsl/ir_rvalue_visitor.cpp
View File

@@ -51,7 +51,7 @@ ir_rvalue_base_visitor::rvalue_visit(ir_texture *ir)
{
handle_rvalue(&ir->coordinate);
handle_rvalue(&ir->projector);
handle_rvalue(&ir->shadow_comparitor);
handle_rvalue(&ir->shadow_comparator);
handle_rvalue(&ir->offset);
switch (ir->op) {

8
src/compiler/glsl/lower_texture_projection.cpp
View File

@@ -78,11 +78,11 @@ lower_texture_projection_visitor::visit_leave(ir_texture *ir)
ir->coordinate,
deref);
if (ir->shadow_comparitor) {
if (ir->shadow_comparator) {
deref = new(mem_ctx) ir_dereference_variable(var);
ir->shadow_comparitor = new(mem_ctx) ir_expression(ir_binop_mul,
ir->shadow_comparitor->type,
ir->shadow_comparitor,
ir->shadow_comparator = new(mem_ctx) ir_expression(ir_binop_mul,
ir->shadow_comparator->type,
ir->shadow_comparator,
deref);
}

2
src/compiler/glsl/opt_tree_grafting.cpp
View File

@@ -267,7 +267,7 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
if (do_graft(&ir->coordinate) ||
do_graft(&ir->projector) ||
do_graft(&ir->offset) ||
do_graft(&ir->shadow_comparitor))
do_graft(&ir->shadow_comparator))
return visit_stop;
switch (ir->op) {

2
src/compiler/glsl_types.h
View File

@@ -752,7 +752,7 @@ struct glsl_type {
*
* Note that this is often different than actual coordinate type used in
* a texturing built-in function, since those pack additional values (such
* as the shadow comparitor or projector) into the coordinate type.
* as the shadow comparator or projector) into the coordinate type.
*/
int coordinate_components() const;

4
src/compiler/nir/nir.h
View File

@@ -1065,7 +1065,7 @@ INTRINSIC_IDX_ACCESSORS(interp_mode, INTERP_MODE, unsigned)
typedef enum {
nir_tex_src_coord,
nir_tex_src_projector,
nir_tex_src_comparitor, /* shadow comparitor */
nir_tex_src_comparator, /* shadow comparator */
nir_tex_src_offset,
nir_tex_src_bias,
nir_tex_src_lod,
@@ -1263,7 +1263,7 @@ nir_tex_instr_src_type(nir_tex_instr *instr, unsigned src)
}
case nir_tex_src_projector:
case nir_tex_src_comparitor:
case nir_tex_src_comparator:
case nir_tex_src_bias:
case nir_tex_src_ddx:
case nir_tex_src_ddy:

2
src/compiler/nir/nir_lower_tex.c
View File

@@ -55,7 +55,7 @@ project_src(nir_builder *b, nir_tex_instr *tex)
for (unsigned i = 0; i < tex->num_srcs; i++) {
switch (tex->src[i].src_type) {
case nir_tex_src_coord:
case nir_tex_src_comparitor:
case nir_tex_src_comparator:
break;
default:
continue;

4
src/compiler/nir/nir_print.c
View File

@@ -707,8 +707,8 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
case nir_tex_src_projector:
fprintf(fp, "(projector)");
break;
case nir_tex_src_comparitor:
fprintf(fp, "(comparitor)");
case nir_tex_src_comparator:
fprintf(fp, "(comparator)");
break;
case nir_tex_src_offset:
fprintf(fp, "(offset)");

2
src/compiler/spirv/spirv_to_nir.c
View File

@@ -1460,7 +1460,7 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
case SpvOpImageSampleProjDrefExplicitLod:
case SpvOpImageDrefGather:
/* These all have an explicit depth value as their next source */
(*p++) = vtn_tex_src(b, w[idx++], nir_tex_src_comparitor);
(*p++) = vtn_tex_src(b, w[idx++], nir_tex_src_comparator);
break;
case SpvOpImageGather: