X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_cs.c;h=cc564a012b6d515f99012773b6f409413cbfdd6a;hb=8c47ccb13a198f4d38c772df1de457de34dde23e;hp=8b13b49b6ff2b94135e58821fcb29d34eab4a717;hpb=c3b8bf9bc90763c84558199511d062dde18a5d1e;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c index 8b13b49b6ff..cc564a012b6 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.c +++ b/src/mesa/drivers/dri/i965/brw_cs.c @@ -24,19 +24,16 @@ #include "util/ralloc.h" #include "brw_context.h" #include "brw_cs.h" -#include "brw_eu.h" #include "brw_wm.h" -#include "brw_shader.h" #include "intel_mipmap_tree.h" #include "brw_state.h" #include "intel_batchbuffer.h" -#include "brw_nir.h" +#include "compiler/brw_nir.h" #include "brw_program.h" #include "compiler/glsl/ir_uniform.h" static void assign_cs_binding_table_offsets(const struct gen_device_info *devinfo, - const struct gl_shader_program *shader_prog, const struct gl_program *prog, struct brw_cs_prog_data *prog_data) { @@ -46,14 +43,12 @@ assign_cs_binding_table_offsets(const struct gen_device_info *devinfo, prog_data->binding_table.work_groups_start = next_binding_table_offset; next_binding_table_offset++; - brw_assign_common_binding_table_offsets(MESA_SHADER_COMPUTE, devinfo, - shader_prog, prog, &prog_data->base, + brw_assign_common_binding_table_offsets(devinfo, prog, &prog_data->base, next_binding_table_offset); } static bool brw_codegen_cs_prog(struct brw_context *brw, - struct gl_shader_program *prog, struct brw_program *cp, struct brw_cs_prog_key *key) { @@ -66,26 +61,22 @@ brw_codegen_cs_prog(struct brw_context *brw, bool start_busy = false; double start_time = 0; - struct brw_shader *cs = - (struct brw_shader *) prog->_LinkedShaders[MESA_SHADER_COMPUTE]; - assert (cs); - memset(&prog_data, 0, sizeof(prog_data)); - if (prog->Comp.SharedSize > 64 * 1024) { - prog->LinkStatus = false; + if (cp->program.info.cs.shared_size > 64 * 1024) { + cp->program.sh.data->LinkStatus = linking_failure; const char *error_str = "Compute shader used more than 64KB of shared variables"; - ralloc_strcat(&prog->InfoLog, error_str); + ralloc_strcat(&cp->program.sh.data->InfoLog, error_str); _mesa_problem(NULL, "Failed to link compute shader: %s\n", error_str); ralloc_free(mem_ctx); return false; } else { - prog_data.base.total_shared = prog->Comp.SharedSize; + prog_data.base.total_shared = cp->program.info.cs.shared_size; } - assign_cs_binding_table_offsets(devinfo, prog, &cp->program, &prog_data); + assign_cs_binding_table_offsets(devinfo, &cp->program, &prog_data); /* Allocate the references to the uniforms that will end up in the * prog_data associated with the compiled program, and which will be freed @@ -103,43 +94,44 @@ brw_codegen_cs_prog(struct brw_context *brw, prog_data.base.pull_param = rzalloc_array(NULL, const gl_constant_value *, param_count); prog_data.base.image_param = - rzalloc_array(NULL, struct brw_image_param, cs->base.NumImages); + rzalloc_array(NULL, struct brw_image_param, + cp->program.info.num_images); prog_data.base.nr_params = param_count; - prog_data.base.nr_image_params = cs->base.NumImages; + prog_data.base.nr_image_params = cp->program.info.num_images; - brw_nir_setup_glsl_uniforms(cp->program.nir, prog, &cp->program, - &prog_data.base, true); + brw_nir_setup_glsl_uniforms(cp->program.nir, &cp->program,&prog_data.base, + true); if (unlikely(brw->perf_debug)) { start_busy = (brw->batch.last_bo && - drm_intel_bo_busy(brw->batch.last_bo)); + brw_bo_busy(brw->batch.last_bo)); start_time = get_time(); } int st_index = -1; if (INTEL_DEBUG & DEBUG_SHADER_TIME) - st_index = brw_get_shader_time_index(brw, prog, &cp->program, ST_CS); + st_index = brw_get_shader_time_index(brw, &cp->program, ST_CS, true); char *error_str; program = brw_compile_cs(brw->screen->compiler, brw, mem_ctx, key, &prog_data, cp->program.nir, st_index, &program_size, &error_str); if (program == NULL) { - prog->LinkStatus = false; - ralloc_strcat(&prog->InfoLog, error_str); + cp->program.sh.data->LinkStatus = linking_failure; + ralloc_strcat(&cp->program.sh.data->InfoLog, error_str); _mesa_problem(NULL, "Failed to compile compute shader: %s\n", error_str); ralloc_free(mem_ctx); return false; } - if (unlikely(brw->perf_debug) && cs) { - if (cs->compiled_once) { + if (unlikely(brw->perf_debug)) { + if (cp->compiled_once) { _mesa_problem(&brw->ctx, "CS programs shouldn't need recompiles"); } - cs->compiled_once = true; + cp->compiled_once = true; - if (start_busy && !drm_intel_bo_busy(brw->batch.last_bo)) { + if (start_busy && !brw_bo_busy(brw->batch.last_bo)) { perf_debug("CS compile took %.03f ms and stalled the GPU\n", (get_time() - start_time) * 1000); } @@ -220,10 +212,7 @@ brw_upload_cs_prog(struct brw_context *brw) &key, sizeof(key), &brw->cs.base.prog_offset, &brw->cs.base.prog_data)) { - bool success = - brw_codegen_cs_prog(brw, - ctx->Shader.CurrentProgram[MESA_SHADER_COMPUTE], - cp, &key); + bool success = brw_codegen_cs_prog(brw, cp, &key); (void) success; assert(success); } @@ -231,9 +220,7 @@ brw_upload_cs_prog(struct brw_context *brw) bool -brw_cs_precompile(struct gl_context *ctx, - struct gl_shader_program *shader_prog, - struct gl_program *prog) +brw_cs_precompile(struct gl_context *ctx, struct gl_program *prog) { struct brw_context *brw = brw_context(ctx); struct brw_cs_prog_key key; @@ -248,7 +235,7 @@ brw_cs_precompile(struct gl_context *ctx, uint32_t old_prog_offset = brw->cs.base.prog_offset; struct brw_stage_prog_data *old_prog_data = brw->cs.base.prog_data; - bool success = brw_codegen_cs_prog(brw, shader_prog, bcp, &key); + bool success = brw_codegen_cs_prog(brw, bcp, &key); brw->cs.base.prog_offset = old_prog_offset; brw->cs.base.prog_data = old_prog_data;