diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2016-07-01 13:46:40 -0700 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2016-08-25 18:36:06 -0700 |
| commit | 08705badfe136e1782e10472104323d861185357 (patch) | |
| tree | dafd3c28bdf7edb1ae626774b608a5b6590fa248 /src/mesa/drivers/dri/i965/brw_wm.c | |
| parent | 40b23ad57e8da0fd7af21e81ad52d615f9b492ed (diff) | |
| download | external_mesa3d-08705badfe136e1782e10472104323d861185357.zip external_mesa3d-08705badfe136e1782e10472104323d861185357.tar.gz external_mesa3d-08705badfe136e1782e10472104323d861185357.tar.bz2 | |
i965: Allocate space in the binding table for non-coherent FB fetch.
Unfortunately due to the inconsistent meaning of some surface state
structure fields, we cannot re-use the same binding table entries for
sampling from and rendering into the same set of render buffers, so we
need to allocate a separate binding table block specifically for
render target reads if the non-coherent path is in use.
The slight noise is due to the change of
brw_assign_common_binding_table_offsets to return the next available
binding table index rather than void.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index c513dbc..3f929c4 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -56,9 +56,16 @@ assign_fs_binding_table_offsets(const struct brw_device_info *devinfo, prog_data->binding_table.render_target_start = next_binding_table_offset; next_binding_table_offset += MAX2(key->nr_color_regions, 1); - brw_assign_common_binding_table_offsets(MESA_SHADER_FRAGMENT, devinfo, - shader_prog, prog, &prog_data->base, - next_binding_table_offset); + next_binding_table_offset = + brw_assign_common_binding_table_offsets(MESA_SHADER_FRAGMENT, devinfo, + shader_prog, prog, &prog_data->base, + next_binding_table_offset); + + if (prog->nir->info.outputs_read && !key->coherent_fb_fetch) { + prog_data->binding_table.render_target_read_start = + next_binding_table_offset; + next_binding_table_offset += key->nr_color_regions; + } } /** |