diff options
| author | Kenneth Graunke <[email protected]> | 2018-01-02 23:59:06 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2018-01-22 10:03:52 -0800 |
| commit | 60f15477dad1fa752a91ecf1c2bf0aabbccbf2e5 (patch) | |
| tree | a4de71da29d707b9cab1bf0f6f7556f314e8bca5 /src/intel | |
| parent | a9bb067e27cd1d249cede580c50e7e2fc1eef372 (diff) | |
i965: Drop render_target_start from binding table struct.
We have to start render targets at binding table index 0 in order to use
headerless FB write messages, and in fact already assume this in a bunch
of places in the code. Let's finish that off, and not bother storing 0
in a struct to pretend to add it in a few places.
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/blorp/blorp.c | 6 | ||||
| -rw-r--r-- | src/intel/compiler/brw_compiler.h | 1 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_generator.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index e8a2c6135f5..52675ec4ac5 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -176,8 +176,10 @@ blorp_compile_fs(struct blorp_context *blorp, void *mem_ctx, wm_prog_data->base.nr_params = 0; wm_prog_data->base.param = NULL; - /* BLORP always just uses the first two binding table entries */ - wm_prog_data->binding_table.render_target_start = BLORP_RENDERBUFFER_BT_INDEX; + /* BLORP always uses the first two binding table entries: + * - Surface 0 is the render target (which always start from 0) + * - Surface 1 is the source texture + */ wm_prog_data->base.binding_table.texture_start = BLORP_TEXTURE_BT_INDEX; nir = brw_preprocess_nir(compiler, nir); diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h index 0060c381c0d..b1086bbcee5 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw_compiler.h @@ -681,7 +681,6 @@ struct brw_wm_prog_data { /** @{ * surface indices the WM-specific surfaces */ - uint32_t render_target_start; uint32_t render_target_read_start; /** @} */ } binding_table; diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index 91bf0643084..cd5be054f69 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -287,8 +287,6 @@ fs_generator::fire_fb_write(fs_inst *inst, * messages set "Render Target Index" to 0. Using a different binding * table index would make it impossible to use headerless messages. */ - assert(prog_data->binding_table.render_target_start == 0); - const uint32_t surf_index = inst->target; bool last_render_target = inst->eot || @@ -427,8 +425,8 @@ fs_generator::generate_fb_read(fs_inst *inst, struct brw_reg dst, { assert(inst->size_written % REG_SIZE == 0); struct brw_wm_prog_data *prog_data = brw_wm_prog_data(this->prog_data); - const unsigned surf_index = - prog_data->binding_table.render_target_start + inst->target; + /* We assume that render targets start at binding table index 0. */ + const unsigned surf_index = inst->target; gen9_fb_READ(p, dst, payload, surf_index, inst->header_size, inst->size_written / REG_SIZE, |