X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_vs.c;h=b68a2fcaf28f668a34e94f2c3675a3abab63aa20;hb=eb3047c094abfa03e071453d7c373e9c2c574370;hp=756e13db31f51022b033324010ea390cf8239653;hpb=17eb2afada7b310e71abd3f4b9026c5178ba91cb;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 756e13db31f..b68a2fcaf28 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -69,7 +69,7 @@ brw_select_clip_planes(struct gl_context *ctx) } } -GLbitfield64 +static GLbitfield64 brw_vs_outputs_written(struct brw_context *brw, struct brw_vs_prog_key *key, GLbitfield64 user_varyings) { @@ -111,47 +111,6 @@ brw_vs_outputs_written(struct brw_context *brw, struct brw_vs_prog_key *key, return outputs_written; } -static void -brw_vs_debug_recompile(struct brw_context *brw, struct gl_program *prog, - const struct brw_vs_prog_key *key) -{ - perf_debug("Recompiling vertex shader for program %d\n", prog->Id); - - bool found = false; - const struct brw_vs_prog_key *old_key = - brw_find_previous_compile(&brw->cache, BRW_CACHE_VS_PROG, - key->program_string_id); - - if (!old_key) { - perf_debug(" Didn't find previous compile in the shader cache for " - "debug\n"); - return; - } - - for (unsigned int i = 0; i < VERT_ATTRIB_MAX; i++) { - found |= key_debug(brw, "Vertex attrib w/a flags", - old_key->gl_attrib_wa_flags[i], - key->gl_attrib_wa_flags[i]); - } - - found |= key_debug(brw, "legacy user clipping", - old_key->nr_userclip_plane_consts, - key->nr_userclip_plane_consts); - - found |= key_debug(brw, "copy edgeflag", - old_key->copy_edgeflag, key->copy_edgeflag); - found |= key_debug(brw, "PointCoord replace", - old_key->point_coord_replace, key->point_coord_replace); - found |= key_debug(brw, "vertex color clamping", - old_key->clamp_vertex_color, key->clamp_vertex_color); - - found |= brw_debug_recompile_sampler_key(brw, &old_key->tex, &key->tex); - - if (!found) { - perf_debug(" Something else\n"); - } -} - static bool brw_codegen_vs_prog(struct brw_context *brw, struct brw_program *vp, @@ -159,7 +118,6 @@ brw_codegen_vs_prog(struct brw_context *brw, { const struct brw_compiler *compiler = brw->screen->compiler; const struct gen_device_info *devinfo = &brw->screen->devinfo; - GLuint program_size; const GLuint *program; struct brw_vs_prog_data prog_data; struct brw_stage_prog_data *stage_prog_data = &prog_data.base.base; @@ -175,48 +133,33 @@ brw_codegen_vs_prog(struct brw_context *brw, mem_ctx = ralloc_context(NULL); + nir_shader *nir = nir_shader_clone(mem_ctx, vp->program.nir); + brw_assign_common_binding_table_offsets(devinfo, &vp->program, &prog_data.base.base, 0); - /* Allocate the references to the uniforms that will end up in the - * prog_data associated with the compiled program, and which will be freed - * by the state cache. - */ - int param_count = vp->program.nir->num_uniforms / 4; - - prog_data.base.base.nr_image_params = vp->program.info.num_images; - - /* vec4_visitor::setup_uniform_clipplane_values() also uploads user clip - * planes as uniforms. - */ - param_count += key->nr_userclip_plane_consts * 4; - - stage_prog_data->param = - rzalloc_array(NULL, const gl_constant_value *, param_count); - stage_prog_data->pull_param = - rzalloc_array(NULL, const gl_constant_value *, param_count); - stage_prog_data->image_param = - rzalloc_array(NULL, struct brw_image_param, - stage_prog_data->nr_image_params); - stage_prog_data->nr_params = param_count; - if (!vp->program.is_arb_asm) { - brw_nir_setup_glsl_uniforms(vp->program.nir, &vp->program, + brw_nir_setup_glsl_uniforms(mem_ctx, nir, &vp->program, &prog_data.base.base, compiler->scalar_stage[MESA_SHADER_VERTEX]); - brw_nir_analyze_ubo_ranges(compiler, vp->program.nir, + brw_nir_analyze_ubo_ranges(compiler, nir, key, prog_data.base.base.ubo_ranges); } else { - brw_nir_setup_arb_uniforms(vp->program.nir, &vp->program, + brw_nir_setup_arb_uniforms(mem_ctx, nir, &vp->program, &prog_data.base.base); } + if (key->nr_userclip_plane_consts > 0) { + brw_nir_lower_legacy_clipping(nir, key->nr_userclip_plane_consts, + &prog_data.base.base); + } + uint64_t outputs_written = - brw_vs_outputs_written(brw, key, vp->program.nir->info.outputs_written); + brw_vs_outputs_written(brw, key, nir->info.outputs_written); brw_compute_vue_map(devinfo, &prog_data.base.vue_map, outputs_written, - vp->program.nir->info.separate_shader); + nir->info.separate_shader); if (0) { _mesa_fprint_program_opt(stderr, &vp->program, PROG_PRINT_DEBUG, true); @@ -243,13 +186,10 @@ brw_codegen_vs_prog(struct brw_context *brw, */ char *error_str; program = brw_compile_vs(compiler, brw, mem_ctx, key, &prog_data, - vp->program.nir, - brw_select_clip_planes(&brw->ctx), - !_mesa_is_gles3(&brw->ctx), - st_index, &program_size, &error_str); + nir, st_index, NULL, &error_str); if (program == NULL) { if (!vp->program.is_arb_asm) { - vp->program.sh.data->LinkStatus = linking_failure; + vp->program.sh.data->LinkStatus = LINKING_FAILURE; ralloc_strcat(&vp->program.sh.data->InfoLog, error_str); } @@ -261,7 +201,8 @@ brw_codegen_vs_prog(struct brw_context *brw, if (unlikely(brw->perf_debug)) { if (vp->compiled_once) { - brw_vs_debug_recompile(brw, &vp->program, key); + brw_debug_recompile(brw, MESA_SHADER_VERTEX, vp->program.Id, + &key->base); } if (start_busy && !brw_bo_busy(brw->batch.last_bo)) { perf_debug("VS compile took %.03f ms and stalled the GPU\n", @@ -272,14 +213,16 @@ brw_codegen_vs_prog(struct brw_context *brw, /* Scratch space is used for register spilling */ brw_alloc_stage_scratch(brw, &brw->vs.base, - prog_data.base.base.total_scratch, - devinfo->max_vs_threads); + prog_data.base.base.total_scratch); + /* The param and pull_param arrays will be freed by the shader cache. */ + ralloc_steal(NULL, prog_data.base.base.param); + ralloc_steal(NULL, prog_data.base.base.pull_param); brw_upload_cache(&brw->cache, BRW_CACHE_VS_PROG, - key, sizeof(struct brw_vs_prog_key), - program, program_size, - &prog_data, sizeof(prog_data), - &brw->vs.base.prog_offset, &brw->vs.base.prog_data); + key, sizeof(struct brw_vs_prog_key), + program, prog_data.base.base.program_size, + &prog_data, sizeof(prog_data), + &brw->vs.base.prog_offset, &brw->vs.base.prog_data); ralloc_free(mem_ctx); return true; @@ -314,7 +257,9 @@ brw_vs_populate_key(struct brw_context *brw, /* Just upload the program verbatim for now. Always send it all * the inputs it asks for, whether they are varying or not. */ - key->program_string_id = vp->id; + + /* _NEW_TEXTURE */ + brw_populate_base_prog_key(ctx, vp, &key->base); if (ctx->Transform.ClipPlanesEnabled != 0 && (ctx->API == API_OPENGL_COMPAT || ctx->API == API_OPENGLES) && @@ -341,9 +286,6 @@ brw_vs_populate_key(struct brw_context *brw, key->clamp_vertex_color = ctx->Light._ClampVertexColor; } - /* _NEW_TEXTURE */ - brw_populate_sampler_prog_key_data(ctx, prog, &key->tex); - /* BRW_NEW_VS_ATTRIB_WORKAROUNDS */ if (devinfo->gen < 8 && !devinfo->is_haswell) { memcpy(key->gl_attrib_wa_flags, brw->vb.attrib_wa_flags, @@ -364,13 +306,37 @@ brw_upload_vs_prog(struct brw_context *brw) brw_vs_populate_key(brw, &key); - if (!brw_search_cache(&brw->cache, BRW_CACHE_VS_PROG, - &key, sizeof(key), - &brw->vs.base.prog_offset, &brw->vs.base.prog_data)) { - bool success = brw_codegen_vs_prog(brw, vp, &key); - (void) success; - assert(success); - } + if (brw_search_cache(&brw->cache, BRW_CACHE_VS_PROG, &key, sizeof(key), + &brw->vs.base.prog_offset, &brw->vs.base.prog_data, + true)) + return; + + if (brw_disk_cache_upload_program(brw, MESA_SHADER_VERTEX)) + return; + + vp = (struct brw_program *) brw->programs[MESA_SHADER_VERTEX]; + vp->id = key.base.program_string_id; + + ASSERTED bool success = brw_codegen_vs_prog(brw, vp, &key); + assert(success); +} + +void +brw_vs_populate_default_key(const struct brw_compiler *compiler, + struct brw_vs_prog_key *key, + struct gl_program *prog) +{ + const struct gen_device_info *devinfo = compiler->devinfo; + struct brw_program *bvp = brw_program(prog); + + memset(key, 0, sizeof(*key)); + + brw_populate_default_base_prog_key(devinfo, bvp, &key->base); + + key->clamp_vertex_color = + (prog->info.outputs_written & + (VARYING_BIT_COL0 | VARYING_BIT_COL1 | VARYING_BIT_BFC0 | + VARYING_BIT_BFC1)); } bool @@ -384,14 +350,7 @@ brw_vs_precompile(struct gl_context *ctx, struct gl_program *prog) struct brw_program *bvp = brw_program(prog); - memset(&key, 0, sizeof(key)); - - brw_setup_tex_for_precompile(brw, &key.tex, prog); - key.program_string_id = bvp->id; - key.clamp_vertex_color = - (prog->info.outputs_written & - (VARYING_BIT_COL0 | VARYING_BIT_COL1 | VARYING_BIT_BFC0 | - VARYING_BIT_BFC1)); + brw_vs_populate_default_key(brw->screen->compiler, &key, prog); success = brw_codegen_vs_prog(brw, bvp, &key);