fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 20:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/wm_surface_state: Use the clear address if clear_bo is non-NULL

Browse source 
We want to add and use a getter that turns off the indirect path by
returning zero for the clear color bo and offset.

v2: Fix usage of "clear address" in commit message (Jason).

Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Nanley Chery 2018-04-10 13:56:18 -07:00
parent af4e9295fe
commit cd5ce363e3
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -155,6 +155,8 @@ brw_emit_surface_state(struct brw_context *brw,
struct brw_bo *aux_bo = NULL;
struct isl_surf *aux_surf = NULL;
uint64_t aux_offset = 0;
struct brw_bo *clear_bo = NULL;
uint32_t clear_offset = 0;
if (aux_usage != ISL_AUX_USAGE_NONE) {
aux_surf = &mt->aux_buf->surf;
@ -164,6 +166,8 @@ brw_emit_surface_state(struct brw_context *brw,
/* We only really need a clear color if we also have an auxiliary
* surface. Without one, it does nothing.
*/
clear_bo = mt->aux_buf->clear_color_bo;
clear_offset = mt->aux_buf->clear_color_offset;
clear_color = mt->fast_clear_color;
}
@ -172,15 +176,6 @@ brw_emit_surface_state(struct brw_context *brw,
brw->isl_dev.ss.align,
surf_offset);
bool use_clear_address = devinfo->gen >= 10 && aux_surf;
struct brw_bo *clear_bo = NULL;
uint32_t clear_offset = 0;
if (use_clear_address) {
clear_bo = mt->aux_buf->clear_color_bo;
clear_offset = mt->aux_buf->clear_color_offset;
}
isl_surf_fill_state(&brw->isl_dev, state, .surf = &surf, .view = &view,
.address = brw_state_reloc(&brw->batch,
*surf_offset + brw->isl_dev.ss.addr_offset,
@ -189,7 +184,7 @@ brw_emit_surface_state(struct brw_context *brw,
.aux_address = aux_offset,
.mocs = brw_get_bo_mocs(devinfo, mt->bo),
.clear_color = clear_color,
.use_clear_address = use_clear_address,
.use_clear_address = clear_bo != NULL,
.clear_address = clear_offset,
.x_offset_sa = tile_x, .y_offset_sa = tile_y);
if (aux_surf) {
@ -221,7 +216,7 @@ brw_emit_surface_state(struct brw_context *brw,
}
}
if (use_clear_address) {
if (clear_bo != NULL) {
/* Make sure the offset is aligned with a cacheline. */
assert((clear_offset & 0x3f) == 0);
uint32_t *clear_address =