summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Davenport <ddavenport@chromium.org>2020-01-27 11:13:19 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-02-03 08:31:30 -0800
commita350a802cd776be12fb0d39315fc77507902dc53 (patch)
treea815aa95f5c0983e0d923b0b1055e0fa59b126a7
parente0a3fa8bb283bd325f8523322a4f4e27a5a13c5c (diff)
radeonsi: Clear uninitialized variable
|view| was not initialized leading to flaky test failures in SkQP test unitTest_ES2BlendWithNoTexture. Fixes: 029bfa3d253 "radeonsi: add ability to bind images as image buffers" Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3592> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3592> (cherry picked from commit 0d99ff54cc3fb1dd85044f8971f6686138a5f149)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/radeonsi/si_descriptors.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 1c296ad4e67..f5ed2ecb633 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -40,7 +40,7 @@
"description": "radeonsi: Clear uninitialized variable",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "029bfa3d253ca70186e245ccf0a7e17bb40a5bab"
},
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index fa72e5780dc..25ef0abbb2c 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -903,7 +903,7 @@ void si_update_ps_colorbuf0_slot(struct si_context *sctx)
if (surf) {
struct si_texture *tex = (struct si_texture*)surf->texture;
- struct pipe_image_view view;
+ struct pipe_image_view view = {0};
assert(tex);
assert(!tex->is_depth);