Commit f75c1e83 authored by Dave Airlie's avatar Dave Airlie Committed by Marge Bot

llvmpipe: pass number of images into image soa create

Just store this for now to use later with indexing
Reviewed-by: default avatarRoland Scheidegger <sroland@vmware.com>
Part-of: <!3778>
parent 8a4ef09e
......@@ -175,7 +175,7 @@ generate_compute(struct llvmpipe_context *lp,
assert(builder);
LLVMPositionBuilderAtEnd(builder, block);
sampler = lp_llvm_sampler_soa_create(key->samplers, key->nr_samplers);
image = lp_llvm_image_soa_create(lp_cs_variant_key_images(key));
image = lp_llvm_image_soa_create(lp_cs_variant_key_images(key), key->nr_images);
struct lp_build_loop_state loop_state[4];
LLVMValueRef num_x_loop;
......
......@@ -2917,7 +2917,7 @@ generate_fragment(struct llvmpipe_context *lp,
/* code generated texture sampling */
sampler = lp_llvm_sampler_soa_create(key->samplers, key->nr_samplers);
image = lp_llvm_image_soa_create(lp_fs_variant_key_images(key));
image = lp_llvm_image_soa_create(lp_fs_variant_key_images(key), key->nr_images);
num_fs = 16 / fs_type.length; /* number of loops per 4x4 stamp */
/* for 1d resources only run "upper half" of stamp */
......
......@@ -94,6 +94,7 @@ struct lp_llvm_image_soa
struct lp_build_image_soa base;
struct llvmpipe_image_dynamic_state dynamic_state;
unsigned nr_images;
};
......@@ -495,7 +496,8 @@ lp_llvm_image_soa_emit_size_query(const struct lp_build_image_soa *base,
}
struct lp_build_image_soa *
lp_llvm_image_soa_create(const struct lp_image_static_state *static_state)
lp_llvm_image_soa_create(const struct lp_image_static_state *static_state,
unsigned nr_images)
{
struct lp_llvm_image_soa *image;
......@@ -519,5 +521,6 @@ lp_llvm_image_soa_create(const struct lp_image_static_state *static_state)
image->dynamic_state.static_state = static_state;
image->nr_images = nr_images;
return &image->base;
}
......@@ -49,6 +49,7 @@ lp_llvm_sampler_soa_create(const struct lp_sampler_static_state *key,
unsigned nr_samplers);
struct lp_build_image_soa *
lp_llvm_image_soa_create(const struct lp_image_static_state *key);
lp_llvm_image_soa_create(const struct lp_image_static_state *key,
unsigned nr_images);
#endif /* LP_TEX_SAMPLE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment