diff options
| author | Nicolai Hähnle <[email protected]> | 2017-05-19 18:17:12 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-07-31 14:55:33 +0200 |
| commit | 1ea972e08af310a4489e72010ee0c1cefa985cb2 (patch) | |
| tree | 9755e0a573360b1e51e5623b407a4e87bc547088 | |
| parent | 9df23db13d706a28190325b64e6c3f61eedc6206 (diff) | |
radeonsi: pass si_shader_context to get_primitive_id
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index cd1be493157..26a43db1318 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -615,11 +615,10 @@ static void declare_input_vs( } } -static LLVMValueRef get_primitive_id(struct lp_build_tgsi_context *bld_base, + +static LLVMValueRef get_primitive_id(struct si_shader_context *ctx, unsigned swizzle) { - struct si_shader_context *ctx = si_shader_context(bld_base); - if (swizzle > 0) return ctx->i32_0; @@ -1163,7 +1162,7 @@ static LLVMValueRef fetch_input_gs( LLVMValueRef value; if (swizzle != ~0 && semantic_name == TGSI_SEMANTIC_PRIMID) - return get_primitive_id(bld_base, swizzle); + return get_primitive_id(ctx, swizzle); if (!reg->Register.Dimension) return NULL; @@ -1640,7 +1639,7 @@ static void declare_system_value(struct si_shader_context *ctx, } case TGSI_SEMANTIC_PRIMID: - value = get_primitive_id(&ctx->bld_base, 0); + value = get_primitive_id(ctx, 0); break; case TGSI_SEMANTIC_GRID_SIZE: @@ -3103,7 +3102,7 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base) outputs[i].semantic_name = TGSI_SEMANTIC_PRIMID; outputs[i].semantic_index = 0; outputs[i].values[0] = bitcast(bld_base, TGSI_TYPE_FLOAT, - get_primitive_id(bld_base, 0)); + get_primitive_id(ctx, 0)); for (j = 1; j < 4; j++) outputs[i].values[j] = LLVMConstReal(ctx->f32, 0); |