AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Convert vs, gs, tcs, tes and cs samplers to genxml.

Browse Source 
Since they just use the code that is already available in genX_state_upload.c,
convert them in one batch.

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Rafael Antognolli
2017-05-30 15:08:16 -07:00
parent f8d69beed4
commit e30bbe32a3
3 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_sampler_state.c
-109
View File
@@ -623,112 +623,3 @@ brw_upload_sampler_state_table(struct brw_context *brw,
brw->ctx.NewDriverState |= BRW_NEW_SAMPLER_STATE_TABLE;
}
}
static void
brw_upload_vs_samplers(struct brw_context *brw)
{
/* BRW_NEW_VERTEX_PROGRAM */
struct gl_program *vs = (struct gl_program *) brw->vertex_program;
brw_upload_sampler_state_table(brw, vs, &brw->vs.base);
}
const struct brw_tracked_state brw_vs_samplers = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_VERTEX_PROGRAM,
},
.emit = brw_upload_vs_samplers,
};
static void
brw_upload_gs_samplers(struct brw_context *brw)
{
/* BRW_NEW_GEOMETRY_PROGRAM */
struct gl_program *gs = (struct gl_program *) brw->geometry_program;
if (!gs)
return;
brw_upload_sampler_state_table(brw, gs, &brw->gs.base);
}
const struct brw_tracked_state brw_gs_samplers = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_GEOMETRY_PROGRAM,
},
.emit = brw_upload_gs_samplers,
};
static void
brw_upload_tcs_samplers(struct brw_context *brw)
{
/* BRW_NEW_TESS_PROGRAMS */
struct gl_program *tcs = (struct gl_program *) brw->tess_ctrl_program;
if (!tcs)
return;
brw_upload_sampler_state_table(brw, tcs, &brw->tcs.base);
}
const struct brw_tracked_state brw_tcs_samplers = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_TESS_PROGRAMS,
},
.emit = brw_upload_tcs_samplers,
};
static void
brw_upload_tes_samplers(struct brw_context *brw)
{
/* BRW_NEW_TESS_PROGRAMS */
struct gl_program *tes = (struct gl_program *) brw->tess_eval_program;
if (!tes)
return;
brw_upload_sampler_state_table(brw, tes, &brw->tes.base);
}
const struct brw_tracked_state brw_tes_samplers = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_TESS_PROGRAMS,
},
.emit = brw_upload_tes_samplers,
};
static void
brw_upload_cs_samplers(struct brw_context *brw)
{
/* BRW_NEW_COMPUTE_PROGRAM */
struct gl_program *cs = (struct gl_program *) brw->compute_program;
if (!cs)
return;
brw_upload_sampler_state_table(brw, cs, &brw->cs.base);
}
const struct brw_tracked_state brw_cs_samplers = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_COMPUTE_PROGRAM,
},
.emit = brw_upload_cs_samplers,
};
src/mesa/drivers/dri/i965/brw_state.h
-5
View File
@@ -58,11 +58,6 @@ extern const struct brw_tracked_state brw_binding_table_pointers;
extern const struct brw_tracked_state brw_depthbuffer;
extern const struct brw_tracked_state brw_recalculate_urb_fence;
extern const struct brw_tracked_state brw_sf_vp;
extern const struct brw_tracked_state brw_vs_samplers;
extern const struct brw_tracked_state brw_tcs_samplers;
extern const struct brw_tracked_state brw_tes_samplers;
extern const struct brw_tracked_state brw_gs_samplers;
extern const struct brw_tracked_state brw_cs_samplers;
extern const struct brw_tracked_state brw_cs_texture_surfaces;
extern const struct brw_tracked_state brw_vs_ubo_surfaces;
extern const struct brw_tracked_state brw_vs_abo_surfaces;
src/mesa/drivers/dri/i965/genX_state_upload.c
+123 -12
View File
@@ -4752,6 +4752,117 @@ static const struct brw_tracked_state genX(fs_samplers) = {
.emit = genX(upload_fs_samplers),
};
static void
genX(upload_vs_samplers)(struct brw_context *brw)
{
/* BRW_NEW_VERTEX_PROGRAM */
struct gl_program *vs = (struct gl_program *) brw->vertex_program;
genX(upload_sampler_state_table)(brw, vs, &brw->vs.base);
}
static const struct brw_tracked_state genX(vs_samplers) = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_VERTEX_PROGRAM,
},
.emit = genX(upload_vs_samplers),
};
#if GEN_GEN >= 6
static void
genX(upload_gs_samplers)(struct brw_context *brw)
{
/* BRW_NEW_GEOMETRY_PROGRAM */
struct gl_program *gs = (struct gl_program *) brw->geometry_program;
if (!gs)
return;
genX(upload_sampler_state_table)(brw, gs, &brw->gs.base);
}
static const struct brw_tracked_state genX(gs_samplers) = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_GEOMETRY_PROGRAM,
},
.emit = genX(upload_gs_samplers),
};
#endif
#if GEN_GEN >= 7
static void
genX(upload_tcs_samplers)(struct brw_context *brw)
{
/* BRW_NEW_TESS_PROGRAMS */
struct gl_program *tcs = (struct gl_program *) brw->tess_ctrl_program;
if (!tcs)
return;
genX(upload_sampler_state_table)(brw, tcs, &brw->tcs.base);
}
static const struct brw_tracked_state genX(tcs_samplers) = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_TESS_PROGRAMS,
},
.emit = genX(upload_tcs_samplers),
};
#endif
#if GEN_GEN >= 7
static void
genX(upload_tes_samplers)(struct brw_context *brw)
{
/* BRW_NEW_TESS_PROGRAMS */
struct gl_program *tes = (struct gl_program *) brw->tess_eval_program;
if (!tes)
return;
genX(upload_sampler_state_table)(brw, tes, &brw->tes.base);
}
static const struct brw_tracked_state genX(tes_samplers) = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_TESS_PROGRAMS,
},
.emit = genX(upload_tes_samplers),
};
#endif
#if GEN_GEN >= 7
static void
genX(upload_cs_samplers)(struct brw_context *brw)
{
/* BRW_NEW_COMPUTE_PROGRAM */
struct gl_program *cs = (struct gl_program *) brw->compute_program;
if (!cs)
return;
genX(upload_sampler_state_table)(brw, cs, &brw->cs.base);
}
const struct brw_tracked_state genX(cs_samplers) = {
.dirty = {
.mesa = _NEW_TEXTURE,
.brw = BRW_NEW_BATCH |
BRW_NEW_BLORP |
BRW_NEW_COMPUTE_PROGRAM,
},
.emit = genX(upload_cs_samplers),
};
#endif
/* ---------------------------------------------------------------------- */
void
@@ -4782,7 +4893,7 @@ genX(init_atoms)(struct brw_context *brw)
&brw_wm_binding_table,
&genX(fs_samplers),
&brw_vs_samplers,
&genX(vs_samplers),
/* These set up state for brw_psp_urb_cbs */
&brw_wm_unit,
@@ -4851,8 +4962,8 @@ genX(init_atoms)(struct brw_context *brw)
&brw_wm_binding_table,
&genX(fs_samplers),
&brw_vs_samplers,
&brw_gs_samplers,
&genX(vs_samplers),
&genX(gs_samplers),
&gen6_sampler_state,
&genX(multisample_state),
@@ -4934,10 +5045,10 @@ genX(init_atoms)(struct brw_context *brw)
&brw_wm_binding_table,
&genX(fs_samplers),
&brw_vs_samplers,
&brw_tcs_samplers,
&brw_tes_samplers,
&brw_gs_samplers,
&genX(vs_samplers),
&genX(tcs_samplers),
&genX(tes_samplers),
&genX(gs_samplers),
&genX(multisample_state),
&genX(vs_state),
@@ -5023,10 +5134,10 @@ genX(init_atoms)(struct brw_context *brw)
&brw_wm_binding_table,
&genX(fs_samplers),
&brw_vs_samplers,
&brw_tcs_samplers,
&brw_tes_samplers,
&brw_gs_samplers,
&genX(vs_samplers),
&genX(tcs_samplers),
&genX(tes_samplers),
&genX(gs_samplers),
&genX(multisample_state),
&genX(vs_state),
@@ -5082,7 +5193,7 @@ genX(init_atoms)(struct brw_context *brw)
&brw_cs_abo_surfaces,
&brw_cs_texture_surfaces,
&brw_cs_work_groups_surface,
&brw_cs_samplers,
&genX(cs_samplers),
&genX(cs_state),
};