From dfb3abbaecfbe30b8858a5428c604f9d90f65505 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 12 Dec 2014 22:38:41 -0800 Subject: nir: Remove predication We stopped generating predicates in glsl_to_nir some time ago. Right now, it's all dead untested code that I'm not convinced always worked in the first place. If we decide we want them back, we can revert this patch. Reviewed-by: Connor Abbott --- src/glsl/nir/nir.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'src/glsl/nir/nir.c') diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index cb788d47259..bbf1a865706 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -381,9 +381,6 @@ nir_alu_instr_create(void *mem_ctx, nir_op op) for (unsigned i = 0; i < num_srcs; i++) alu_src_init(&instr->src[i]); - instr->has_predicate = false; - src_init(&instr->predicate); - return instr; } @@ -406,9 +403,6 @@ nir_load_const_instr_create(void *mem_ctx) instr->num_components = 0; instr->array_elems = 0; - instr->has_predicate = false; - src_init(&instr->predicate); - return instr; } @@ -429,9 +423,6 @@ nir_intrinsic_instr_create(void *mem_ctx, nir_intrinsic_op op) for (unsigned i = 0; i < num_srcs; i++) src_init(&instr->src[i]); - instr->has_predicate = false; - src_init(&instr->predicate); - return instr; } @@ -446,9 +437,6 @@ nir_call_instr_create(void *mem_ctx, nir_function_overload *callee) instr->params = ralloc_array(mem_ctx, nir_deref_var *, instr->num_params); instr->return_deref = NULL; - instr->has_predicate = false; - src_init(&instr->predicate); - return instr; } @@ -464,9 +452,6 @@ nir_tex_instr_create(void *mem_ctx, unsigned num_srcs) for (unsigned i = 0; i < 4; i++) src_init(&instr->src[i]); - instr->has_predicate = false; - src_init(&instr->predicate); - instr->sampler_index = 0; instr->sampler_array_size = 0; instr->sampler = NULL; @@ -1521,10 +1506,6 @@ visit_alu_src(nir_alu_instr *instr, nir_foreach_src_cb cb, void *state) if (!visit_src(&instr->src[i].src, cb, state)) return false; - if (instr->has_predicate) - if (!visit_src(&instr->predicate, cb, state)) - return false; - return true; } @@ -1535,10 +1516,6 @@ visit_tex_src(nir_tex_instr *instr, nir_foreach_src_cb cb, void *state) if (!visit_src(&instr->src[i], cb, state)) return false; - if (instr->has_predicate) - if (!visit_src(&instr->predicate, cb, state)) - return false; - if (instr->sampler != NULL) if (!visit_deref_src(instr->sampler, cb, state)) return false; @@ -1561,20 +1538,12 @@ visit_intrinsic_src(nir_intrinsic_instr *instr, nir_foreach_src_cb cb, if (!visit_deref_src(instr->variables[i], cb, state)) return false; - if (instr->has_predicate) - if (!visit_src(&instr->predicate, cb, state)) - return false; - return true; } static bool visit_call_src(nir_call_instr *instr, nir_foreach_src_cb cb, void *state) { - if (instr->has_predicate) - if (!visit_src(&instr->predicate, cb, state)) - return false; - return true; } @@ -1582,10 +1551,6 @@ static bool visit_load_const_src(nir_load_const_instr *instr, nir_foreach_src_cb cb, void *state) { - if (instr->has_predicate) - if (!visit_src(&instr->predicate, cb, state)) - return false; - return true; } -- cgit v1.2.3