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

iris: Fix assertion meant to only target the clear-color stride

Browse source 
Fixes: 2bc8c61fd0 ("iris: Return a 64B stride for clear color plane")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6398
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16241>
(cherry picked from commit 33456ae5a4)
This commit is contained in:
Jordan Justen 2022-04-29 02:37:25 -07:00 • committed by Dylan Baker
parent ebc9a11318
commit 33c3034765
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1012,7 +1012,7 @@
"description": "iris: Fix assertion meant to only target the clear-color stride",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "2bc8c61fd00b2877319f54afeaba3d606fd8532c"
},

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

@ -1692,7 +1692,7 @@ iris_resource_get_param(struct pipe_screen *pscreen,
* the plane's pitch should be ignored, some kernels have been found to
* require 64-byte alignment.
*/
assert(*value != 0 && *value % 64 == 0);
assert(*value != 0 && (!wants_cc || *value % 64 == 0));
return true;
case PIPE_RESOURCE_PARAM_OFFSET: