i965/cnl: Handle gen10 in switch cases across the driver
V2: Start using gen10 functions isl_gen10*(), gen10_blorp_exec() gen10_init_atoms() (Jason) Remove Vulkan changes. Do them later in a separate patch. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
parent
30e749c8f1
commit
111881abac
|
@ -116,6 +116,7 @@ get_l3_configs(const struct gen_device_info *devinfo)
|
||||||
return (devinfo->is_cherryview ? chv_l3_configs : bdw_l3_configs);
|
return (devinfo->is_cherryview ? chv_l3_configs : bdw_l3_configs);
|
||||||
|
|
||||||
case 9:
|
case 9:
|
||||||
|
case 10:
|
||||||
return chv_l3_configs;
|
return chv_l3_configs;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -412,6 +412,7 @@ enum gen {
|
||||||
GEN75 = (1 << 5),
|
GEN75 = (1 << 5),
|
||||||
GEN8 = (1 << 6),
|
GEN8 = (1 << 6),
|
||||||
GEN9 = (1 << 7),
|
GEN9 = (1 << 7),
|
||||||
|
GEN10 = (1 << 8),
|
||||||
GEN_ALL = ~0
|
GEN_ALL = ~0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -688,6 +689,7 @@ gen_from_devinfo(const struct gen_device_info *devinfo)
|
||||||
case 7: return devinfo->is_haswell ? GEN75 : GEN7;
|
case 7: return devinfo->is_haswell ? GEN75 : GEN7;
|
||||||
case 8: return GEN8;
|
case 8: return GEN8;
|
||||||
case 9: return GEN9;
|
case 9: return GEN9;
|
||||||
|
case 10: return GEN10;
|
||||||
default:
|
default:
|
||||||
unreachable("not reached");
|
unreachable("not reached");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1362,6 +1362,7 @@ brw_init_compaction_tables(const struct gen_device_info *devinfo)
|
||||||
assert(gen8_src_index_table[ARRAY_SIZE(gen8_src_index_table) - 1] != 0);
|
assert(gen8_src_index_table[ARRAY_SIZE(gen8_src_index_table) - 1] != 0);
|
||||||
|
|
||||||
switch (devinfo->gen) {
|
switch (devinfo->gen) {
|
||||||
|
case 10:
|
||||||
case 9:
|
case 9:
|
||||||
case 8:
|
case 8:
|
||||||
control_index_table = gen8_control_index_table;
|
control_index_table = gen8_control_index_table;
|
||||||
|
|
|
@ -1778,6 +1778,9 @@ isl_surf_fill_state_s(const struct isl_device *dev, void *state,
|
||||||
case 9:
|
case 9:
|
||||||
isl_gen9_surf_fill_state_s(dev, state, info);
|
isl_gen9_surf_fill_state_s(dev, state, info);
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
isl_gen10_surf_fill_state_s(dev, state, info);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(!"Cannot fill surface state for this gen");
|
assert(!"Cannot fill surface state for this gen");
|
||||||
}
|
}
|
||||||
|
@ -1809,6 +1812,9 @@ isl_buffer_fill_state_s(const struct isl_device *dev, void *state,
|
||||||
case 9:
|
case 9:
|
||||||
isl_gen9_buffer_fill_state_s(state, info);
|
isl_gen9_buffer_fill_state_s(state, info);
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
isl_gen10_buffer_fill_state_s(state, info);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(!"Cannot fill surface state for this gen");
|
assert(!"Cannot fill surface state for this gen");
|
||||||
}
|
}
|
||||||
|
@ -1876,6 +1882,9 @@ isl_emit_depth_stencil_hiz_s(const struct isl_device *dev, void *batch,
|
||||||
case 9:
|
case 9:
|
||||||
isl_gen9_emit_depth_stencil_hiz_s(dev, batch, info);
|
isl_gen9_emit_depth_stencil_hiz_s(dev, batch, info);
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
isl_gen10_emit_depth_stencil_hiz_s(dev, batch, info);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(!"Cannot fill surface state for this gen");
|
assert(!"Cannot fill surface state for this gen");
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,6 +109,12 @@ brw_blorp_init(struct brw_context *brw)
|
||||||
brw->blorp.mocs.vb = SKL_MOCS_WB;
|
brw->blorp.mocs.vb = SKL_MOCS_WB;
|
||||||
brw->blorp.exec = gen9_blorp_exec;
|
brw->blorp.exec = gen9_blorp_exec;
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
brw->blorp.mocs.tex = SKL_MOCS_WB;
|
||||||
|
brw->blorp.mocs.rb = SKL_MOCS_PTE;
|
||||||
|
brw->blorp.mocs.vb = SKL_MOCS_WB;
|
||||||
|
brw->blorp.exec = gen10_blorp_exec;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
unreachable("Invalid gen");
|
unreachable("Invalid gen");
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,6 +37,7 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target,
|
||||||
(void) internalFormat;
|
(void) internalFormat;
|
||||||
|
|
||||||
switch (brw->gen) {
|
switch (brw->gen) {
|
||||||
|
case 10:
|
||||||
case 9:
|
case 9:
|
||||||
samples[0] = 16;
|
samples[0] = 16;
|
||||||
samples[1] = 8;
|
samples[1] = 8;
|
||||||
|
|
|
@ -136,7 +136,9 @@ void brw_init_state( struct brw_context *brw )
|
||||||
|
|
||||||
brw_init_caches(brw);
|
brw_init_caches(brw);
|
||||||
|
|
||||||
if (brw->gen >= 9)
|
if (brw->gen >= 10)
|
||||||
|
gen10_init_atoms(brw);
|
||||||
|
else if (brw->gen >= 9)
|
||||||
gen9_init_atoms(brw);
|
gen9_init_atoms(brw);
|
||||||
else if (brw->gen >= 8)
|
else if (brw->gen >= 8)
|
||||||
gen8_init_atoms(brw);
|
gen8_init_atoms(brw);
|
||||||
|
|
|
@ -1852,6 +1852,7 @@ set_max_gl_versions(struct intel_screen *screen)
|
||||||
const bool has_astc = screen->devinfo.gen >= 9;
|
const bool has_astc = screen->devinfo.gen >= 9;
|
||||||
|
|
||||||
switch (screen->devinfo.gen) {
|
switch (screen->devinfo.gen) {
|
||||||
|
case 10:
|
||||||
case 9:
|
case 9:
|
||||||
case 8:
|
case 8:
|
||||||
dri_screen->max_gl_core_version = 45;
|
dri_screen->max_gl_core_version = 45;
|
||||||
|
|
Loading…
Reference in New Issue