diff options
| author | Gert Wollny <gert.wollny@collabora.com> | 2020-05-06 23:15:28 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-05-20 20:55:20 +0200 |
| commit | 1edaba5f4a7105642f56188cd70b3866d1927b12 (patch) | |
| tree | 79df5d4d7de01312f8ecbd8ffa10c23d7c10a313 | |
| parent | b5a7d4b68b3040def74529d8a064d66e1796c6c0 (diff) | |
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@collabora.com>
Reviewed-by: Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5085>
(cherry picked from commit 32305c0959dec86c24ef776209d4a92bb47e5776)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 fcc954dd062..516920f0fe5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1390,7 +1390,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; |