From db119550725d438c928c50382a2a675b37c24a66 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sat, 7 Mar 2015 22:44:39 -0800 Subject: [PATCH] i965/state: Support multiple pipelines in brw->num_atoms MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit brw->num_atoms is converted to an array, but currently just an array of length 1. Adds brw_copy_pipeline_atoms which copies the atoms for a pipeline, and sets brw->num_atoms[p] for pipeline p. v2: * Rename brw->atoms[] to render_atoms * Rename brw_add_pipeline_atoms to brw_copy_pipeline_atoms * Rename brw_pipeline_first_atom to brw_get_pipeline_atoms Signed-off-by: Jordan Justen Reviewed-by: Kristian Høgsberg Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_context.h | 10 ++- src/mesa/drivers/dri/i965/brw_state_upload.c | 94 ++++++++++++-------- 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index e025011e2ae..e1481d5ce99 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -149,6 +149,12 @@ struct brw_vue_prog_key; struct brw_wm_prog_key; struct brw_wm_prog_data; +enum brw_pipeline { + BRW_RENDER_PIPELINE, + + BRW_NUM_PIPELINES +}; + enum brw_cache_id { BRW_CACHE_FS_PROG, BRW_CACHE_BLORP_BLIT_PROG, @@ -1402,8 +1408,8 @@ struct brw_context int entries_per_oa_snapshot; } perfmon; - int num_atoms; - const struct brw_tracked_state atoms[57]; + int num_atoms[BRW_NUM_PIPELINES]; + const struct brw_tracked_state render_atoms[57]; /* If (INTEL_DEBUG & DEBUG_BATCH) */ struct { diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index f0d0bac398a..b15d8c5e482 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -174,7 +174,7 @@ static const struct brw_tracked_state *gen6_atoms[] = &brw_vertices, }; -static const struct brw_tracked_state *gen7_atoms[] = +static const struct brw_tracked_state *gen7_render_atoms[] = { /* Command packets: */ @@ -246,7 +246,7 @@ static const struct brw_tracked_state *gen7_atoms[] = &haswell_cut_index, }; -static const struct brw_tracked_state *gen8_atoms[] = +static const struct brw_tracked_state *gen8_render_atoms[] = { /* Command packets: */ &gen8_state_base_address, @@ -352,48 +352,68 @@ brw_upload_initial_gpu_state(struct brw_context *brw) } } +static inline const struct brw_tracked_state * +brw_get_pipeline_atoms(struct brw_context *brw, + enum brw_pipeline pipeline) +{ + switch (pipeline) { + case BRW_RENDER_PIPELINE: + return brw->render_atoms; + default: + STATIC_ASSERT(BRW_NUM_PIPELINES == 1); + unreachable("Unsupported pipeline"); + return NULL; + } +} + +static void +brw_copy_pipeline_atoms(struct brw_context *brw, + enum brw_pipeline pipeline, + const struct brw_tracked_state **atoms, + int num_atoms) +{ + /* This is to work around brw_context::atoms being declared const. We want + * it to be const, but it needs to be initialized somehow! + */ + struct brw_tracked_state *context_atoms = + (struct brw_tracked_state *) brw_get_pipeline_atoms(brw, pipeline); + + for (int i = 0; i < num_atoms; i++) { + context_atoms[i] = *atoms[i]; + assert(context_atoms[i].dirty.mesa | context_atoms[i].dirty.brw); + assert(context_atoms[i].emit); + } + + brw->num_atoms[pipeline] = num_atoms; +} + void brw_init_state( struct brw_context *brw ) { struct gl_context *ctx = &brw->ctx; - const struct brw_tracked_state **atoms; - int num_atoms; - STATIC_ASSERT(ARRAY_SIZE(gen4_atoms) <= ARRAY_SIZE(brw->atoms)); - STATIC_ASSERT(ARRAY_SIZE(gen6_atoms) <= ARRAY_SIZE(brw->atoms)); - STATIC_ASSERT(ARRAY_SIZE(gen7_atoms) <= ARRAY_SIZE(brw->atoms)); - STATIC_ASSERT(ARRAY_SIZE(gen8_atoms) <= ARRAY_SIZE(brw->atoms)); + STATIC_ASSERT(ARRAY_SIZE(gen4_atoms) <= ARRAY_SIZE(brw->render_atoms)); + STATIC_ASSERT(ARRAY_SIZE(gen6_atoms) <= ARRAY_SIZE(brw->render_atoms)); + STATIC_ASSERT(ARRAY_SIZE(gen7_render_atoms) <= + ARRAY_SIZE(brw->render_atoms)); + STATIC_ASSERT(ARRAY_SIZE(gen8_render_atoms) <= + ARRAY_SIZE(brw->render_atoms)); brw_init_caches(brw); if (brw->gen >= 8) { - atoms = gen8_atoms; - num_atoms = ARRAY_SIZE(gen8_atoms); + brw_copy_pipeline_atoms(brw, BRW_RENDER_PIPELINE, + gen8_render_atoms, + ARRAY_SIZE(gen8_render_atoms)); } else if (brw->gen == 7) { - atoms = gen7_atoms; - num_atoms = ARRAY_SIZE(gen7_atoms); + brw_copy_pipeline_atoms(brw, BRW_RENDER_PIPELINE, + gen7_render_atoms, + ARRAY_SIZE(gen7_render_atoms)); } else if (brw->gen == 6) { - atoms = gen6_atoms; - num_atoms = ARRAY_SIZE(gen6_atoms); + brw_copy_pipeline_atoms(brw, BRW_RENDER_PIPELINE, + gen6_atoms, ARRAY_SIZE(gen6_atoms)); } else { - atoms = gen4_atoms; - num_atoms = ARRAY_SIZE(gen4_atoms); - } - - brw->num_atoms = num_atoms; - - /* This is to work around brw_context::atoms being declared const. We want - * it to be const, but it needs to be initialized somehow! - */ - struct brw_tracked_state *context_atoms = - (struct brw_tracked_state *) &brw->atoms[0]; - - for (int i = 0; i < num_atoms; i++) - context_atoms[i] = *atoms[i]; - - while (num_atoms--) { - assert((*atoms)->dirty.mesa | (*atoms)->dirty.brw); - assert((*atoms)->emit); - atoms++; + brw_copy_pipeline_atoms(brw, BRW_RENDER_PIPELINE, + gen4_atoms, ARRAY_SIZE(gen4_atoms)); } brw_upload_initial_gpu_state(brw); @@ -641,8 +661,8 @@ void brw_upload_render_state(struct brw_context *brw) memset(&examined, 0, sizeof(examined)); prev = *state; - for (i = 0; i < brw->num_atoms; i++) { - const struct brw_tracked_state *atom = &brw->atoms[i]; + for (i = 0; i < brw->num_atoms[BRW_RENDER_PIPELINE]; i++) { + const struct brw_tracked_state *atom = &brw->render_atoms[i]; struct brw_state_flags generated; if (check_state(state, &atom->dirty)) { @@ -661,8 +681,8 @@ void brw_upload_render_state(struct brw_context *brw) } } else { - for (i = 0; i < brw->num_atoms; i++) { - const struct brw_tracked_state *atom = &brw->atoms[i]; + for (i = 0; i < brw->num_atoms[BRW_RENDER_PIPELINE]; i++) { + const struct brw_tracked_state *atom = &brw->render_atoms[i]; if (check_state(state, &atom->dirty)) { atom->emit(brw); -- 2.30.2