r600/sfn: lower image derefs

v2: Signal lowering image derefs by using the CAP

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

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 435aa62ad7c457ebe3897f6306598338bb960f89..a1a41cc3e5ce862ce6ef03839003389b1f797095 100644 (file)
--- 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 571498a8f4b976790f00f4bed23284e754cefe3d..8ae92fd09ebe8805930cb589b8cb6c5f1e53f2c4 100644 (file)
--- 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);