diff options
author | Marek Olšák <[email protected]> | 2014-04-23 16:15:36 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2014-07-18 01:58:58 +0200 |
commit | 09056b352d6de42d24decafdcd6819ad70dc98f1 (patch) | |
tree | a01e2e6d914a09447e5106891d1164d994ce9a24 /src/gallium/drivers/radeonsi/si_shader.c | |
parent | a66d9341393b9a82aa197e8bab942c6de1ecf02e (diff) |
radeonsi: use an SGPR instead of VGT_INDX_OFFSET
The draw indirect packets cannot set VGT_INDX_OFFSET, they can only set user
data SGPRs. This is the only way to support start/index_bias with indirect
drawing.
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 5d9c497b0bc..4c3e83f9605 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -223,10 +223,12 @@ static void declare_input_vs( si_shader_ctx->shader->shader.uses_instanceid = true; buffer_index = get_instance_index_for_fetch(&si_shader_ctx->radeon_bld, divisor); } else { - /* Load the buffer index, which is always stored in VGPR0 - * for Vertex Shaders */ - buffer_index = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, - si_shader_ctx->param_vertex_id); + /* Load the buffer index for vertices. */ + LLVMValueRef vertex_id = LLVMGetParam(si_shader_ctx->radeon_bld.main_fn, + si_shader_ctx->param_vertex_id); + LLVMValueRef base_vertex = LLVMGetParam(radeon_bld->main_fn, + SI_PARAM_BASE_VERTEX); + buffer_index = LLVMBuildAdd(gallivm->builder, base_vertex, vertex_id, ""); } vec4_type = LLVMVectorType(base->elem_type, 4); @@ -2342,6 +2344,7 @@ static void create_function(struct si_shader_context *si_shader_ctx) switch (si_shader_ctx->type) { case TGSI_PROCESSOR_VERTEX: params[SI_PARAM_VERTEX_BUFFER] = const_array(v16i8, SI_NUM_VERTEX_BUFFERS); + params[SI_PARAM_BASE_VERTEX] = i32; params[SI_PARAM_START_INSTANCE] = i32; num_params = SI_PARAM_START_INSTANCE+1; if (shader->key.vs.as_es) { |