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

anv/blorp: Use BLORP_BATCH_NO_UPDATE_CLEAR_COLOR

Browse source 
Avoid failing the `info->use_clear_address` assertion in ISL on Gen12+.

Fixes: 6c9f9a82d7 ("intel/genxml,isl: Add gen12 render surface state changes")
Reported-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Nanley Chery 2019-10-23 15:51:56 -07:00
parent 939ddccb7a
commit 698d723a6d
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/intel/vulkan/anv_blorp.c
View file

@ -1699,7 +1699,8 @@ anv_image_mcs_op(struct anv_cmd_buffer *cmd_buffer,
struct blorp_batch batch;
blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer,
predicate ? BLORP_BATCH_PREDICATE_ENABLE : 0);
BLORP_BATCH_PREDICATE_ENABLE * predicate +
BLORP_BATCH_NO_UPDATE_CLEAR_COLOR * !clear_value);
struct blorp_surf surf;
get_blorp_surf_for_anv_image(cmd_buffer->device, image, aspect,
@ -1708,17 +1709,10 @@ anv_image_mcs_op(struct anv_cmd_buffer *cmd_buffer,
/* Blorp will store the clear color for us if we provide the clear color
* address and we are doing a fast clear. So we save the clear value into
* the blorp surface. However, in some situations we want to do a fast clear
* without changing the clear value stored in the state buffer. For those
* cases, we set the clear color address pointer to NULL, so blorp will not
* try to store a garbage color.
* the blorp surface.
*/
if (mcs_op == ISL_AUX_OP_FAST_CLEAR) {
if (clear_value)
surf.clear_color = *clear_value;
else
surf.clear_color_addr.buffer = NULL;
}
if (clear_value)
surf.clear_color = *clear_value;
/* From the Sky Lake PRM Vol. 7, "Render Target Fast Clear":
*
@ -1785,7 +1779,8 @@ anv_image_ccs_op(struct anv_cmd_buffer *cmd_buffer,
struct blorp_batch batch;
blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer,
predicate ? BLORP_BATCH_PREDICATE_ENABLE : 0);
BLORP_BATCH_PREDICATE_ENABLE * predicate +
BLORP_BATCH_NO_UPDATE_CLEAR_COLOR * !clear_value);
struct blorp_surf surf;
get_blorp_surf_for_anv_image(cmd_buffer->device, image, aspect,
@ -1795,17 +1790,10 @@ anv_image_ccs_op(struct anv_cmd_buffer *cmd_buffer,
/* Blorp will store the clear color for us if we provide the clear color
* address and we are doing a fast clear. So we save the clear value into
* the blorp surface. However, in some situations we want to do a fast clear
* without changing the clear value stored in the state buffer. For those
* cases, we set the clear color address pointer to NULL, so blorp will not
* try to store a garbage color.
* the blorp surface.
*/
if (ccs_op == ISL_AUX_OP_FAST_CLEAR) {
if (clear_value)
surf.clear_color = *clear_value;
else
surf.clear_color_addr.buffer = NULL;
}
if (clear_value)
surf.clear_color = *clear_value;
/* From the Sky Lake PRM Vol. 7, "Render Target Fast Clear":
*