#include "brw_program.h"
#include "compiler/glsl/ir_uniform.h"
-static void
-brw_gs_debug_recompile(struct brw_context *brw, struct gl_program *prog,
- const struct brw_gs_prog_key *key)
-{
- perf_debug("Recompiling geometry shader for program %d\n", prog->Id);
-
- bool found = false;
- const struct brw_gs_prog_key *old_key =
- brw_find_previous_compile(&brw->cache, BRW_CACHE_GS_PROG,
- key->program_string_id);
-
- if (!old_key) {
- perf_debug(" Didn't find previous compile in the shader cache for "
- "debug\n");
- return;
- }
-
- found |= brw_debug_recompile_sampler_key(brw, &old_key->tex, &key->tex);
-
- if (!found) {
- perf_debug(" Something else\n");
- }
-}
-
static void
assign_gs_binding_table_offsets(const struct gen_device_info *devinfo,
const struct gl_program *prog,
brw_compute_vue_map(devinfo,
&prog_data.base.vue_map, outputs_written,
- gp->program.info.separate_shader);
+ gp->program.info.separate_shader, 1);
int st_index = -1;
if (INTEL_DEBUG & DEBUG_SHADER_TIME)
char *error_str;
const unsigned *program =
brw_compile_gs(brw->screen->compiler, brw, mem_ctx, key,
- &prog_data, nir, &gp->program, st_index, &error_str);
+ &prog_data, nir, &gp->program, st_index,
+ NULL, &error_str);
if (program == NULL) {
ralloc_strcat(&gp->program.sh.data->InfoLog, error_str);
_mesa_problem(NULL, "Failed to compile geometry shader: %s\n", error_str);
if (unlikely(brw->perf_debug)) {
if (gp->compiled_once) {
- brw_gs_debug_recompile(brw, &gp->program, key);
+ brw_debug_recompile(brw, MESA_SHADER_GEOMETRY, gp->program.Id,
+ &key->base);
}
if (start_busy && !brw_bo_busy(brw->batch.last_bo)) {
perf_debug("GS compile took %.03f ms and stalled the GPU\n",
memset(key, 0, sizeof(*key));
- key->program_string_id = gp->id;
-
- /* _NEW_TEXTURE */
- brw_populate_sampler_prog_key_data(ctx, &gp->program, &key->tex);
+ brw_populate_base_prog_key(ctx, gp, &key->base);
}
void
return;
gp = (struct brw_program *) brw->programs[MESA_SHADER_GEOMETRY];
- gp->id = key.program_string_id;
+ gp->id = key.base.program_string_id;
- MAYBE_UNUSED bool success = brw_codegen_gs_prog(brw, gp, &key);
+ ASSERTED bool success = brw_codegen_gs_prog(brw, gp, &key);
assert(success);
}
void
-brw_gs_populate_default_key(const struct gen_device_info *devinfo,
+brw_gs_populate_default_key(const struct brw_compiler *compiler,
struct brw_gs_prog_key *key,
struct gl_program *prog)
{
+ const struct gen_device_info *devinfo = compiler->devinfo;
+
memset(key, 0, sizeof(*key));
- brw_setup_tex_for_precompile(devinfo, &key->tex, prog);
- key->program_string_id = brw_program(prog)->id;
+ brw_populate_default_base_prog_key(devinfo, brw_program(prog),
+ &key->base);
}
bool
struct brw_program *bgp = brw_program(prog);
- brw_gs_populate_default_key(&brw->screen->devinfo, &key, prog);
+ brw_gs_populate_default_key(brw->screen->compiler, &key, prog);
success = brw_codegen_gs_prog(brw, bgp, &key);