X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_jit.h;h=9db26f2cba91d20b0651411c2319e79c34585694;hb=8147c4a4a58a9328a07fd358b54622de0d01c374;hp=94a2bb5ff3651f1053253ddee02db60600826c67;hpb=26097c4855b97ee6e362c19df11d51fb7fd42192;p=mesa.git diff --git a/src/gallium/drivers/llvmpipe/lp_jit.h b/src/gallium/drivers/llvmpipe/lp_jit.h index 94a2bb5ff36..9db26f2cba9 100644 --- a/src/gallium/drivers/llvmpipe/lp_jit.h +++ b/src/gallium/drivers/llvmpipe/lp_jit.h @@ -37,27 +37,33 @@ #include "gallivm/lp_bld_struct.h" +#include "gallivm/lp_bld_limits.h" #include "pipe/p_state.h" #include "lp_texture.h" +struct lp_build_format_cache; struct lp_fragment_shader_variant; struct llvmpipe_screen; struct lp_jit_texture { - uint32_t width; + uint32_t width; /* same as number of elements */ uint32_t height; - uint32_t depth; + uint32_t depth; /* doubles as array size */ uint32_t first_level; uint32_t last_level; const void *base; uint32_t row_stride[LP_MAX_TEXTURE_LEVELS]; uint32_t img_stride[LP_MAX_TEXTURE_LEVELS]; uint32_t mip_offsets[LP_MAX_TEXTURE_LEVELS]; - /* sampler state, actually */ +}; + + +struct lp_jit_sampler +{ float min_lod; float max_lod; float lod_bias; @@ -65,6 +71,13 @@ struct lp_jit_texture }; +struct lp_jit_viewport +{ + float min_depth; + float max_depth; +}; + + enum { LP_JIT_TEXTURE_WIDTH = 0, LP_JIT_TEXTURE_HEIGHT, @@ -75,14 +88,25 @@ enum { LP_JIT_TEXTURE_ROW_STRIDE, LP_JIT_TEXTURE_IMG_STRIDE, LP_JIT_TEXTURE_MIP_OFFSETS, - LP_JIT_TEXTURE_MIN_LOD, - LP_JIT_TEXTURE_MAX_LOD, - LP_JIT_TEXTURE_LOD_BIAS, - LP_JIT_TEXTURE_BORDER_COLOR, LP_JIT_TEXTURE_NUM_FIELDS /* number of fields above */ }; +enum { + LP_JIT_SAMPLER_MIN_LOD, + LP_JIT_SAMPLER_MAX_LOD, + LP_JIT_SAMPLER_LOD_BIAS, + LP_JIT_SAMPLER_BORDER_COLOR, + LP_JIT_SAMPLER_NUM_FIELDS /* number of fields above */ +}; + + +enum { + LP_JIT_VIEWPORT_MIN_DEPTH, + LP_JIT_VIEWPORT_MAX_DEPTH, + LP_JIT_VIEWPORT_NUM_FIELDS /* number of fields above */ +}; + /** * This structure is passed directly to the generated fragment shader. @@ -97,16 +121,20 @@ enum { */ struct lp_jit_context { - const float *constants; + const float *constants[LP_MAX_TGSI_CONST_BUFFERS]; + int num_constants[LP_MAX_TGSI_CONST_BUFFERS]; float alpha_ref_value; uint32_t stencil_ref_front, stencil_ref_back; - /* FIXME: store (also?) in floats */ - uint8_t *blend_color; + uint8_t *u8_blend_color; + float *f_blend_color; - struct lp_jit_texture textures[PIPE_MAX_SAMPLERS]; + struct lp_jit_viewport *viewports; + + struct lp_jit_texture textures[PIPE_MAX_SHADER_SAMPLER_VIEWS]; + struct lp_jit_sampler samplers[PIPE_MAX_SAMPLERS]; }; @@ -116,17 +144,24 @@ struct lp_jit_context */ enum { LP_JIT_CTX_CONSTANTS = 0, + LP_JIT_CTX_NUM_CONSTANTS, LP_JIT_CTX_ALPHA_REF, LP_JIT_CTX_STENCIL_REF_FRONT, LP_JIT_CTX_STENCIL_REF_BACK, - LP_JIT_CTX_BLEND_COLOR, + LP_JIT_CTX_U8_BLEND_COLOR, + LP_JIT_CTX_F_BLEND_COLOR, + LP_JIT_CTX_VIEWPORTS, LP_JIT_CTX_TEXTURES, + LP_JIT_CTX_SAMPLERS, LP_JIT_CTX_COUNT }; #define lp_jit_context_constants(_gallivm, _ptr) \ - lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_CONSTANTS, "constants") + lp_build_struct_get_ptr(_gallivm, _ptr, LP_JIT_CTX_CONSTANTS, "constants") + +#define lp_jit_context_num_constants(_gallivm, _ptr) \ + lp_build_struct_get_ptr(_gallivm, _ptr, LP_JIT_CTX_NUM_CONSTANTS, "num_constants") #define lp_jit_context_alpha_ref_value(_gallivm, _ptr) \ lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_ALPHA_REF, "alpha_ref_value") @@ -137,14 +172,72 @@ enum { #define lp_jit_context_stencil_ref_back_value(_gallivm, _ptr) \ lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_STENCIL_REF_BACK, "stencil_ref_back") -#define lp_jit_context_blend_color(_gallivm, _ptr) \ - lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_BLEND_COLOR, "blend_color") +#define lp_jit_context_u8_blend_color(_gallivm, _ptr) \ + lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_U8_BLEND_COLOR, "u8_blend_color") + +#define lp_jit_context_f_blend_color(_gallivm, _ptr) \ + lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_F_BLEND_COLOR, "f_blend_color") + +#define lp_jit_context_viewports(_gallivm, _ptr) \ + lp_build_struct_get(_gallivm, _ptr, LP_JIT_CTX_VIEWPORTS, "viewports") #define lp_jit_context_textures(_gallivm, _ptr) \ lp_build_struct_get_ptr(_gallivm, _ptr, LP_JIT_CTX_TEXTURES, "textures") +#define lp_jit_context_samplers(_gallivm, _ptr) \ + lp_build_struct_get_ptr(_gallivm, _ptr, LP_JIT_CTX_SAMPLERS, "samplers") + + +struct lp_jit_thread_data +{ + struct lp_build_format_cache *cache; + uint64_t vis_counter; + + /* + * Non-interpolated rasterizer state passed through to the fragment shader. + */ + struct { + uint32_t viewport_index; + } raster_state; +}; + + +enum { + LP_JIT_THREAD_DATA_CACHE = 0, + LP_JIT_THREAD_DATA_COUNTER, + LP_JIT_THREAD_DATA_RASTER_STATE_VIEWPORT_INDEX, + LP_JIT_THREAD_DATA_COUNT +}; + + +#define lp_jit_thread_data_cache(_gallivm, _ptr) \ + lp_build_struct_get(_gallivm, _ptr, LP_JIT_THREAD_DATA_CACHE, "cache") +#define lp_jit_thread_data_counter(_gallivm, _ptr) \ + lp_build_struct_get_ptr(_gallivm, _ptr, LP_JIT_THREAD_DATA_COUNTER, "counter") +#define lp_jit_thread_data_raster_state_viewport_index(_gallivm, _ptr) \ + lp_build_struct_get(_gallivm, _ptr, \ + LP_JIT_THREAD_DATA_RASTER_STATE_VIEWPORT_INDEX, \ + "raster_state.viewport_index") + +/** + * typedef for fragment shader function + * + * @param context jit context + * @param x block start x + * @param y block start y + * @param facing is front facing + * @param a0 shader input a0 + * @param dadx shader input dadx + * @param dady shader input dady + * @param color color buffer + * @param depth depth buffer + * @param mask mask of visible pixels in block + * @param thread_data task thread data + * @param stride color buffer row stride in bytes + * @param depth_stride depth buffer row stride in bytes + */ typedef void (*lp_jit_frag_func)(const struct lp_jit_context *context, uint32_t x, @@ -154,16 +247,18 @@ typedef void const void *dadx, const void *dady, uint8_t **color, - void *depth, + uint8_t *depth, uint32_t mask, - uint32_t *counter); + struct lp_jit_thread_data *thread_data, + unsigned *stride, + unsigned depth_stride); void lp_jit_screen_cleanup(struct llvmpipe_screen *screen); -void +boolean lp_jit_screen_init(struct llvmpipe_screen *screen);