From 7a044ef68b84ab850a2299462e03aedf94a3db02 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 1 Feb 2018 13:17:08 -0700 Subject: [PATCH] gallivm/llvmpipe: add const qualifiers on sampler variables Once a lp_build_sampler_soa or lp_build_sampler_aos object is created, it should never be modified. Found by inspection. Reviewed-by: Roland Scheidegger --- src/gallium/auxiliary/draw/draw_llvm.c | 2 +- src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 8 ++++---- src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c | 2 +- src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 2 +- src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 8de29ea1fd4..69c10803750 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -606,7 +606,7 @@ generate_vs(struct draw_llvm_variant *variant, const LLVMValueRef (*inputs)[TGSI_NUM_CHANNELS], const struct lp_bld_tgsi_system_values *system_values, LLVMValueRef context_ptr, - struct lp_build_sampler_soa *draw_sampler, + const struct lp_build_sampler_soa *draw_sampler, boolean clamp_vertex_color) { struct draw_llvm *llvm = variant->llvm; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index eeeea507810..309ece88df2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -201,7 +201,7 @@ struct lp_build_sampler_soa struct lp_build_sampler_aos { LLVMValueRef - (*emit_fetch_texel)( struct lp_build_sampler_aos *sampler, + (*emit_fetch_texel)( const struct lp_build_sampler_aos *sampler, struct lp_build_context *bld, unsigned target, /* TGSI_TEXTURE_* */ unsigned unit, @@ -228,7 +228,7 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm, LLVMValueRef (*outputs)[4], LLVMValueRef context_ptr, LLVMValueRef thread_data_ptr, - struct lp_build_sampler_soa *sampler, + const struct lp_build_sampler_soa *sampler, const struct tgsi_shader_info *info, const struct lp_build_tgsi_gs_iface *gs_iface); @@ -241,7 +241,7 @@ lp_build_tgsi_aos(struct gallivm_state *gallivm, LLVMValueRef consts_ptr, const LLVMValueRef *inputs, LLVMValueRef *outputs, - struct lp_build_sampler_aos *sampler, + const struct lp_build_sampler_aos *sampler, const struct tgsi_shader_info *info); @@ -545,7 +545,7 @@ struct lp_build_tgsi_aos_context const LLVMValueRef *inputs; LLVMValueRef *outputs; - struct lp_build_sampler_aos *sampler; + const struct lp_build_sampler_aos *sampler; struct tgsi_declaration_sampler_view sv[PIPE_MAX_SHADER_SAMPLER_VIEWS]; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c index 2529c6a8bf9..85b2e8a207e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c @@ -862,7 +862,7 @@ lp_build_tgsi_aos(struct gallivm_state *gallivm, LLVMValueRef consts_ptr, const LLVMValueRef *inputs, LLVMValueRef *outputs, - struct lp_build_sampler_aos *sampler, + const struct lp_build_sampler_aos *sampler, const struct tgsi_shader_info *info) { struct lp_build_tgsi_aos_context bld; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index 97efc3a3990..fad74c68014 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -3780,7 +3780,7 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm, LLVMValueRef (*outputs)[TGSI_NUM_CHANNELS], LLVMValueRef context_ptr, LLVMValueRef thread_data_ptr, - struct lp_build_sampler_soa *sampler, + const struct lp_build_sampler_soa *sampler, const struct tgsi_shader_info *info, const struct lp_build_tgsi_gs_iface *gs_iface) { diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index 0daf7aecf6e..603fd84f6b1 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -299,7 +299,7 @@ generate_fs_loop(struct gallivm_state *gallivm, LLVMValueRef context_ptr, LLVMValueRef num_loop, struct lp_build_interp_soa_context *interp, - struct lp_build_sampler_soa *sampler, + const struct lp_build_sampler_soa *sampler, LLVMValueRef mask_store, LLVMValueRef (*out_color)[4], LLVMValueRef depth_ptr, -- 2.30.2