Mesa (master): r600/sfn: lower image derefs

[GitLab Mirror]

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

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Thu May  7 00:11:33 2020 +0200

r600/sfn: lower image derefs

v2: Signal lowering image derefs by using the CAP

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

---

 src/gallium/drivers/r600/r600_pipe.c     | 1 +
 src/gallium/drivers/r600/sfn/sfn_nir.cpp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 435aa62ad7c..a1a41cc3e5c 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -341,6 +341,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_TGSI_TEXCOORD:
 		return 1;
 
+	case PIPE_CAP_NIR_IMAGES_AS_DEREF:
 	case PIPE_CAP_FAKE_SW_MSAA:
 		return 0;
 
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index 571498a8f4b..8ae92fd09eb 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -579,7 +579,6 @@ int r600_shader_from_nir(struct r600_context *rctx,
       .lower_txp = ~0u,
    };
    NIR_PASS_V(sel->nir, nir_lower_tex, &lower_tex_options);
-
    NIR_PASS_V(sel->nir, r600::r600_nir_lower_txl_txf_array_or_cube);
 
    NIR_PASS_V(sel->nir, r600_nir_lower_int_tg4);