AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmpipe: Fix function call handling

Browse Source 
Fixes using images and samplers inside functions and allows for
function calls outside of kernels.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28187>
This commit is contained in:
Konstantin Seurer
2024-03-10 12:08:10 +01:00
committed by Marge Bot
parent 85e840786c
commit 04af9b3ac2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
+1 -1
View File
@@ -3078,7 +3078,7 @@ void lp_build_nir_soa_func(struct gallivm_state *gallivm,
"scratch");
}
if (shader->info.stage == MESA_SHADER_KERNEL) {
if (!exec_list_is_singular(&shader->functions)) {
bld.call_context_type = lp_build_cs_func_call_context(gallivm, type.length, bld.context_type, bld.resources_type);
if (!params->call_context_ptr) {
build_call_context(&bld);
src/gallium/drivers/llvmpipe/lp_state_cs.c
+11 -4
View File
@@ -444,6 +444,11 @@ generate_compute(struct llvmpipe_context *lp,
lp_build_nir_prepasses(nir);
struct hash_table *fns = _mesa_pointer_hash_table_create(NULL);
sampler = lp_llvm_sampler_soa_create(lp_cs_variant_key_samplers(key),
MAX2(key->nr_samplers,
key->nr_sampler_views));
image = lp_bld_llvm_image_soa_create(lp_cs_variant_key_images(key), key->nr_images);
if (exec_list_length(&nir->functions) > 1) {
LLVMTypeRef call_context_type = lp_build_cs_func_call_context(gallivm, cs_type.length,
variant->jit_cs_context_type,
@@ -531,9 +536,15 @@ generate_compute(struct llvmpipe_context *lp,
params.consts_ptr = lp_jit_resources_constants(gallivm,
variant->jit_resources_type,
params.resources_ptr);
params.sampler = sampler;
params.ssbo_ptr = lp_jit_resources_ssbos(gallivm,
variant->jit_resources_type,
params.resources_ptr);
params.image = image;
params.aniso_filter_table = lp_jit_resources_aniso_filter_table(gallivm,
variant->jit_resources_type,
params.resources_ptr);
lp_build_nir_soa_func(gallivm, shader->base.ir.nir,
func->impl,
&params,
@@ -550,10 +561,6 @@ generate_compute(struct llvmpipe_context *lp,
builder = gallivm->builder;
assert(builder);
LLVMPositionBuilderAtEnd(builder, block);
sampler = lp_llvm_sampler_soa_create(lp_cs_variant_key_samplers(key),
MAX2(key->nr_samplers,
key->nr_sampler_views));
image = lp_bld_llvm_image_soa_create(lp_cs_variant_key_images(key), key->nr_images);
if (is_mesh) {
LLVMTypeRef output_type = create_mesh_jit_output_type_deref(gallivm);