diff options
| author | Christian König <[email protected]> | 2013-03-04 15:35:30 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2013-03-07 10:03:22 +0100 |
| commit | b8f4ca3d85b8a192b5c1940f9a4b558f1ce78d8f (patch) | |
| tree | 019359507cfdd556f67524057d9142a8642f26bc /src/gallium/drivers/radeonsi | |
| parent | de80e560bcdf365845cfdfbfd919e2f91cea2b26 (diff) | |
radeon/llvm: replace shader type intrinsic with function attribute
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_shader.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c index 958d3a3a4d6..af05078012e 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_shader.c +++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c @@ -542,17 +542,6 @@ static void si_llvm_init_export_args(struct lp_build_tgsi_context *bld_base, * stage. */ } -static void si_llvm_emit_prologue(struct lp_build_tgsi_context *bld_base) -{ - struct si_shader_context *si_shader_ctx = si_shader_context(bld_base); - struct gallivm_state *gallivm = bld_base->base.gallivm; - lp_build_intrinsic_unary(gallivm->builder, - "llvm.AMDGPU.shader.type", - LLVMVoidTypeInContext(gallivm->context), - lp_build_const_int32(gallivm, si_shader_ctx->type)); -} - - static void si_alpha_test(struct lp_build_tgsi_context *bld_base, unsigned index) { @@ -1032,7 +1021,6 @@ int si_pipe_shader_create( shader->shader.uses_kill = shader_info.uses_kill; bld_base->info = &shader_info; bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant; - bld_base->emit_prologue = si_llvm_emit_prologue; bld_base->emit_epilogue = si_llvm_emit_epilogue; bld_base->op_actions[TGSI_OPCODE_TEX] = tex_action; @@ -1048,6 +1036,8 @@ int si_pipe_shader_create( si_shader_ctx.type = si_shader_ctx.parse.FullHeader.Processor.Processor; si_shader_ctx.rctx = rctx; + radeon_llvm_shader_type(si_shader_ctx.radeon_bld.main_fn, si_shader_ctx.type); + shader->shader.nr_cbufs = rctx->framebuffer.nr_cbufs; /* Dump TGSI code before doing TGSI->LLVM conversion in case the |