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

glsl/nir: Only claim to handle intrinsic functions

Browse Source 
Non-intrinsic function handling has never actually been tested and
probably doesn't work.  Just get rid of it for now.  We can always add
it back in later if it's useful.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-19 15:10:29 -07:00
parent d80c342d89
commit 7f41a99cac
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,14 +617,7 @@ nir_visitor::visit(ir_loop_jump *ir)
void
nir_visitor::visit(ir_return *ir)
{
if (ir->value != NULL) {
nir_intrinsic_instr *copy =
nir_intrinsic_instr_create(this->shader, nir_intrinsic_copy_var);
copy->variables[0] = nir_deref_var_create(copy, this->impl->return_var);
copy->variables[1] = evaluate_deref(&copy->instr, ir->value);
}
assert(ir->value == NULL);
nir_jump_instr *instr = nir_jump_instr_create(this->shader, nir_jump_return);
nir_builder_instr_insert(&b, &instr->instr);
}
@@ -1246,21 +1239,7 @@ nir_visitor::visit(ir_call *ir)
return;
}
struct hash_entry *entry =
_mesa_hash_table_search(this->overload_table, ir->callee);
assert(entry);
nir_function *callee = (nir_function *) entry->data;
nir_call_instr *instr = nir_call_instr_create(this->shader, callee);
unsigned i = 0;
foreach_in_list(ir_dereference, param, &ir->actual_parameters) {
instr->params[i] = evaluate_deref(&instr->instr, param);
i++;
}
instr->return_deref = evaluate_deref(&instr->instr, ir->return_deref);
nir_builder_instr_insert(&b, &instr->instr);
unreachable("glsl_to_nir only handles function calls to intrinsics");
}
void