X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fgallivm%2Flp_bld_sample.h;h=9b42d3faad5c17f2cc28d1f3fd2a3cf2577acd0f;hb=3ca3b07fc1b46824fb7589fe06f9455d9f85bb12;hp=902ae41f96068c09a858b7e9884a5b5b6ec5509b;hpb=ea37602273d039fc3428a3be9e1bedc1e1282e01;p=mesa.git diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h index 902ae41f960..9b42d3faad5 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h @@ -49,6 +49,7 @@ extern "C" { struct pipe_resource; struct pipe_sampler_view; struct pipe_sampler_state; +struct pipe_image_view; struct util_format_description; struct lp_type; struct lp_build_context; @@ -82,7 +83,8 @@ enum lp_sampler_lod_control { enum lp_sampler_op_type { LP_SAMPLER_OP_TEXTURE, LP_SAMPLER_OP_FETCH, - LP_SAMPLER_OP_GATHER + LP_SAMPLER_OP_GATHER, + LP_SAMPLER_OP_LODQ }; @@ -94,23 +96,63 @@ enum lp_sampler_op_type { #define LP_SAMPLER_LOD_CONTROL_MASK (3 << 4) #define LP_SAMPLER_LOD_PROPERTY_SHIFT 6 #define LP_SAMPLER_LOD_PROPERTY_MASK (3 << 6) +#define LP_SAMPLER_GATHER_COMP_SHIFT 8 +#define LP_SAMPLER_GATHER_COMP_MASK (3 << 8) +#define LP_SAMPLER_FETCH_MS (1 << 10) struct lp_sampler_params { struct lp_type type; unsigned texture_index; unsigned sampler_index; + LLVMValueRef texture_index_offset; unsigned sample_key; LLVMValueRef context_ptr; LLVMValueRef thread_data_ptr; const LLVMValueRef *coords; const LLVMValueRef *offsets; + LLVMValueRef ms_index; LLVMValueRef lod; const struct lp_derivatives *derivs; LLVMValueRef *texel; }; +struct lp_sampler_size_query_params +{ + struct lp_type int_type; + unsigned texture_unit; + LLVMValueRef texture_unit_offset; + unsigned target; + LLVMValueRef context_ptr; + boolean is_sviewinfo; + bool samples_only; + enum lp_sampler_lod_property lod_property; + LLVMValueRef explicit_lod; + LLVMValueRef *sizes_out; +}; +#define LP_IMG_LOAD 0 +#define LP_IMG_STORE 1 +#define LP_IMG_ATOMIC 2 +#define LP_IMG_ATOMIC_CAS 3 + +struct lp_img_params +{ + struct lp_type type; + unsigned image_index; + LLVMValueRef image_index_offset; + unsigned img_op; + unsigned target; + LLVMAtomicRMWBinOp op; + LLVMValueRef exec_mask; + LLVMValueRef context_ptr; + LLVMValueRef thread_data_ptr; + const LLVMValueRef *coords; + LLVMValueRef ms_index; + LLVMValueRef indata[4]; + LLVMValueRef indata2[4]; + LLVMValueRef *outdata; +}; /** * Texture static state. * @@ -155,6 +197,7 @@ struct lp_static_sampler_state unsigned normalized_coords:1; unsigned min_max_lod_equal:1; /**< min_lod == max_lod ? */ unsigned lod_bias_non_zero:1; + unsigned max_lod_pos:1; unsigned apply_min_lod:1; /**< min_lod > 0 ? */ unsigned apply_max_lod:1; /**< max_lod < last_level ? */ unsigned seamless_cube_map:1; @@ -184,63 +227,77 @@ struct lp_sampler_dynamic_state (*width)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain the base texture height (returns int32) */ LLVMValueRef (*height)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain the base texture depth (or array size) (returns int32) */ LLVMValueRef (*depth)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain the first mipmap level (base level) (returns int32) */ LLVMValueRef (*first_level)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain the number of mipmap levels minus one (returns int32) */ LLVMValueRef (*last_level)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain stride in bytes between image rows/blocks (returns int32) */ LLVMValueRef (*row_stride)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain stride in bytes between image slices (returns int32) */ LLVMValueRef (*img_stride)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain pointer to base of texture */ LLVMValueRef (*base_ptr)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); /** Obtain pointer to array of mipmap offsets */ LLVMValueRef (*mip_offsets)(const struct lp_sampler_dynamic_state *state, struct gallivm_state *gallivm, LLVMValueRef context_ptr, - unsigned texture_unit); + unsigned texture_unit, LLVMValueRef texture_unit_offset); + + /** Obtain number of samples (returns int32) */ + LLVMValueRef + (*num_samples)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned texture_unit, LLVMValueRef texture_unit_offset); + + /** Obtain multisample stride (returns int32) */ + LLVMValueRef + (*sample_stride)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned texture_unit, LLVMValueRef texture_unit_offset); /* These are callbacks for sampler state */ @@ -311,6 +368,12 @@ struct lp_build_sample_context /** number of lod values (valid are 1, length/4, length) */ unsigned num_lods; + unsigned gather_comp; + boolean no_quad_lod; + boolean no_brilinear; + boolean no_rho_approx; + boolean fetch_ms; + /** regular scalar float type */ struct lp_type float_type; struct lp_build_context float_bld; @@ -372,6 +435,7 @@ struct lp_build_sample_context LLVMValueRef base_ptr; LLVMValueRef mip_offsets; LLVMValueRef cache; + LLVMValueRef sample_stride; /** Integer vector with texture width, height, depth */ LLVMValueRef int_size; @@ -381,6 +445,20 @@ struct lp_build_sample_context LLVMValueRef context_ptr; }; +/* + * Indirect texture access context + * + * This is used to store info across building + * and indirect texture switch statement. + */ +struct lp_build_sample_array_switch { + struct gallivm_state *gallivm; + struct lp_sampler_params params; + unsigned base, range; + LLVMValueRef switch_ref; + LLVMBasicBlockRef merge_ref; + LLVMValueRef phi; +}; /** @@ -473,9 +551,13 @@ void lp_sampler_static_texture_state(struct lp_static_texture_state *state, const struct pipe_sampler_view *view); +void +lp_sampler_static_texture_state_image(struct lp_static_texture_state *state, + const struct pipe_image_view *view); void lp_build_lod_selector(struct lp_build_sample_context *bld, + boolean is_lodq, unsigned texture_index, unsigned sampler_index, LLVMValueRef s, @@ -486,6 +568,7 @@ lp_build_lod_selector(struct lp_build_sample_context *bld, LLVMValueRef lod_bias, /* optional */ LLVMValueRef explicit_lod, /* optional */ unsigned mip_filter, + LLVMValueRef *out_lod, LLVMValueRef *out_lod_ipart, LLVMValueRef *out_lod_fpart, LLVMValueRef *out_lod_positive); @@ -606,14 +689,7 @@ void lp_build_size_query_soa(struct gallivm_state *gallivm, const struct lp_static_texture_state *static_state, struct lp_sampler_dynamic_state *dynamic_state, - struct lp_type int_type, - unsigned texture_unit, - unsigned target, - LLVMValueRef context_ptr, - boolean is_sviewinfo, - enum lp_sampler_lod_property lod_property, - LLVMValueRef explicit_lod, - LLVMValueRef *sizes_out); + const struct lp_sampler_size_query_params *params); void lp_build_sample_nop(struct gallivm_state *gallivm, @@ -628,6 +704,27 @@ lp_build_minify(struct lp_build_context *bld, LLVMValueRef level, boolean lod_scalar); +void +lp_build_img_op_soa(const struct lp_static_texture_state *static_texture_state, + struct lp_sampler_dynamic_state *dynamic_state, + struct gallivm_state *gallivm, + const struct lp_img_params *params); + +void +lp_build_sample_array_init_soa(struct lp_build_sample_array_switch *switch_info, + struct gallivm_state *gallivm, + const struct lp_sampler_params *params, + LLVMValueRef idx, + unsigned base, unsigned range); + +void +lp_build_sample_array_case_soa(struct lp_build_sample_array_switch *switch_info, + int idx, + const struct lp_static_texture_state *static_texture_state, + const struct lp_static_sampler_state *static_sampler_state, + struct lp_sampler_dynamic_state *dynamic_texture_state); + +void lp_build_sample_array_fini_soa(struct lp_build_sample_array_switch *switch_info); #ifdef __cplusplus } #endif