From 1abb1a97b0559b103c4a458def317c6440491a76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 17 Sep 2014 22:44:22 +0200 Subject: [PATCH] radeonsi: don't pass the context to the shader translator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This should prevent accessing context state there. Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_compute.c | 2 +- src/gallium/drivers/radeonsi/si_shader.c | 29 ++++++++++------------- src/gallium/drivers/radeonsi/si_shader.h | 7 +++--- src/gallium/drivers/radeonsi/si_state.c | 2 +- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 908826850f1..4b2662d27a2 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -81,7 +81,7 @@ static void *si_create_compute_state( for (i = 0; i < program->num_kernels; i++) { LLVMModuleRef mod = radeon_llvm_get_kernel_module(program->llvm_ctx, i, code, header->num_bytes); - si_compile_llvm(sctx, &program->kernels[i], mod); + si_compile_llvm(sctx->screen, &program->kernels[i], mod); LLVMDisposeModule(mod); } diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index c1f607617a1..72618852430 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2625,16 +2625,16 @@ static void preload_streamout_buffers(struct si_shader_context *si_shader_ctx) } } -int si_compile_llvm(struct si_context *sctx, struct si_shader *shader, - LLVMModuleRef mod) +int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader, + LLVMModuleRef mod) { unsigned r; /* llvm_compile result */ unsigned i; unsigned char *ptr; struct radeon_shader_binary binary; - bool dump = r600_can_dump_shader(&sctx->screen->b, + bool dump = r600_can_dump_shader(&sscreen->b, shader->selector ? shader->selector->tokens : NULL); - const char * gpu_family = r600_get_llvm_processor_name(sctx->screen->b.family); + const char * gpu_family = r600_get_llvm_processor_name(sscreen->b.family); unsigned code_size; /* Use LLVM to compile shader */ @@ -2690,20 +2690,20 @@ int si_compile_llvm(struct si_context *sctx, struct si_shader *shader, /* copy new shader */ code_size = binary.code_size + binary.rodata_size; r600_resource_reference(&shader->bo, NULL); - shader->bo = si_resource_create_custom(sctx->b.b.screen, PIPE_USAGE_IMMUTABLE, + shader->bo = si_resource_create_custom(&sscreen->b.b, PIPE_USAGE_IMMUTABLE, code_size); if (shader->bo == NULL) { return -ENOMEM; } - ptr = sctx->b.ws->buffer_map(shader->bo->cs_buf, sctx->b.rings.gfx.cs, PIPE_TRANSFER_WRITE); + ptr = sscreen->b.ws->buffer_map(shader->bo->cs_buf, NULL, PIPE_TRANSFER_WRITE); util_memcpy_cpu_to_le32(ptr, binary.code, binary.code_size); if (binary.rodata_size > 0) { ptr += binary.code_size; util_memcpy_cpu_to_le32(ptr, binary.rodata, binary.rodata_size); } - sctx->b.ws->buffer_unmap(shader->bo->cs_buf); + sscreen->b.ws->buffer_unmap(shader->bo->cs_buf); free(binary.code); free(binary.config); @@ -2713,7 +2713,7 @@ int si_compile_llvm(struct si_context *sctx, struct si_shader *shader, } /* Generate code for the hardware VS shader stage to go with a geometry shader */ -static int si_generate_gs_copy_shader(struct si_context *sctx, +static int si_generate_gs_copy_shader(struct si_screen *sscreen, struct si_shader_context *si_shader_ctx, bool dump) { @@ -2792,7 +2792,7 @@ static int si_generate_gs_copy_shader(struct si_context *sctx, if (dump) fprintf(stderr, "Copy Vertex Shader for Geometry Shader:\n\n"); - r = si_compile_llvm(sctx, si_shader_ctx->shader, + r = si_compile_llvm(sscreen, si_shader_ctx->shader, bld_base->base.gallivm->module); radeon_llvm_dispose(&si_shader_ctx->radeon_bld); @@ -2801,18 +2801,15 @@ static int si_generate_gs_copy_shader(struct si_context *sctx, return r; } -int si_shader_create( - struct pipe_context *ctx, - struct si_shader *shader) +int si_shader_create(struct si_screen *sscreen, struct si_shader *shader) { - struct si_context *sctx = (struct si_context*)ctx; struct si_shader_selector *sel = shader->selector; struct si_shader_context si_shader_ctx; struct tgsi_shader_info shader_info; struct lp_build_tgsi_context * bld_base; LLVMModuleRef mod; int r = 0; - bool dump = r600_can_dump_shader(&sctx->screen->b, sel->tokens); + bool dump = r600_can_dump_shader(&sscreen->b, sel->tokens); /* Dump TGSI code before doing TGSI->LLVM conversion in case the * conversion fails. */ @@ -2943,7 +2940,7 @@ int si_shader_create( radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld); mod = bld_base->base.gallivm->module; - r = si_compile_llvm(sctx, shader, mod); + r = si_compile_llvm(sscreen, shader, mod); if (r) { fprintf(stderr, "LLVM failed to compile shader\n"); goto out; @@ -2956,7 +2953,7 @@ int si_shader_create( shader->gs_copy_shader->selector = shader->selector; shader->gs_copy_shader->key = shader->key; si_shader_ctx.shader = shader->gs_copy_shader; - if ((r = si_generate_gs_copy_shader(sctx, &si_shader_ctx, dump))) { + if ((r = si_generate_gs_copy_shader(sscreen, &si_shader_ctx, dump))) { free(shader->gs_copy_shader); shader->gs_copy_shader = NULL; goto out; diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 637c69d3097..d8a63df6275 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -200,10 +200,9 @@ static inline struct si_shader* si_get_vs_state(struct si_context *sctx) } /* radeonsi_shader.c */ -int si_shader_create(struct pipe_context *ctx, struct si_shader *shader); -int si_shader_create(struct pipe_context *ctx, struct si_shader *shader); -int si_compile_llvm(struct si_context *sctx, struct si_shader *shader, - LLVMModuleRef mod); +int si_shader_create(struct si_screen *sscreen, struct si_shader *shader); +int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader, + LLVMModuleRef mod); void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader); #endif diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 37774d7ba58..2aa9aad2e07 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2287,7 +2287,7 @@ int si_shader_select(struct pipe_context *ctx, shader->next_variant = sel->current; sel->current = shader; - r = si_shader_create(ctx, shader); + r = si_shader_create((struct si_screen*)ctx->screen, shader); if (unlikely(r)) { R600_ERR("Failed to build shader variant (type=%u) %d\n", sel->type, r); -- 2.30.2