Mesa (staging/20.1): r600/sfn: Fix printing vertex fetch instruction flags

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 5c008c8583f03c3b269ab82e57bc862785c5ba62
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c008c8583f03c3b269ab82e57bc862785c5ba62

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Wed May  6 23:15:28 2020 +0200

r600/sfn: Fix printing vertex fetch instruction flags

Fixes: f718ac62688b555a933c7112f656944288d04edb
    r600/sfn: Add a basic nir shader backend

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5085>
(cherry picked from commit 32305c0959dec86c24ef776209d4a92bb47e5776)

---

 .pick_status.json                                      | 2 +-
 src/gallium/drivers/r600/sfn/sfn_instruction_fetch.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d74e6bbec79..caf16c06f47 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -841,7 +841,7 @@
         "description": "r600/sfn: Fix printing vertex fetch instruction flags",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f718ac62688b555a933c7112f656944288d04edb"
     },
diff --git a/src/gallium/drivers/r600/sfn/sfn_instruction_fetch.cpp b/src/gallium/drivers/r600/sfn/sfn_instruction_fetch.cpp
index 62aec922a7b..4ee7bb3c701 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instruction_fetch.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instruction_fetch.cpp
@@ -430,7 +430,7 @@ void FetchInstruction::do_print(std::ostream& os) const
    };
    static const char buffer_index_mode_char[] = "_01E";
    static const char *flag_string[] = {"WQM",  "CF", "signed", "no_zero",
-                                       "nostride", "AC"};
+                                       "nostride", "AC", "TC", "VPM"};
    switch (m_vc_opcode) {
    case vc_fetch:
       os << "Fetch " << m_dst;