diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-05-05 06:39:44 +1000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-05-17 01:19:24 +0000 |
| commit | 36eb75d281bd0898b4b669969993f38b5fa9515b (patch) | |
| tree | bcf48bd6021dbf1433308cd75d23520e38d2637c /src/gallium/drivers/llvmpipe/lp_state_fs.c | |
| parent | f4c8a520c26e857868fa9e3aec486bae079aabd6 (diff) | |
llvmpipe: move to common sampler/image binding code
This leaves the cache stuff in place, but we should consider trying
to consolidate that.
Reviewed-by: Brian Paul <brianp@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22788>
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_state_fs.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_fs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index 5950d4039cb..8730a5963cf 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -90,6 +90,7 @@ #include "gallivm/lp_bld_format.h" #include "gallivm/lp_bld_quad.h" #include "gallivm/lp_bld_gather.h" +#include "gallivm/lp_bld_jit_sample.h" #include "lp_bld_alpha.h" #include "lp_bld_blend.h" @@ -3291,7 +3292,7 @@ generate_fragment(struct llvmpipe_context *lp, MAX2(key->nr_samplers, key->nr_sampler_views)); struct lp_build_image_soa *image = - lp_llvm_image_soa_create(lp_fs_variant_key_images(key), key->nr_images); + lp_bld_llvm_image_soa_create(lp_fs_variant_key_images(key), key->nr_images); unsigned num_fs = 16 / fs_type.length; /* number of loops per 4x4 stamp */ /* for 1d resources only run "upper half" of stamp */ @@ -3471,8 +3472,8 @@ generate_fragment(struct llvmpipe_context *lp, } } - lp_llvm_sampler_soa_destroy(sampler); - lp_llvm_image_soa_destroy(image); + lp_bld_llvm_sampler_soa_destroy(sampler); + lp_bld_llvm_image_soa_destroy(image); /* Loop over color outputs / color buffers to do blending */ for (unsigned cbuf = 0; cbuf < key->nr_cbufs; cbuf++) { |