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

iris: Always use BLORP_BATCH_NO_UPDATE_CLEAR_COLOR

Browse source 
Update the clear color with iris rather than with BLORP. This enables an
optimization in the next patch.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30824>
This commit is contained in:
Nanley Chery 2024-08-14 12:10:34 -04:00 • committed by Marge Bot
parent 721d0c3e77
commit 2886851a8e
3 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/iris/iris_clear.c
View file

@ -288,31 +288,15 @@ fast_clear_color(struct iris_context *ice,
PIPE_CONTROL_DATA_CACHE_FLUSH : 0) |
PIPE_CONTROL_PSS_STALL_SYNC);
/* From the ICL PRMs, Volume 9: Render Engine, State Caching :
*
* "Any values referenced by pointers within the RENDER_SURFACE_STATE
* [...] (e.g. Clear Color Pointer, [...]) are considered to be part of
* that state and any changes to these referenced values requires an
* invalidation of the L1 state cache to ensure the new values are being
* used as part of the state. [...]"
*
* Invalidate the state cache as suggested.
*/
if (devinfo->ver >= 11) {
iris_emit_pipe_control_flush(batch, "fast clear: pre-inval",
PIPE_CONTROL_STATE_CACHE_INVALIDATE);
}
/* Update the clear color now that previous rendering is complete. */
if (color_changed && res->aux.clear_color_bo)
iris_resource_update_indirect_color(batch, res);
iris_batch_sync_region_start(batch);
/* If we reach this point, we need to fast clear to change the state to
* ISL_AUX_STATE_CLEAR, or to update the fast clear color (or both).
*/
enum blorp_batch_flags blorp_flags = 0;
blorp_flags |= color_changed ? 0 : BLORP_BATCH_NO_UPDATE_CLEAR_COLOR;
struct blorp_batch blorp_batch;
blorp_batch_init(&ice->blorp, &blorp_batch, batch, blorp_flags);
blorp_batch_init(&ice->blorp, &blorp_batch, batch,
BLORP_BATCH_NO_UPDATE_CLEAR_COLOR);
struct blorp_surf surf;
iris_blorp_surf_for_resource(batch, &surf, p_res, res->aux.usage,

69
src/gallium/drivers/iris/iris_resolve.c
View file

@ -1215,6 +1215,51 @@ iris_render_formats_color_compatible(enum isl_format a, enum isl_format b,
return false;
}
void
iris_resource_update_indirect_color(struct iris_batch *batch,
struct iris_resource *res)
{
assert(res->aux.clear_color_bo);
uint32_t pixel[4];
isl_color_value_pack(&res->aux.clear_color, res->surf.format, pixel);
iris_emit_pipe_control_write(batch, "update fast clear color (RG____)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset,
(uint64_t) res->aux.clear_color.u32[0] |
(uint64_t) res->aux.clear_color.u32[1] << 32);
iris_emit_pipe_control_write(batch, "update fast clear color (__BA__)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset + 8,
(uint64_t) res->aux.clear_color.u32[2] |
(uint64_t) res->aux.clear_color.u32[3] << 32);
iris_emit_pipe_control_write(batch, "update fast clear color (____PX)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset + 16,
(uint64_t) pixel[0] |
(uint64_t) pixel[1] << 32);
/* From the ICL PRMs, Volume 9: Render Engine, State Caching :
*
* "Any values referenced by pointers within the RENDER_SURFACE_STATE
* [...] (e.g. Clear Color Pointer, [...]) are considered to be part of
* that state and any changes to these referenced values requires an
* invalidation of the L1 state cache to ensure the new values are being
* used as part of the state. [...]"
*
* Invalidate the state cache as suggested.
*/
iris_emit_pipe_control_flush(batch, "new clear color affects state cache",
PIPE_CONTROL_FLUSH_ENABLE |
PIPE_CONTROL_STATE_CACHE_INVALIDATE);
}
enum isl_aux_usage
iris_resource_render_aux_usage(struct iris_context *ice,
struct iris_resource *res,
@ -1302,28 +1347,8 @@ iris_resource_prepare_render(struct iris_context *ice,
if (res->aux.clear_color_bo) {
/* Update dwords used for rendering and sampling. */
iris_emit_pipe_control_write(&ice->batches[IRIS_BATCH_RENDER],
"zero fast clear color (RG____)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset, 0);
iris_emit_pipe_control_write(&ice->batches[IRIS_BATCH_RENDER],
"zero fast clear color (__BA__)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset + 8, 0);
iris_emit_pipe_control_write(&ice->batches[IRIS_BATCH_RENDER],
"zero fast clear color (____PX)",
PIPE_CONTROL_WRITE_IMMEDIATE,
res->aux.clear_color_bo,
res->aux.clear_color_offset + 16, 0);
iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_RENDER],
"new clear color affects state cache",
PIPE_CONTROL_FLUSH_ENABLE |
PIPE_CONTROL_STATE_CACHE_INVALIDATE);
struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
iris_resource_update_indirect_color(batch, res);
} else {
/* Flag surface states with inline clear colors as dirty. */
ice->state.stage_dirty |= IRIS_ALL_STAGE_DIRTY_BINDINGS;

2
src/gallium/drivers/iris/iris_resource.h
View file

@ -494,6 +494,8 @@ bool iris_render_formats_color_compatible(enum isl_format a,
enum isl_format b,
union isl_color_value color,
bool clear_color_unknown);
void iris_resource_update_indirect_color(struct iris_batch *batch,
struct iris_resource *res);
enum isl_aux_usage iris_resource_render_aux_usage(struct iris_context *ice,
struct iris_resource *res,
enum isl_format render_fmt,