OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmpipe: add multisample support to texture allocator.

Browse Source 
This adds a sample stride field and allocates enough memory for
each sample storage. Hook up the sample_stride field to draw
and jit textures and images

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-10 10:30:13 +10:00
committed by Marge Bot
parent 339aec7241
commit 1b02eb1a4c
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/llvmpipe/lp_setup.c
View File

@@ -726,7 +726,7 @@ lp_setup_set_fs_images(struct lp_setup_context *setup,
jit_image->row_stride = lp_res->row_stride[image->u.tex.level];
jit_image->img_stride = lp_res->img_stride[image->u.tex.level];
jit_image->sample_stride = 0;
jit_image->sample_stride = lp_res->sample_stride;
jit_image->base = (uint8_t *)jit_image->base + mip_offset;
}
else {
@@ -943,6 +943,8 @@ lp_setup_set_fragment_sampler_views(struct lp_setup_context *setup,
jit_tex->img_stride[j] = lp_tex->img_stride[j];
}
jit_tex->sample_stride = lp_tex->sample_stride;
if (res->target == PIPE_TEXTURE_1D_ARRAY ||
res->target == PIPE_TEXTURE_2D_ARRAY ||
res->target == PIPE_TEXTURE_CUBE ||

3
src/gallium/drivers/llvmpipe/lp_state_cs.c
View File

@@ -880,6 +880,7 @@ lp_csctx_set_sampler_views(struct lp_cs_context *csctx,
jit_tex->row_stride[j] = lp_tex->row_stride[j];
jit_tex->img_stride[j] = lp_tex->img_stride[j];
}
jit_tex->sample_stride = lp_tex->sample_stride;
if (res->target == PIPE_TEXTURE_1D_ARRAY ||
res->target == PIPE_TEXTURE_2D_ARRAY ||
@@ -1076,7 +1077,7 @@ lp_csctx_set_cs_images(struct lp_cs_context *csctx,
jit_image->row_stride = lp_res->row_stride[image->u.tex.level];
jit_image->img_stride = lp_res->img_stride[image->u.tex.level];
jit_image->sample_stride = 0;
jit_image->sample_stride = lp_res->sample_stride;
jit_image->base = (uint8_t *)jit_image->base + mip_offset;
} else {
unsigned view_blocksize = util_format_get_blocksize(image->format);

4
src/gallium/drivers/llvmpipe/lp_state_sampler.c
View File

@@ -283,6 +283,8 @@ prepare_shader_sampling(
assert(last_level <= res->last_level);
addr = lp_tex->tex_data;
sample_stride = lp_tex->sample_stride;
for (j = first_level; j <= last_level; j++) {
mip_offsets[j] = lp_tex->mip_offsets[j];
row_stride[j] = lp_tex->row_stride[j];
@@ -443,7 +445,7 @@ prepare_shader_images(
row_stride = lp_img->row_stride[view->u.tex.level];
img_stride = lp_img->img_stride[view->u.tex.level];
sample_stride = 0;
sample_stride = lp_img->sample_stride;
addr = (uint8_t *)addr + mip_offset;
}
else {

5
src/gallium/drivers/llvmpipe/lp_texture.c
View File

@@ -76,6 +76,8 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen,
unsigned depth = pt->depth0;
uint64_t total_size = 0;
unsigned layers = pt->array_size;
unsigned num_samples = util_res_sample_count(pt);
/* XXX:
* This alignment here (same for displaytarget) was added for the purpose of
* ARB_map_buffer_alignment. I am not convinced it's needed for non-buffer
@@ -166,6 +168,9 @@ llvmpipe_texture_layout(struct llvmpipe_screen *screen,
depth = u_minify(depth, 1);
}
lpr->sample_stride = total_size;
total_size *= num_samples;
if (allocate) {
lpr->tex_data = align_malloc(total_size, mip_align);
if (!lpr->tex_data) {

1
src/gallium/drivers/llvmpipe/lp_texture.h
View File

@@ -90,6 +90,7 @@ struct llvmpipe_resource
unsigned id; /**< temporary, for debugging */
unsigned sample_stride;
#ifdef DEBUG
/** for linked list */
struct llvmpipe_resource *prev, *next;