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

iris: finish aux import on get_param

Browse source 
A buffer and its aux are imported separately, if the aux import is
not completed yet when resource_get_param is called, merge the
separate aux a.k.a the 2nd image into the main image.

Fixes: 246eebba4a ("iris: Export and import surfaces with modifiers that have aux data")

Signed-off-by: James Xiong <james.xiong@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
(cherry picked from commit fd235484fe)
This commit is contained in:
James Xiong 2019-10-14 15:55:18 -07:00 • committed by Dylan Baker
parent ae4f569232
commit 9a929cfef2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/iris/iris_resource.c
View file

@ -1078,10 +1078,14 @@ iris_resource_get_param(struct pipe_screen *screen,
bool mod_with_aux =
res->mod_info && res->mod_info->aux_usage != ISL_AUX_USAGE_NONE;
bool wants_aux = mod_with_aux && plane > 0;
struct iris_bo *bo = wants_aux ? res->aux.bo : res->bo;
bool result;
unsigned handle;
if (iris_resource_unfinished_aux_import(res))
iris_resource_finish_aux_import(screen, res);
struct iris_bo *bo = wants_aux ? res->aux.bo : res->bo;
iris_resource_disable_aux_on_first_query(resource, handle_usage);
switch (param) {