Module: Mesa Branch: master Commit: 92b3a99ce5f54f2c692c8db5a0c471aac0ff7c82 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92b3a99ce5f54f2c692c8db5a0c471aac0ff7c82
Author: Vincent Lejeune <[email protected]> Date: Sun Sep 23 15:53:57 2012 +0200 r600g: add some members to radeon_llvm_context Reviewed-by: Tom Stellard <[email protected]> --- src/gallium/drivers/r600/r600_shader.c | 5 +++++ src/gallium/drivers/radeon/radeon_llvm.h | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 20bf79d..bf4877a 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -1332,6 +1332,11 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, unsigned dump = 0; memset(&radeon_llvm_ctx, 0, sizeof(radeon_llvm_ctx)); radeon_llvm_ctx.reserved_reg_count = ctx.file_offset[TGSI_FILE_INPUT]; + radeon_llvm_ctx.type = ctx.type; + radeon_llvm_ctx.two_side = shader->two_side; + radeon_llvm_ctx.face_input = ctx.face_gpr; + radeon_llvm_ctx.r600_inputs = ctx.shader->input; + radeon_llvm_ctx.chip_class = ctx.bc->chip_class; mod = r600_tgsi_llvm(&radeon_llvm_ctx, tokens); if (debug_get_bool_option("R600_DUMP_SHADERS", FALSE)) { dump = 1; diff --git a/src/gallium/drivers/radeon/radeon_llvm.h b/src/gallium/drivers/radeon/radeon_llvm.h index 7a32bb0..6118b11 100644 --- a/src/gallium/drivers/radeon/radeon_llvm.h +++ b/src/gallium/drivers/radeon/radeon_llvm.h @@ -54,6 +54,12 @@ struct radeon_llvm_context { struct lp_build_tgsi_soa_context soa; + unsigned chip_class; + unsigned type; + unsigned face_input; + unsigned two_side; + struct r600_shader_io * r600_inputs; + /*=== Front end configuration ===*/ /* Special Intrinsics */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
