fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 01:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: change mask input to fragment shader to 64-bit.

Browse source 
In order to handle a 4xMSAA mask (16-bits per sample) increase
the fragment shader API to be 64-bit.

v2: drop pointless if (Roland)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
This commit is contained in:
Dave Airlie 2020-03-11 08:23:10 +10:00 • committed by Marge Bot
parent 67ec1760ee
commit d2f488684a
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/llvmpipe/lp_jit.h
View file

@ -286,7 +286,7 @@ enum {
* @param dady shader input dady
* @param color color buffer
* @param depth depth buffer
* @param mask mask of visible pixels in block
* @param mask mask of visible pixels in block (16-bits per sample)
* @param thread_data task thread data
* @param stride color buffer row stride in bytes
* @param depth_stride depth buffer row stride in bytes
@ -301,7 +301,7 @@ typedef void
const void *dady,
uint8_t **color,
uint8_t *depth,
uint32_t mask,
uint64_t mask,
struct lp_jit_thread_data *thread_data,
unsigned *stride,
unsigned depth_stride,

4
src/gallium/drivers/llvmpipe/lp_rast.c
View file

@ -374,7 +374,7 @@ lp_rast_shade_tile(struct lp_rasterizer_task *task,
GET_DADY(inputs),
color,
depth,
0xffff,
(uint64_t)0xffff,
&task->thread_data,
stride,
depth_stride,
@ -482,7 +482,7 @@ lp_rast_shade_quads_mask(struct lp_rasterizer_task *task,
GET_DADY(inputs),
color,
depth,
mask,
(uint64_t)mask,
&task->thread_data,
stride,
depth_stride,

2
src/gallium/drivers/llvmpipe/lp_rast_priv.h
View file

@ -275,7 +275,7 @@ lp_rast_shade_quads_all( struct lp_rasterizer_task *task,
GET_DADY(inputs),
color,
depth,
0xffff,
(uint64_t)0xffff,
&task->thread_data,
stride,
depth_stride,

12
src/gallium/drivers/llvmpipe/lp_state_fs.c
View file

@ -123,7 +123,8 @@ static LLVMValueRef
generate_quad_mask(struct gallivm_state *gallivm,
struct lp_type fs_type,
unsigned first_quad,
LLVMValueRef mask_input) /* int32 */
unsigned sample,
LLVMValueRef mask_input) /* int64 */
{
LLVMBuilderRef builder = gallivm->builder;
struct lp_type mask_type;
@ -162,6 +163,11 @@ generate_quad_mask(struct gallivm_state *gallivm,
shift = 0;
}
mask_input = LLVMBuildLShr(builder, mask_input, lp_build_const_int64(gallivm, 16 * sample), "");
mask_input = LLVMBuildTrunc(builder, mask_input,
i32t, "");
mask_input = LLVMBuildAnd(builder, mask_input, lp_build_const_int32(gallivm, 0xffff), "");
mask_input = LLVMBuildLShr(builder,
mask_input,
LLVMConstInt(i32t, shift, 0),
@ -2538,7 +2544,7 @@ generate_fragment(struct llvmpipe_context *lp,
arg_types[6] = LLVMPointerType(fs_elem_type, 0); /* dady */
arg_types[7] = LLVMPointerType(LLVMPointerType(blend_vec_type, 0), 0); /* color */
arg_types[8] = LLVMPointerType(int8_type, 0); /* depth */
arg_types[9] = int32_type; /* mask_input */
arg_types[9] = LLVMInt64TypeInContext(gallivm->context); /* mask_input */
arg_types[10] = variant->jit_thread_data_ptr_type; /* per thread data */
arg_types[11] = LLVMPointerType(int32_type, 0); /* stride */
arg_types[12] = int32_type; /* depth_stride */
@ -2660,7 +2666,7 @@ generate_fragment(struct llvmpipe_context *lp,
if (partial_mask) {
mask = generate_quad_mask(gallivm, fs_type,
i*fs_type.length/4, mask_input);
i*fs_type.length/4, 0, mask_input);
}
else {
mask = lp_build_const_int_vec(gallivm, fs_type, ~0);