OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Flag ALL_DIRTY_BINDINGS on aux state change.

Browse Source 
If we change the aux state for a given resource, we need to re-emit the
binding table pointers for any stage that has such resource bound. Since
we don't track that, flag IRIS_ALL_DIRTY_BINDINGS and emit all of them.
This commit is contained in:
Rafael Antognolli
2019-02-19 17:12:19 -08:00
committed by Kenneth Graunke
parent 95589652a1
commit db81445837
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gallium/drivers/iris/iris_resolve.c
View File

@@ -191,8 +191,11 @@ iris_predraw_resolve_framebuffer(struct iris_context *ice,
ice->state.blend_enables & (1u << i), ice->state.blend_enables & (1u << i),
draw_aux_buffer_disabled[i]); draw_aux_buffer_disabled[i]);
// XXX: NEW_AUX_STATE if (ice->state.draw_aux_usage[i] != aux_usage) {
ice->state.draw_aux_usage[i] = aux_usage; ice->state.draw_aux_usage[i] = aux_usage;
/* XXX: Need to track which bindings to make dirty */
ice->state.dirty |= IRIS_ALL_DIRTY_BINDINGS;
}
iris_resource_prepare_render(ice, batch, res, surf->view.base_level, iris_resource_prepare_render(ice, batch, res, surf->view.base_level,
surf->view.base_array_layer, surf->view.base_array_layer,
@@ -805,12 +808,12 @@ iris_resource_prepare_ccs_access(struct iris_context *ice,
* pass-through state. (You can also think of this as being both a * pass-through state. (You can also think of this as being both a
* resolve and an ambiguate in one operation.) * resolve and an ambiguate in one operation.)
*/ */
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_PASS_THROUGH); ISL_AUX_STATE_PASS_THROUGH);
break; break;
case ISL_AUX_OP_PARTIAL_RESOLVE: case ISL_AUX_OP_PARTIAL_RESOLVE:
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_NO_CLEAR); ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
break; break;
@@ -841,10 +844,10 @@ iris_resource_finish_ccs_write(struct iris_context *ice,
aux_usage == ISL_AUX_USAGE_CCS_D); aux_usage == ISL_AUX_USAGE_CCS_D);
if (aux_usage == ISL_AUX_USAGE_CCS_E) { if (aux_usage == ISL_AUX_USAGE_CCS_E) {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_CLEAR); ISL_AUX_STATE_COMPRESSED_CLEAR);
} else if (aux_state != ISL_AUX_STATE_PARTIAL_CLEAR) { } else if (aux_state != ISL_AUX_STATE_PARTIAL_CLEAR) {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_PARTIAL_CLEAR); ISL_AUX_STATE_PARTIAL_CLEAR);
} }
break; break;
@@ -856,7 +859,7 @@ iris_resource_finish_ccs_write(struct iris_context *ice,
case ISL_AUX_STATE_PASS_THROUGH: case ISL_AUX_STATE_PASS_THROUGH:
if (aux_usage == ISL_AUX_USAGE_CCS_E) { if (aux_usage == ISL_AUX_USAGE_CCS_E) {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_NO_CLEAR); ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
} else { } else {
/* Nothing to do */ /* Nothing to do */
@@ -873,7 +876,7 @@ iris_resource_finish_ccs_write(struct iris_context *ice,
switch (aux_state) { switch (aux_state) {
case ISL_AUX_STATE_CLEAR: case ISL_AUX_STATE_CLEAR:
assert(aux_usage == ISL_AUX_USAGE_CCS_D); assert(aux_usage == ISL_AUX_USAGE_CCS_D);
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_PARTIAL_CLEAR); ISL_AUX_STATE_PARTIAL_CLEAR);
break; break;
@@ -909,7 +912,7 @@ iris_resource_prepare_mcs_access(struct iris_context *ice,
case ISL_AUX_STATE_COMPRESSED_CLEAR: case ISL_AUX_STATE_COMPRESSED_CLEAR:
if (!fast_clear_supported) { if (!fast_clear_supported) {
iris_mcs_partial_resolve(ice, batch, res, layer, 1); iris_mcs_partial_resolve(ice, batch, res, layer, 1);
iris_resource_set_aux_state(res, 0, layer, 1, iris_resource_set_aux_state(ice, res, 0, layer, 1,
ISL_AUX_STATE_COMPRESSED_NO_CLEAR); ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
} }
break; break;
@@ -935,7 +938,7 @@ iris_resource_finish_mcs_write(struct iris_context *ice,
switch (iris_resource_get_aux_state(res, 0, layer)) { switch (iris_resource_get_aux_state(res, 0, layer)) {
case ISL_AUX_STATE_CLEAR: case ISL_AUX_STATE_CLEAR:
iris_resource_set_aux_state(res, 0, layer, 1, iris_resource_set_aux_state(ice, res, 0, layer, 1,
ISL_AUX_STATE_COMPRESSED_CLEAR); ISL_AUX_STATE_COMPRESSED_CLEAR);
break; break;
@@ -992,13 +995,13 @@ iris_resource_prepare_hiz_access(struct iris_context *ice,
switch (hiz_op) { switch (hiz_op) {
case ISL_AUX_OP_FULL_RESOLVE: case ISL_AUX_OP_FULL_RESOLVE:
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_RESOLVED); ISL_AUX_STATE_RESOLVED);
break; break;
case ISL_AUX_OP_AMBIGUATE: case ISL_AUX_OP_AMBIGUATE:
/* The HiZ resolve operation is actually an ambiguate */ /* The HiZ resolve operation is actually an ambiguate */
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_PASS_THROUGH); ISL_AUX_STATE_PASS_THROUGH);
break; break;
@@ -1019,7 +1022,7 @@ iris_resource_finish_hiz_write(struct iris_context *ice,
switch (iris_resource_get_aux_state(res, level, layer)) { switch (iris_resource_get_aux_state(res, level, layer)) {
case ISL_AUX_STATE_CLEAR: case ISL_AUX_STATE_CLEAR:
assert(aux_usage == ISL_AUX_USAGE_HIZ); assert(aux_usage == ISL_AUX_USAGE_HIZ);
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_CLEAR); ISL_AUX_STATE_COMPRESSED_CLEAR);
break; break;
@@ -1030,17 +1033,17 @@ iris_resource_finish_hiz_write(struct iris_context *ice,
case ISL_AUX_STATE_RESOLVED: case ISL_AUX_STATE_RESOLVED:
if (aux_usage == ISL_AUX_USAGE_HIZ) { if (aux_usage == ISL_AUX_USAGE_HIZ) {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_NO_CLEAR); ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
} else { } else {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_AUX_INVALID); ISL_AUX_STATE_AUX_INVALID);
} }
break; break;
case ISL_AUX_STATE_PASS_THROUGH: case ISL_AUX_STATE_PASS_THROUGH:
if (aux_usage == ISL_AUX_USAGE_HIZ) { if (aux_usage == ISL_AUX_USAGE_HIZ) {
iris_resource_set_aux_state(res, level, layer, 1, iris_resource_set_aux_state(ice, res, level, layer, 1,
ISL_AUX_STATE_COMPRESSED_NO_CLEAR); ISL_AUX_STATE_COMPRESSED_NO_CLEAR);
} }
break; break;
@@ -1176,7 +1179,8 @@ iris_resource_get_aux_state(const struct iris_resource *res,
} }
void void
iris_resource_set_aux_state(struct iris_resource *res, uint32_t level, iris_resource_set_aux_state(struct iris_context *ice,
struct iris_resource *res, uint32_t level,
uint32_t start_layer, uint32_t num_layers, uint32_t start_layer, uint32_t num_layers,
enum isl_aux_state aux_state) enum isl_aux_state aux_state)
{ {
@@ -1194,8 +1198,8 @@ iris_resource_set_aux_state(struct iris_resource *res, uint32_t level,
for (unsigned a = 0; a < num_layers; a++) { for (unsigned a = 0; a < num_layers; a++) {
if (res->aux.state[level][start_layer + a] != aux_state) { if (res->aux.state[level][start_layer + a] != aux_state) {
res->aux.state[level][start_layer + a] = aux_state; res->aux.state[level][start_layer + a] = aux_state;
// XXX: dirty works differently /* XXX: Need to track which bindings to make dirty */
// brw->ctx.NewDriverState |= BRW_NEW_AUX_STATE; ice->state.dirty |= IRIS_ALL_DIRTY_BINDINGS;
} }
} }
} }

5
src/gallium/drivers/iris/iris_resource.c
View File

@@ -767,7 +767,10 @@ iris_resource_get_handle(struct pipe_screen *pscreen,
0, INTEL_REMAINING_LEVELS, 0, INTEL_REMAINING_LEVELS,
0, INTEL_REMAINING_LAYERS, 0, INTEL_REMAINING_LAYERS,
ISL_AUX_USAGE_NONE, false); ISL_AUX_USAGE_NONE, false);
iris_resource_disable_aux(res); if (res->aux.usage != ISL_AUX_USAGE_NONE) {
iris_resource_disable_aux(res);
ice->state.dirty |= IRIS_ALL_DIRTY_BINDINGS;
}
} else { } else {
if (res->aux.usage != ISL_AUX_USAGE_NONE) { if (res->aux.usage != ISL_AUX_USAGE_NONE) {
enum isl_aux_state aux_state = enum isl_aux_state aux_state =

3
src/gallium/drivers/iris/iris_resource.h
View File

@@ -294,7 +294,8 @@ iris_resource_get_aux_state(const struct iris_resource *res,
* use iris_resource_prepare_access or iris_resource_finish_write. * use iris_resource_prepare_access or iris_resource_finish_write.
*/ */
void void
iris_resource_set_aux_state(struct iris_resource *res, uint32_t level, iris_resource_set_aux_state(struct iris_context *ice,
struct iris_resource *res, uint32_t level,
uint32_t start_layer, uint32_t num_layers, uint32_t start_layer, uint32_t num_layers,
enum isl_aux_state aux_state); enum isl_aux_state aux_state);