diff options
| author | Kenneth Graunke <[email protected]> | 2018-12-28 17:54:57 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-01-13 09:35:32 -0800 |
| commit | 04c2f12ab28d61d30f9cb008edb9039c610dfb5f (patch) | |
| tree | 10f196589ea74704a1ff57d445138a1896e34f28 /src/mesa | |
| parent | bdf6a5c1d2e01aed88a338c403f28a4b9898068e (diff) | |
i965: Drop mark_surface_used mechanism.
The original idea was that the backend compiler could eliminate
surfaces, so we would have it mark which ones are actually used,
then shrink the binding table accordingly. Unfortunately, it's a
pretty blunt mechanism - it can only prune things from the end,
not the middle - since we decide the layout before we even start
the backend compiler, and only limit the size. It also basically
gives up if it sees indirect array access.
Besides, we do the vast majority of our surface elimination in NIR
anyway, not the backend - and I don't see that trend changing any
time soon. Vulkan abandoned this plan a long time ago, and I don't
use it in Iris, but it's still been kicking around in i965.
I hacked shader-db to print the binding table size in bytes, and
observed no changes with this patch. So, this code appears to do
nothing useful.
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 66cdc1a10b6..256fdd8fc79 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -109,10 +109,6 @@ brw_setup_image_uniform_values(gl_shader_stage stage, image_idx, offsetof(brw_image_param, swizzling), 2); param += BRW_IMAGE_PARAM_SIZE; - - brw_mark_surface_used( - stage_prog_data, - stage_prog_data->binding_table.image_start + image_idx); } } diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 78dc4709e05..c01143decd0 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -896,7 +896,10 @@ brw_assign_common_binding_table_offsets(const struct gen_device_info *devinfo, stage_prog_data->binding_table.plane_start[2] = next_binding_table_offset; next_binding_table_offset += num_textures; - /* prog_data->base.binding_table.size will be set by brw_mark_surface_used. */ + /* Set the binding table size. Some callers may append new entries + * and increase this accordingly. + */ + stage_prog_data->binding_table.size_bytes = next_binding_table_offset * 4; assert(next_binding_table_offset <= BRW_MAX_SURFACES); return next_binding_table_offset; diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 536e47638e6..7bbb6166344 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -63,6 +63,9 @@ assign_fs_binding_table_offsets(const struct gen_device_info *devinfo, next_binding_table_offset; next_binding_table_offset += key->nr_color_regions; } + + /* Update the binding table size */ + prog_data->base.binding_table.size_bytes = next_binding_table_offset * 4; } static void |