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=f50221671232dce61d50baccdd86283f69ecfb79;hpb=614982d320985c04e247293b54b66d7df5c19004;p=mesa.git diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h index f5022167123..9b42d3faad5 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h @@ -42,10 +42,14 @@ #include "gallivm/lp_bld_type.h" #include "gallivm/lp_bld_swizzle.h" +#ifdef __cplusplus +extern "C" { +#endif 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; @@ -56,10 +60,99 @@ struct lp_build_context; */ struct lp_derivatives { - LLVMValueRef ddx_ddy[2]; + LLVMValueRef ddx[3]; + LLVMValueRef ddy[3]; }; +enum lp_sampler_lod_property { + LP_SAMPLER_LOD_SCALAR, + LP_SAMPLER_LOD_PER_ELEMENT, + LP_SAMPLER_LOD_PER_QUAD +}; + + +enum lp_sampler_lod_control { + LP_SAMPLER_LOD_IMPLICIT, + LP_SAMPLER_LOD_BIAS, + LP_SAMPLER_LOD_EXPLICIT, + LP_SAMPLER_LOD_DERIVATIVES, +}; + + +enum lp_sampler_op_type { + LP_SAMPLER_OP_TEXTURE, + LP_SAMPLER_OP_FETCH, + LP_SAMPLER_OP_GATHER, + LP_SAMPLER_OP_LODQ +}; + + +#define LP_SAMPLER_SHADOW (1 << 0) +#define LP_SAMPLER_OFFSETS (1 << 1) +#define LP_SAMPLER_OP_TYPE_SHIFT 2 +#define LP_SAMPLER_OP_TYPE_MASK (3 << 2) +#define LP_SAMPLER_LOD_CONTROL_SHIFT 4 +#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. * @@ -104,8 +197,10 @@ 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; /* Hacks */ unsigned force_nearest_s:1; @@ -127,81 +222,123 @@ struct lp_sampler_dynamic_state { /* First callbacks for sampler view state */ - /** Obtain the base texture width (returns int32) */ + /** Obtain the base texture width (or number of elements) (returns int32) */ LLVMValueRef - (*width)( const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, - unsigned texture_unit); + (*width)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*height)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned texture_unit, LLVMValueRef texture_unit_offset); - /** Obtain the base texture depth (returns int32) */ + /** Obtain the base texture depth (or array size) (returns int32) */ LLVMValueRef - (*depth)( const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, - unsigned texture_unit); + (*depth)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*first_level)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*last_level)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*row_stride)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*img_stride)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*base_ptr)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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, - unsigned texture_unit); + (*mip_offsets)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + 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 */ /** Obtain texture min lod (returns float) */ LLVMValueRef (*min_lod)(const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, unsigned sampler_unit); + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned sampler_unit); /** Obtain texture max lod (returns float) */ LLVMValueRef (*max_lod)(const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, unsigned sampler_unit); + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned sampler_unit); /** Obtain texture lod bias (returns float) */ LLVMValueRef (*lod_bias)(const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, unsigned sampler_unit); + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned sampler_unit); /** Obtain texture border color (returns ptr to float[4]) */ LLVMValueRef (*border_color)(const struct lp_sampler_dynamic_state *state, - struct gallivm_state *gallivm, unsigned sampler_unit); + struct gallivm_state *gallivm, + LLVMValueRef context_ptr, + unsigned sampler_unit); + + /** + * Obtain texture cache (returns ptr to lp_build_format_cache). + * + * It's optional: no caching will be done if it's NULL. + */ + LLVMValueRef + (*cache_ptr)(const struct lp_sampler_dynamic_state *state, + struct gallivm_state *gallivm, + LLVMValueRef thread_data_ptr, + unsigned unit); }; @@ -225,9 +362,18 @@ struct lp_build_sample_context /** SIMD vector width */ unsigned vector_width; - /** number of lod values (valid are 1, length/4, length) */ + /** number of mipmaps (valid are 1, length/4, length) */ + unsigned num_mips; + + /** 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; @@ -267,31 +413,59 @@ struct lp_build_sample_context struct lp_type texel_type; struct lp_build_context texel_bld; - /** Float per-quad type */ - struct lp_type perquadf_type; - struct lp_build_context perquadf_bld; + /** Float level type */ + struct lp_type levelf_type; + struct lp_build_context levelf_bld; + + /** Int level type */ + struct lp_type leveli_type; + struct lp_build_context leveli_bld; + + /** Float lod type */ + struct lp_type lodf_type; + struct lp_build_context lodf_bld; - /** Int per-quad type */ - struct lp_type perquadi_type; - struct lp_build_context perquadi_bld; + /** Int lod type */ + struct lp_type lodi_type; + struct lp_build_context lodi_bld; /* Common dynamic state values */ LLVMValueRef row_stride_array; LLVMValueRef img_stride_array; LLVMValueRef base_ptr; LLVMValueRef mip_offsets; + LLVMValueRef cache; + LLVMValueRef sample_stride; /** Integer vector with texture width, height, depth */ LLVMValueRef int_size; + + LLVMValueRef border_color_clamped; + + 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; +}; /** * We only support a few wrap modes in lp_build_sample_wrap_linear_int() at * this time. Return whether the given mode is supported by that function. */ -static INLINE boolean +static inline boolean lp_is_simple_wrap_mode(unsigned mode) { switch (mode) { @@ -304,7 +478,7 @@ lp_is_simple_wrap_mode(unsigned mode) } -static INLINE void +static inline void apply_sampler_swizzle(struct lp_build_sample_context *bld, LLVMValueRef *texel) { @@ -322,7 +496,7 @@ apply_sampler_swizzle(struct lp_build_sample_context *bld, * not really dimension as such, this indicates the amount of * "normal" texture coords subject to minification, wrapping etc. */ -static INLINE unsigned +static inline unsigned texture_dims(enum pipe_texture_target tex) { switch (tex) { @@ -334,6 +508,7 @@ texture_dims(enum pipe_texture_target tex) case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_RECT: case PIPE_TEXTURE_CUBE: + case PIPE_TEXTURE_CUBE_ARRAY: return 2; case PIPE_TEXTURE_3D: return 3; @@ -343,6 +518,21 @@ texture_dims(enum pipe_texture_target tex) } } +static inline boolean +has_layer_coord(enum pipe_texture_target tex) +{ + switch (tex) { + case PIPE_TEXTURE_1D_ARRAY: + case PIPE_TEXTURE_2D_ARRAY: + /* cube is not layered but 3rd coord (after cube mapping) behaves the same */ + case PIPE_TEXTURE_CUBE: + case PIPE_TEXTURE_CUBE_ARRAY: + return TRUE; + default: + return FALSE; + } +} + boolean lp_sampler_wrap_mode_uses_border_color(unsigned mode, @@ -361,23 +551,34 @@ 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, + LLVMValueRef t, + LLVMValueRef r, + LLVMValueRef cube_rho, const struct lp_derivatives *derivs, 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_fpart, + LLVMValueRef *out_lod_positive); void lp_build_nearest_mip_level(struct lp_build_sample_context *bld, unsigned texture_unit, LLVMValueRef lod, - LLVMValueRef *level_out); + LLVMValueRef *level_out, + LLVMValueRef *out_of_bounds); void lp_build_linear_mip_levels(struct lp_build_sample_context *bld, @@ -425,12 +626,24 @@ lp_build_unnormalized_coords(struct lp_build_sample_context *bld, void lp_build_cube_lookup(struct lp_build_sample_context *bld, - LLVMValueRef s, - LLVMValueRef t, - LLVMValueRef r, - LLVMValueRef *face, - LLVMValueRef *face_s, - LLVMValueRef *face_t); + LLVMValueRef *coords, + const struct lp_derivatives *derivs_in, /* optional */ + LLVMValueRef *rho, + struct lp_derivatives *derivs_out, /* optional */ + boolean need_derivs); + + +void +lp_build_cube_new_coords(struct lp_build_context *ivec_bld, + LLVMValueRef face, + LLVMValueRef x0, + LLVMValueRef x1, + LLVMValueRef y0, + LLVMValueRef y1, + LLVMValueRef max_coord, + LLVMValueRef new_faces[4], + LLVMValueRef new_xcoords[4][2], + LLVMValueRef new_ycoords[4][2]); void @@ -456,20 +669,11 @@ lp_build_sample_offset(struct lp_build_context *bld, void -lp_build_sample_soa(struct gallivm_state *gallivm, - const struct lp_static_texture_state *static_texture_state, +lp_build_sample_soa(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, - struct lp_type fp_type, - boolean is_fetch, - unsigned texture_index, - unsigned sampler_index, - const LLVMValueRef *coords, - const LLVMValueRef *offsets, - const struct lp_derivatives *derivs, - LLVMValueRef lod_bias, - LLVMValueRef explicit_lod, - LLVMValueRef texel_out[4]); + struct gallivm_state *gallivm, + const struct lp_sampler_params *params); void @@ -485,11 +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, - boolean need_nr_mips, - LLVMValueRef explicit_lod, - LLVMValueRef *sizes_out); + const struct lp_sampler_size_query_params *params); void lp_build_sample_nop(struct gallivm_state *gallivm, @@ -501,7 +701,32 @@ lp_build_sample_nop(struct gallivm_state *gallivm, LLVMValueRef lp_build_minify(struct lp_build_context *bld, LLVMValueRef base_size, - LLVMValueRef level); + 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 #endif /* LP_BLD_SAMPLE_H */