glsl: Add ir_samples_identical opcode
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
@@ -1421,7 +1421,7 @@ ir_dereference::is_lvalue() const
|
||||
}
|
||||
|
||||
|
||||
static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels", "texture_samples" };
|
||||
static const char * const tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4", "query_levels", "texture_samples", "samples_identical" };
|
||||
|
||||
const char *ir_texture::opcode_string()
|
||||
{
|
||||
@@ -1455,6 +1455,10 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
|
||||
} else if (this->op == ir_lod) {
|
||||
assert(type->vector_elements == 2);
|
||||
assert(type->base_type == GLSL_TYPE_FLOAT);
|
||||
} else if (this->op == ir_samples_identical) {
|
||||
assert(type == glsl_type::bool_type);
|
||||
assert(sampler->type->base_type == GLSL_TYPE_SAMPLER);
|
||||
assert(sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_MS);
|
||||
} else {
|
||||
assert(sampler->type->sampler_type == (int) type->base_type);
|
||||
if (sampler->type->sampler_shadow)
|
||||
|
@@ -1965,6 +1965,7 @@ enum ir_texture_opcode {
|
||||
ir_tg4, /**< Texture gather */
|
||||
ir_query_levels, /**< Texture levels query */
|
||||
ir_texture_samples, /**< Texture samples query */
|
||||
ir_samples_identical, /**< Query whether all samples are definitely identical. */
|
||||
};
|
||||
|
||||
|
||||
@@ -1991,6 +1992,7 @@ enum ir_texture_opcode {
|
||||
* (lod <type> <sampler> <coordinate>)
|
||||
* (tg4 <type> <sampler> <coordinate> <offset> <component>)
|
||||
* (query_levels <type> <sampler>)
|
||||
* (samples_identical <sampler> <coordinate>)
|
||||
*/
|
||||
class ir_texture : public ir_rvalue {
|
||||
public:
|
||||
|
@@ -223,6 +223,7 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
|
||||
case ir_lod:
|
||||
case ir_query_levels:
|
||||
case ir_texture_samples:
|
||||
case ir_samples_identical:
|
||||
break;
|
||||
case ir_txb:
|
||||
new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);
|
||||
|
@@ -157,6 +157,7 @@ ir_texture::equals(const ir_instruction *ir, enum ir_node_type ignore) const
|
||||
case ir_lod:
|
||||
case ir_query_levels:
|
||||
case ir_texture_samples:
|
||||
case ir_samples_identical:
|
||||
break;
|
||||
case ir_txb:
|
||||
if (!lod_info.bias->equals(other->lod_info.bias, ignore))
|
||||
|
@@ -195,6 +195,7 @@ ir_texture::accept(ir_hierarchical_visitor *v)
|
||||
case ir_lod:
|
||||
case ir_query_levels:
|
||||
case ir_texture_samples:
|
||||
case ir_samples_identical:
|
||||
break;
|
||||
case ir_txb:
|
||||
s = this->lod_info.bias->accept(v);
|
||||
|
@@ -268,6 +268,14 @@ void ir_print_visitor::visit(ir_texture *ir)
|
||||
{
|
||||
fprintf(f, "(%s ", ir->opcode_string());
|
||||
|
||||
if (ir->op == ir_samples_identical) {
|
||||
ir->sampler->accept(this);
|
||||
fprintf(f, " ");
|
||||
ir->coordinate->accept(this);
|
||||
fprintf(f, ")");
|
||||
return;
|
||||
}
|
||||
|
||||
print_type(f, ir->type);
|
||||
fprintf(f, " ");
|
||||
|
||||
@@ -334,6 +342,8 @@ void ir_print_visitor::visit(ir_texture *ir)
|
||||
case ir_tg4:
|
||||
ir->lod_info.component->accept(this);
|
||||
break;
|
||||
case ir_samples_identical:
|
||||
unreachable(!"ir_samples_identical was already handled");
|
||||
};
|
||||
fprintf(f, ")");
|
||||
}
|
||||
|
@@ -59,6 +59,7 @@ ir_rvalue_base_visitor::rvalue_visit(ir_texture *ir)
|
||||
case ir_lod:
|
||||
case ir_query_levels:
|
||||
case ir_texture_samples:
|
||||
case ir_samples_identical:
|
||||
break;
|
||||
case ir_txb:
|
||||
handle_rvalue(&ir->lod_info.bias);
|
||||
|
@@ -275,6 +275,7 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir)
|
||||
case ir_lod:
|
||||
case ir_query_levels:
|
||||
case ir_texture_samples:
|
||||
case ir_samples_identical:
|
||||
break;
|
||||
case ir_txb:
|
||||
if (do_graft(&ir->lod_info.bias))
|
||||
|
@@ -1919,6 +1919,8 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
|
||||
case ir_query_levels:
|
||||
assert(!"Unexpected ir_query_levels opcode");
|
||||
break;
|
||||
case ir_samples_identical:
|
||||
unreachable("Unexpected ir_samples_identical opcode");
|
||||
case ir_texture_samples:
|
||||
unreachable("Unexpected ir_texture_samples opcode");
|
||||
}
|
||||
|
@@ -3236,6 +3236,8 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
|
||||
case ir_texture_samples:
|
||||
opcode = TGSI_OPCODE_TXQS;
|
||||
break;
|
||||
case ir_samples_identical:
|
||||
unreachable("Unexpected ir_samples_identical opcode");
|
||||
}
|
||||
|
||||
if (ir->projector) {
|
||||
|
Reference in New Issue
Block a user