diff options
| author | Anuj Phogat <[email protected]> | 2017-05-16 10:15:17 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2017-06-09 16:02:59 -0700 |
| commit | 111881abac0dda73a20e491a219a1d7db6512f82 (patch) | |
| tree | 6e36fc165748c62986ca425917065172f7bed400 /src/mesa | |
| parent | 30e749c8f1cae530fbb7d24e1c5e7097f7cd1821 (diff) | |
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 <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_formatquery.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index d14050c3334..70aecfba19b 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -109,6 +109,12 @@ brw_blorp_init(struct brw_context *brw) brw->blorp.mocs.vb = SKL_MOCS_WB; brw->blorp.exec = gen9_blorp_exec; 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: unreachable("Invalid gen"); } diff --git a/src/mesa/drivers/dri/i965/brw_formatquery.c b/src/mesa/drivers/dri/i965/brw_formatquery.c index 96cc6e04ee7..5faf91fa9e7 100644 --- a/src/mesa/drivers/dri/i965/brw_formatquery.c +++ b/src/mesa/drivers/dri/i965/brw_formatquery.c @@ -37,6 +37,7 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target, (void) internalFormat; switch (brw->gen) { + case 10: case 9: samples[0] = 16; samples[1] = 8; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 4647f1c41e0..9a858e64a2e 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -136,7 +136,9 @@ void brw_init_state( struct brw_context *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); else if (brw->gen >= 8) gen8_init_atoms(brw); diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 1c46f8e742d..fec4feabaff 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1852,6 +1852,7 @@ set_max_gl_versions(struct intel_screen *screen) const bool has_astc = screen->devinfo.gen >= 9; switch (screen->devinfo.gen) { + case 10: case 9: case 8: dri_screen->max_gl_core_version = 45; |