diff options
| author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2024-09-12 12:02:46 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-09-12 14:36:56 +0000 |
| commit | 8338e2082e73feeccc7d54aeaba04602b6133ce4 (patch) | |
| tree | 0392916fca493e2b98412cf321a8ea559a4a30d6 | |
| parent | c84be162a1eb3375ea068facabe4257eb74a4181 (diff) | |
v3d: do not rebind a sampler view already rebound
As sampler view can be used multiple times, do not attempt to rebind if
it was already bound.
This fixes a crash when replaying half-life-2-v2.trace.
Backport-to: 24.2
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31049>
| -rw-r--r-- | src/broadcom/ci/traces-broadcom.yml | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/v3d/v3d_resource.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/broadcom/ci/traces-broadcom.yml b/src/broadcom/ci/traces-broadcom.yml index 1ea5edc94ce..3a033f6cb9e 100644 --- a/src/broadcom/ci/traces-broadcom.yml +++ b/src/broadcom/ci/traces-broadcom.yml @@ -233,7 +233,7 @@ traces: label: [skip, timeout] checksum: 512c305e645e2ec62d94976d86f42f1b broadcom-rpi5: - label: [crash] + label: [skip, timeout] checksum: 512c305e645e2ec62d94976d86f42f1b valve/portal-2-v2.trace: diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c index c14000040fc..709757bb160 100644 --- a/src/gallium/drivers/v3d/v3d_resource.c +++ b/src/gallium/drivers/v3d/v3d_resource.c @@ -173,6 +173,10 @@ rebind_sampler_views(struct v3d_context *v3d, struct v3d_sampler_view *sview = v3d_sampler_view(psview); + + if (sview->serial_id == rsc->serial_id) + continue; + struct v3d_device_info *devinfo = &v3d->screen->devinfo; |