diff options
| author | Rhys Perry <pendingchaos02@gmail.com> | 2021-09-08 11:37:07 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-08-30 18:21:44 +0000 |
| commit | aa2d6e020b138ebcf86ee091268dd5193babc832 (patch) | |
| tree | 3e9c815ebe262dc14d00a5562a2361e1041e1789 /src/microsoft | |
| parent | 1df320dae731f7eca88d21d438f1cbc11337cb70 (diff) | |
| download | mesa-aa2d6e020b138ebcf86ee091268dd5193babc832.tar.gz mesa-aa2d6e020b138ebcf86ee091268dd5193babc832.tar.bz2 mesa-aa2d6e020b138ebcf86ee091268dd5193babc832.zip | |
Revert "nir: Drop the unused instr arg for src/dest copy functions."
This reverts commit c3a01841184ee8303c0c5ebe58491301622c5ad6.
Acked-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12910>
Diffstat (limited to 'src/microsoft')
| -rw-r--r-- | src/microsoft/compiler/dxil_nir_lower_int_cubemaps.c | 2 | ||||
| -rw-r--r-- | src/microsoft/compiler/dxil_nir_lower_int_samplers.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/microsoft/compiler/dxil_nir_lower_int_cubemaps.c b/src/microsoft/compiler/dxil_nir_lower_int_cubemaps.c index 41b28ab48b3..936875b2f3f 100644 --- a/src/microsoft/compiler/dxil_nir_lower_int_cubemaps.c +++ b/src/microsoft/compiler/dxil_nir_lower_int_cubemaps.c @@ -210,7 +210,7 @@ create_array_tex_from_cube_tex(nir_builder *b, nir_tex_instr *tex, nir_ssa_def * nir_src *psrc = (tex->src[i].src_type == nir_tex_src_coord) ? &coord_src : &tex->src[i].src; - nir_src_copy(&array_tex->src[i].src, psrc); + nir_src_copy(&array_tex->src[i].src, psrc, array_tex); array_tex->src[i].src_type = tex->src[i].src_type; } diff --git a/src/microsoft/compiler/dxil_nir_lower_int_samplers.c b/src/microsoft/compiler/dxil_nir_lower_int_samplers.c index 4811fa37052..4546a79a1cf 100644 --- a/src/microsoft/compiler/dxil_nir_lower_int_samplers.c +++ b/src/microsoft/compiler/dxil_nir_lower_int_samplers.c @@ -81,7 +81,7 @@ dx_get_texture_lod(nir_builder *b, nir_tex_instr *tex) nir_ssa_def *ssa_src = nir_channels(b, tex->src[coord_index].src.ssa, (1 << coord_components) - 1); nir_src src = nir_src_for_ssa(ssa_src); - nir_src_copy(&tql->src[0].src, &src); + nir_src_copy(&tql->src[0].src, &src, tql); tql->src[0].src_type = nir_tex_src_coord; unsigned idx = 1; @@ -92,7 +92,7 @@ dx_get_texture_lod(nir_builder *b, nir_tex_instr *tex) tex->src[i].src_type == nir_tex_src_sampler_offset || tex->src[i].src_type == nir_tex_src_texture_handle || tex->src[i].src_type == nir_tex_src_sampler_handle) { - nir_src_copy(&tql->src[idx].src, &tex->src[i].src); + nir_src_copy(&tql->src[idx].src, &tex->src[i].src, tql); tql->src[idx].src_type = tex->src[i].src_type; idx++; } @@ -278,7 +278,7 @@ create_txf_from_tex(nir_builder *b, nir_tex_instr *tex) if (tex->src[i].src_type == nir_tex_src_texture_deref || tex->src[i].src_type == nir_tex_src_texture_offset || tex->src[i].src_type == nir_tex_src_texture_handle) { - nir_src_copy(&txf->src[idx].src, &tex->src[i].src); + nir_src_copy(&txf->src[idx].src, &tex->src[i].src, txf); txf->src[idx].src_type = tex->src[i].src_type; idx++; } |