diff options
| author | Jason Ekstrand <[email protected]> | 2017-08-28 17:06:24 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-10-12 22:39:29 -0700 |
| commit | 3442c9fc3ebd5de2c9d6c0b9ce541f182809fe82 (patch) | |
| tree | 7158befb76d617f1afb8cc4e7f4fc79d37836de9 | |
| parent | a0947921eb01f4c037de28b753fc10f86a25fc65 (diff) | |
nir: Get rid of the variable on vote intrinsics
This looks like a copy+paste error. They don't actually write into that
variable as would be implied by putting the return there.
Reviewed-by: Lionel Landwerlin <[email protected]>
Cc: [email protected]
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_intrinsics.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index ce8da1ce438..5e9544f51b1 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -1155,8 +1155,6 @@ nir_visitor::visit(ir_call *ir) case nir_intrinsic_vote_eq: { nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); - instr->variables[0] = evaluate_deref(&instr->instr, ir->return_deref); - ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value)); diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index ea51525056d..0de7080bfaf 100644 --- a/src/compiler/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h @@ -121,9 +121,9 @@ BARRIER(memory_barrier_shared) INTRINSIC(discard_if, 1, ARR(1), false, 0, 0, 0, xx, xx, xx, 0) /** ARB_shader_group_vote intrinsics */ -INTRINSIC(vote_any, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) -INTRINSIC(vote_all, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) -INTRINSIC(vote_eq, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(vote_any, 1, ARR(1), true, 1, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(vote_all, 1, ARR(1), true, 1, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(vote_eq, 1, ARR(1), true, 1, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) /** * Basic Geometry Shader intrinsics. |