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

ac,radeonsi: add ac_shader_abi::emit_outputs for hardware VS shaders

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-05-19 18:32:57 +02:00
parent 1ea972e08a
commit 0c3b6a4bd9
3 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/common/ac_shader_abi.h
View File

@@ -42,6 +42,10 @@ struct ac_shader_abi {
* driver_location. * driver_location.
*/ */
LLVMValueRef *inputs; LLVMValueRef *inputs;
void (*emit_outputs)(struct ac_shader_abi *abi,
unsigned max_outputs,
LLVMValueRef *addrs);
}; };
#endif /* AC_SHADER_ABI_H */ #endif /* AC_SHADER_ABI_H */

37
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -3030,15 +3030,18 @@ static void si_llvm_emit_gs_epilogue(struct lp_build_tgsi_context *bld_base)
lp_build_endif(&ctx->merged_wrap_if_state); lp_build_endif(&ctx->merged_wrap_if_state);
} }
static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base) static void si_llvm_emit_vs_epilogue(struct ac_shader_abi *abi,
unsigned max_outputs,
LLVMValueRef *addrs)
{ {
struct si_shader_context *ctx = si_shader_context(bld_base); struct si_shader_context *ctx = si_shader_context_from_abi(abi);
struct gallivm_state *gallivm = &ctx->gallivm; struct gallivm_state *gallivm = &ctx->gallivm;
struct tgsi_shader_info *info = &ctx->shader->selector->info; struct tgsi_shader_info *info = &ctx->shader->selector->info;
struct si_shader_output_values *outputs = NULL; struct si_shader_output_values *outputs = NULL;
int i,j; int i,j;
assert(!ctx->shader->is_gs_copy_shader); assert(!ctx->shader->is_gs_copy_shader);
assert(info->num_outputs <= max_outputs);
outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0])); outputs = MALLOC((info->num_outputs + 1) * sizeof(outputs[0]));
@@ -3069,7 +3072,7 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base)
} }
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
addr = ctx->outputs[i][j]; addr = addrs[4 * i + j];
val = LLVMBuildLoad(gallivm->builder, addr, ""); val = LLVMBuildLoad(gallivm->builder, addr, "");
val = ac_build_clamp(&ctx->ac, val); val = ac_build_clamp(&ctx->ac, val);
LLVMBuildStore(gallivm->builder, val, addr); LLVMBuildStore(gallivm->builder, val, addr);
@@ -3087,7 +3090,7 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base)
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
outputs[i].values[j] = outputs[i].values[j] =
LLVMBuildLoad(gallivm->builder, LLVMBuildLoad(gallivm->builder,
ctx->outputs[i][j], addrs[4 * i + j],
""); "");
outputs[i].vertex_stream[j] = outputs[i].vertex_stream[j] =
(info->output_streams[i] >> (2 * j)) & 3; (info->output_streams[i] >> (2 * j)) & 3;
@@ -3101,8 +3104,8 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base)
if (ctx->shader->key.mono.u.vs_export_prim_id) { if (ctx->shader->key.mono.u.vs_export_prim_id) {
outputs[i].semantic_name = TGSI_SEMANTIC_PRIMID; outputs[i].semantic_name = TGSI_SEMANTIC_PRIMID;
outputs[i].semantic_index = 0; outputs[i].semantic_index = 0;
outputs[i].values[0] = bitcast(bld_base, TGSI_TYPE_FLOAT, outputs[i].values[0] = LLVMBuildBitCast(gallivm->builder,
get_primitive_id(ctx, 0)); get_primitive_id(ctx, 0), ctx->f32, "");
for (j = 1; j < 4; j++) for (j = 1; j < 4; j++)
outputs[i].values[j] = LLVMConstReal(ctx->f32, 0); outputs[i].values[j] = LLVMConstReal(ctx->f32, 0);
@@ -3111,10 +3114,18 @@ static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base)
i++; i++;
} }
si_llvm_export_vs(bld_base, outputs, i); si_llvm_export_vs(&ctx->bld_base, outputs, i);
FREE(outputs); FREE(outputs);
} }
static void si_tgsi_emit_epilogue(struct lp_build_tgsi_context *bld_base)
{
struct si_shader_context *ctx = si_shader_context(bld_base);
ctx->abi.emit_outputs(&ctx->abi, RADEON_LLVM_MAX_OUTPUTS,
&ctx->outputs[0][0]);
}
struct si_ps_exports { struct si_ps_exports {
unsigned num; unsigned num;
struct ac_export_args args[10]; struct ac_export_args args[10];
@@ -5562,8 +5573,10 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
bld_base->emit_epilogue = si_llvm_emit_ls_epilogue; bld_base->emit_epilogue = si_llvm_emit_ls_epilogue;
else if (shader->key.as_es) else if (shader->key.as_es)
bld_base->emit_epilogue = si_llvm_emit_es_epilogue; bld_base->emit_epilogue = si_llvm_emit_es_epilogue;
else else {
bld_base->emit_epilogue = si_llvm_emit_vs_epilogue; ctx->abi.emit_outputs = si_llvm_emit_vs_epilogue;
bld_base->emit_epilogue = si_tgsi_emit_epilogue;
}
break; break;
case PIPE_SHADER_TESS_CTRL: case PIPE_SHADER_TESS_CTRL:
bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_tcs; bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_tcs;
@@ -5575,8 +5588,10 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_tes; bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_tes;
if (shader->key.as_es) if (shader->key.as_es)
bld_base->emit_epilogue = si_llvm_emit_es_epilogue; bld_base->emit_epilogue = si_llvm_emit_es_epilogue;
else else {
bld_base->emit_epilogue = si_llvm_emit_vs_epilogue; ctx->abi.emit_outputs = si_llvm_emit_vs_epilogue;
bld_base->emit_epilogue = si_tgsi_emit_epilogue;
}
break; break;
case PIPE_SHADER_GEOMETRY: case PIPE_SHADER_GEOMETRY:
bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_gs; bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_gs;

7
src/gallium/drivers/radeonsi/si_shader_internal.h
View File

@@ -245,6 +245,13 @@ si_shader_context(struct lp_build_tgsi_context *bld_base)
return (struct si_shader_context*)bld_base; return (struct si_shader_context*)bld_base;
} }
static inline struct si_shader_context *
si_shader_context_from_abi(struct ac_shader_abi *abi)
{
struct si_shader_context *ctx = NULL;
return container_of(abi, ctx, abi);
}
void si_llvm_add_attribute(LLVMValueRef F, const char *name, int value); void si_llvm_add_attribute(LLVMValueRef F, const char *name, int value);
unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary, unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,