diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2022-04-29 02:37:25 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-05-02 10:46:36 -0700 |
| commit | 33c3034765cfe4e919c8f37f09b51e9fea55aa33 (patch) | |
| tree | 32ed83a097d3d753fdc211729a9c956dd1ccb3ca | |
| parent | ebc9a11318977b2790538db8d30482de3e1275b9 (diff) | |
iris: Fix assertion meant to only target the clear-color stride
Fixes: 2bc8c61fd00 ("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 33456ae5a48c809cee251ca6d70f2b7f5941bc87)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_resource.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 216a2e9597f..29647acf785 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 4742a996a2c..c23728577ad 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -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: |