fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Pass compiler to default key populators

Browse source 
This lets us get devinfo and other misc. compiler settings.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2019-05-06 18:24:08 -07:00
parent 6b0b8f132a
commit 381c2aded2
13 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/brw_cs.c
View file

@ -185,10 +185,11 @@ brw_upload_cs_prog(struct brw_context *brw)
}
void
brw_cs_populate_default_key(const struct gen_device_info *devinfo,
brw_cs_populate_default_key(const struct brw_compiler *compiler,
struct brw_cs_prog_key *key,
struct gl_program *prog)
{
const struct gen_device_info *devinfo = compiler->devinfo;
memset(key, 0, sizeof(*key));
key->program_string_id = brw_program(prog)->id;
@ -203,7 +204,7 @@ brw_cs_precompile(struct gl_context *ctx, struct gl_program *prog)
struct brw_program *bcp = brw_program(prog);
brw_cs_populate_default_key(&brw->screen->devinfo, &key, prog);
brw_cs_populate_default_key(brw->screen->compiler, &key, prog);
uint32_t old_prog_offset = brw->cs.base.prog_offset;
struct brw_stage_prog_data *old_prog_data = brw->cs.base.prog_data;

2
src/mesa/drivers/dri/i965/brw_cs.h
View file

@ -35,7 +35,7 @@ brw_upload_cs_prog(struct brw_context *brw);
void
brw_cs_populate_key(struct brw_context *brw, struct brw_cs_prog_key *key);
void
brw_cs_populate_default_key(const struct gen_device_info *devinfo,
brw_cs_populate_default_key(const struct brw_compiler *compiler,
struct brw_cs_prog_key *key,
struct gl_program *prog);

6
src/mesa/drivers/dri/i965/brw_gs.c
View file

@ -186,10 +186,12 @@ brw_upload_gs_prog(struct brw_context *brw)
}
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);
@ -207,7 +209,7 @@ brw_gs_precompile(struct gl_context *ctx, struct gl_program *prog)
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);

2
src/mesa/drivers/dri/i965/brw_gs.h
View file

@ -41,7 +41,7 @@ void
brw_gs_populate_key(struct brw_context *brw,
struct brw_gs_prog_key *key);
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);

14
src/mesa/drivers/dri/i965/brw_program.c
View file

@ -885,29 +885,29 @@ brw_prog_key_set_id(union brw_any_prog_key *key, gl_shader_stage stage,
}
void
brw_populate_default_key(const struct gen_device_info *devinfo,
brw_populate_default_key(const struct brw_compiler *compiler,
union brw_any_prog_key *prog_key,
struct gl_shader_program *sh_prog,
struct gl_program *prog)
{
switch (prog->info.stage) {
case MESA_SHADER_VERTEX:
brw_vs_populate_default_key(devinfo, &prog_key->vs, prog);
brw_vs_populate_default_key(compiler, &prog_key->vs, prog);
break;
case MESA_SHADER_TESS_CTRL:
brw_tcs_populate_default_key(devinfo, &prog_key->tcs, sh_prog, prog);
brw_tcs_populate_default_key(compiler, &prog_key->tcs, sh_prog, prog);
break;
case MESA_SHADER_TESS_EVAL:
brw_tes_populate_default_key(devinfo, &prog_key->tes, sh_prog, prog);
brw_tes_populate_default_key(compiler, &prog_key->tes, sh_prog, prog);
break;
case MESA_SHADER_GEOMETRY:
brw_gs_populate_default_key(devinfo, &prog_key->gs, prog);
brw_gs_populate_default_key(compiler, &prog_key->gs, prog);
break;
case MESA_SHADER_FRAGMENT:
brw_wm_populate_default_key(devinfo, &prog_key->wm, prog);
brw_wm_populate_default_key(compiler, &prog_key->wm, prog);
break;
case MESA_SHADER_COMPUTE:
brw_cs_populate_default_key(devinfo, &prog_key->cs, prog);
brw_cs_populate_default_key(compiler, &prog_key->cs, prog);
break;
default:
unreachable("Unsupported stage!");

6
src/mesa/drivers/dri/i965/brw_program.h
View file

@ -86,7 +86,7 @@ brw_prog_key_set_id(union brw_any_prog_key *key, gl_shader_stage stage,
unsigned id);
void
brw_populate_default_key(const struct gen_device_info *devinfo,
brw_populate_default_key(const struct brw_compiler *compiler,
union brw_any_prog_key *prog_key,
struct gl_shader_program *sh_prog,
struct gl_program *prog);
@ -113,14 +113,14 @@ GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog
void brw_upload_tcs_prog(struct brw_context *brw);
void brw_tcs_populate_key(struct brw_context *brw,
struct brw_tcs_prog_key *key);
void brw_tcs_populate_default_key(const struct gen_device_info *devinfo,
void brw_tcs_populate_default_key(const struct brw_compiler *compiler,
struct brw_tcs_prog_key *key,
struct gl_shader_program *sh_prog,
struct gl_program *prog);
void brw_upload_tes_prog(struct brw_context *brw);
void brw_tes_populate_key(struct brw_context *brw,
struct brw_tes_prog_key *key);
void brw_tes_populate_default_key(const struct gen_device_info *devinfo,
void brw_tes_populate_default_key(const struct brw_compiler *compiler,
struct brw_tes_prog_key *key,
struct gl_shader_program *sh_prog,
struct gl_program *prog);

2
src/mesa/drivers/dri/i965/brw_program_binary.c
View file

@ -251,7 +251,7 @@ serialize_gen_part(struct blob *writer, struct gl_context *ctx,
struct brw_context *brw = brw_context(ctx);
union brw_any_prog_key key;
brw_populate_default_key(&brw->screen->devinfo, &key, sh_prog, prog);
brw_populate_default_key(brw->screen->compiler, &key, sh_prog, prog);
const gl_shader_stage stage = prog->info.stage;
uint32_t offset = 0;

6
src/mesa/drivers/dri/i965/brw_tcs.c
View file

@ -235,11 +235,12 @@ brw_upload_tcs_prog(struct brw_context *brw)
}
void
brw_tcs_populate_default_key(const struct gen_device_info *devinfo,
brw_tcs_populate_default_key(const struct brw_compiler *compiler,
struct brw_tcs_prog_key *key,
struct gl_shader_program *sh_prog,
struct gl_program *prog)
{
const struct gen_device_info *devinfo = compiler->devinfo;
struct brw_program *btcp = brw_program(prog);
const struct gl_linked_shader *tes =
sh_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL];
@ -272,6 +273,7 @@ brw_tcs_precompile(struct gl_context *ctx,
struct gl_program *prog)
{
struct brw_context *brw = brw_context(ctx);
const struct brw_compiler *compiler = brw->screen->compiler;
struct brw_tcs_prog_key key;
uint32_t old_prog_offset = brw->tcs.base.prog_offset;
struct brw_stage_prog_data *old_prog_data = brw->tcs.base.prog_data;
@ -282,7 +284,7 @@ brw_tcs_precompile(struct gl_context *ctx,
shader_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL];
struct brw_program *btep = tes ? brw_program(tes->Program) : NULL;
brw_tcs_populate_default_key(&brw->screen->devinfo, &key, shader_prog, prog);
brw_tcs_populate_default_key(compiler, &key, shader_prog, prog);
success = brw_codegen_tcs_prog(brw, btcp, btep, &key);

6
src/mesa/drivers/dri/i965/brw_tes.c
View file

@ -184,11 +184,12 @@ brw_upload_tes_prog(struct brw_context *brw)
}
void
brw_tes_populate_default_key(const struct gen_device_info *devinfo,
brw_tes_populate_default_key(const struct brw_compiler *compiler,
struct brw_tes_prog_key *key,
struct gl_shader_program *sh_prog,
struct gl_program *prog)
{
const struct gen_device_info *devinfo = compiler->devinfo;
struct brw_program *btep = brw_program(prog);
memset(key, 0, sizeof(*key));
@ -214,6 +215,7 @@ brw_tes_precompile(struct gl_context *ctx,
struct gl_program *prog)
{
struct brw_context *brw = brw_context(ctx);
const struct brw_compiler *compiler = brw->screen->compiler;
struct brw_tes_prog_key key;
uint32_t old_prog_offset = brw->tes.base.prog_offset;
struct brw_stage_prog_data *old_prog_data = brw->tes.base.prog_data;
@ -221,7 +223,7 @@ brw_tes_precompile(struct gl_context *ctx,
struct brw_program *btep = brw_program(prog);
brw_tes_populate_default_key(&brw->screen->devinfo, &key, shader_prog, prog);
brw_tes_populate_default_key(compiler, &key, shader_prog, prog);
success = brw_codegen_tes_prog(brw, btep, &key);

5
src/mesa/drivers/dri/i965/brw_vs.c
View file

@ -318,10 +318,11 @@ brw_upload_vs_prog(struct brw_context *brw)
}
void
brw_vs_populate_default_key(const struct gen_device_info *devinfo,
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));
@ -345,7 +346,7 @@ brw_vs_precompile(struct gl_context *ctx, struct gl_program *prog)
struct brw_program *bvp = brw_program(prog);
brw_vs_populate_default_key(&brw->screen->devinfo, &key, prog);
brw_vs_populate_default_key(brw->screen->compiler, &key, prog);
success = brw_codegen_vs_prog(brw, bvp, &key);

2
src/mesa/drivers/dri/i965/brw_vs.h
View file

@ -46,7 +46,7 @@ void
brw_vs_populate_key(struct brw_context *brw,
struct brw_vs_prog_key *key);
void
brw_vs_populate_default_key(const struct gen_device_info *devinfo,
brw_vs_populate_default_key(const struct brw_compiler *compiler,
struct brw_vs_prog_key *key,
struct gl_program *prog);

6
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -524,10 +524,12 @@ brw_upload_wm_prog(struct brw_context *brw)
}
void
brw_wm_populate_default_key(const struct gen_device_info *devinfo,
brw_wm_populate_default_key(const struct brw_compiler *compiler,
struct brw_wm_prog_key *key,
struct gl_program *prog)
{
const struct gen_device_info *devinfo = compiler->devinfo;
memset(key, 0, sizeof(*key));
uint64_t outputs_written = prog->info.outputs_written;
@ -571,7 +573,7 @@ brw_fs_precompile(struct gl_context *ctx, struct gl_program *prog)
struct brw_program *bfp = brw_program(prog);
brw_wm_populate_default_key(&brw->screen->devinfo, &key, prog);
brw_wm_populate_default_key(brw->screen->compiler, &key, prog);
/* check brw_wm_populate_default_key coherent_fb_fetch setting */
assert(key.coherent_fb_fetch ==

2
src/mesa/drivers/dri/i965/brw_wm.h
View file

@ -48,7 +48,7 @@ void
brw_wm_populate_key(struct brw_context *brw,
struct brw_wm_prog_key *key);
void
brw_wm_populate_default_key(const struct gen_device_info *devinfo,
brw_wm_populate_default_key(const struct brw_compiler *compiler,
struct brw_wm_prog_key *key,
struct gl_program *prog);