Mesa (staging/20.0): svga: fix size of format_conversion_table[]

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: f86e27156d7ee65f72be2289e012401a8aad53a1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f86e27156d7ee65f72be2289e012401a8aad53a1

Author: Neha Bhende <bhenden at vmware.com>
Date:   Mon Feb 10 10:39:51 2020 -0800

svga: fix size of format_conversion_table[]

Since we are now using sparse matrix for format_conversion_table,
we have to make sure we have last entry in table which gives the
sense of required size of format_conversion_table

Fixes: 84db6ba7 ("svga: Drop unsupported formats from the format table")

Reviewed-by: Charmaine Lee <charmainel at vmware.com>
(cherry picked from commit 470e73e7f86b4530cf789a779f43674ecec91881)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/svga/svga_format.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 88588a5e210..60affde7310 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -589,7 +589,7 @@
         "description": "svga: fix size of format_conversion_table[]",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "84db6ba740d376b75e60c3a2a4ac0153c5b0e01a"
     },
diff --git a/src/gallium/drivers/svga/svga_format.c b/src/gallium/drivers/svga/svga_format.c
index 488c68785c1..3f68f0cd67e 100644
--- a/src/gallium/drivers/svga/svga_format.c
+++ b/src/gallium/drivers/svga/svga_format.c
@@ -207,6 +207,8 @@ static const struct vgpu10_format_entry format_conversion_table[] =
    [ PIPE_FORMAT_L32_SINT ] =              { SVGA3D_FORMAT_INVALID,      SVGA3D_FORMAT_INVALID,       SVGA3D_R32_SINT,             TF_XXX1 },
    [ PIPE_FORMAT_L32A32_SINT ] =           { SVGA3D_FORMAT_INVALID,      SVGA3D_FORMAT_INVALID,       SVGA3D_R32G32_SINT,          TF_XXXY },
    [ PIPE_FORMAT_R10G10B10A2_UINT ] =      { SVGA3D_R10G10B10A2_UINT,    SVGA3D_R10G10B10A2_UINT,     SVGA3D_R10G10B10A2_UINT,     0 },
+   /* Must specify following entry to give the sense of size of format_conversion_table[] */
+   [ PIPE_FORMAT_COUNT ] = {SVGA3D_FORMAT_INVALID, SVGA3D_FORMAT_INVALID,    SVGA3D_FORMAT_INVALID,       0 },
 };