diff options
| author | Boyan Ding <[email protected]> | 2017-04-12 21:14:22 +0800 |
|---|---|---|
| committer | Andres Gomez <[email protected]> | 2017-04-26 12:34:23 +0300 |
| commit | 4b3efe993e18168d6fe49bad4e8272b42e5db83c (patch) | |
| tree | d56f0ca87c23976fc136f889e09f3b5e2d9176f5 /src/compiler | |
| parent | 255d689dcd09a8c3737b11d7491aeab3547a2525 (diff) | |
nir: Destination component count of shader_clock intrinsic is 2
This fixes the following error when using ARB_shader_clock on i965:
vec1 32 ssa_0 = intrinsic shader_clock () () ()
intrinsic store_var (ssa_0) (clock_retval) (3) /* wrmask=xy */
error: src->ssa->num_components == num_components (nir/nir_validate.c:204)
Signed-off-by: Boyan Ding <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Cc: [email protected]
(cherry picked from commit ff29f488d4a2d05cdefbca7d675c479b2a1780a0)
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 3 | ||||
| -rw-r--r-- | src/compiler/nir/nir_intrinsics.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 33f71bf416a..35325713fb6 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -927,7 +927,8 @@ nir_visitor::visit(ir_call *ir) nir_builder_instr_insert(&b, &instr->instr); break; case nir_intrinsic_shader_clock: - nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); + nir_ssa_dest_init(&instr->instr, &instr->dest, 2, 32, NULL); + instr->num_components = 2; nir_builder_instr_insert(&b, &instr->instr); break; case nir_intrinsic_store_ssbo: { diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index 5c8f283abfd..65bbc8000c0 100644 --- a/src/compiler/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h @@ -91,7 +91,7 @@ BARRIER(memory_barrier) * The latter can be used as code motion barrier, which is currently not * feasible with NIR. */ -INTRINSIC(shader_clock, 0, ARR(0), true, 1, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(shader_clock, 0, ARR(0), true, 2, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) /* * Memory barrier with semantics analogous to the compute shader |