Mesa (master): r600/sfn: Force a minimum of 4 GPRs, it seems to fix atomics

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 834a61df4ed4257ca4bb69fed6664c80cc726f82
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=834a61df4ed4257ca4bb69fed6664c80cc726f82

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Thu May 21 00:03:34 2020 +0200

r600/sfn: Force a minimum of 4 GPRs, it seems to fix atomics

This fixes spec at arb_compute_shader@execution at atomic-counter on
HD 5450

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6025>

---

 src/gallium/drivers/r600/sfn/sfn_nir.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index f22ae7b296a..d7bf09eb46f 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -977,6 +977,8 @@ int r600_shader_from_nir(struct r600_context *rctx,
    } else {
       r600::sfn_log << r600::SfnLog::shader_info << "This is not a Geometry shader\n";
    }
+   if (pipeshader->shader.bc.ngpr < 4)
+      pipeshader->shader.bc.ngpr = 4;
 
    return 0;
 }