fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r600: implement msaa 2d view from array

Browse source 
This functionality was not working.

To fix this issue, the texture mode needs to be set to
V_030000_SQ_TEX_DIM_2D_MSAA. When this mode is processed
the gpu only takes the layer 0. This change implements
this functionality by copying the layer to a new resource.

This change was tested on palm, barts and cayman. Here is the
test fixed:
khr-gl4[2-6]/texture_view/view_sampling: fail pass

Signed-off-by: Patrick Lerda <patrick9876@free.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40567>
This commit is contained in:
Patrick Lerda 2026-03-23 13:10:42 +01:00 • committed by Marge Bot
parent 7bbb251936
commit 84c3489e38
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/r600/evergreen_state.c
View file

@ -193,6 +193,8 @@ static unsigned r600_tex_dim(struct r600_texture *rtex,
return nr_samples > 1 ? V_030000_SQ_TEX_DIM_2D_MSAA : return nr_samples > 1 ? V_030000_SQ_TEX_DIM_2D_MSAA :
V_030000_SQ_TEX_DIM_2D; V_030000_SQ_TEX_DIM_2D;
case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_2D_ARRAY:
if (unlikely(nr_samples > 1 && view_target == PIPE_TEXTURE_2D))
return V_030000_SQ_TEX_DIM_2D_MSAA;
return nr_samples > 1 ? V_030000_SQ_TEX_DIM_2D_ARRAY_MSAA : return nr_samples > 1 ? V_030000_SQ_TEX_DIM_2D_ARRAY_MSAA :
V_030000_SQ_TEX_DIM_2D_ARRAY; V_030000_SQ_TEX_DIM_2D_ARRAY;
case PIPE_TEXTURE_3D: case PIPE_TEXTURE_3D:
@ -753,7 +755,8 @@ static int evergreen_fill_tex_resource_words(struct r600_context *rctx,
struct pipe_resource *texture, struct pipe_resource *texture,
struct eg_tex_res_params *params, struct eg_tex_res_params *params,
bool *skip_mip_address_reloc, bool *skip_mip_address_reloc,
unsigned tex_resource_words[8]) unsigned tex_resource_words[8],
struct pipe_resource **const replace_resource)
{ {
struct r600_screen *rscreen = (struct r600_screen*)rctx->b.b.screen; struct r600_screen *rscreen = (struct r600_screen*)rctx->b.b.screen;
struct r600_texture *tmp = r600_as_texture(texture); struct r600_texture *tmp = r600_as_texture(texture);
@ -867,8 +870,18 @@ static int evergreen_fill_tex_resource_words(struct r600_context *rctx,
} else if (dim == V_030000_SQ_TEX_DIM_2D_ARRAY || } else if (dim == V_030000_SQ_TEX_DIM_2D_ARRAY ||
dim == V_030000_SQ_TEX_DIM_2D_ARRAY_MSAA) { dim == V_030000_SQ_TEX_DIM_2D_ARRAY_MSAA) {
depth = texture->array_size; depth = texture->array_size;
} else if (dim == V_030000_SQ_TEX_DIM_CUBEMAP) } else if (dim == V_030000_SQ_TEX_DIM_CUBEMAP) {
depth = texture->array_size / 6; depth = texture->array_size / 6;
} else if (unlikely(dim == V_030000_SQ_TEX_DIM_2D_MSAA &&
tmp->resource.b.b.target == PIPE_TEXTURE_2D_ARRAY &&
params->first_layer > 0)) {
struct pipe_resource *replacement = r600_texture_create(rctx->b.b.screen, texture);
struct pipe_box box;
u_box_3d(0, 0, params->first_layer, texture->width0, texture->height0, 1, &box);
r600_copy_region_with_blit(&rctx->b.b, replacement, 0, 0, 0, 0,
texture, 0, &box);
*replace_resource = replacement;
}
tex_resource_words[0] = (S_030000_DIM(dim) | tex_resource_words[0] = (S_030000_DIM(dim) |
S_030000_PITCH((pitch / 8) - 1) | S_030000_PITCH((pitch / 8) - 1) |
@ -980,7 +993,8 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
ret = evergreen_fill_tex_resource_words(rctx, texture, &params, ret = evergreen_fill_tex_resource_words(rctx, texture, &params,
&view->skip_mip_address_reloc, &view->skip_mip_address_reloc,
view->tex_resource_words); view->tex_resource_words,
&view->replace_resource);
if (ret != 0) { if (ret != 0) {
FREE(view); FREE(view);
return NULL; return NULL;
@ -992,7 +1006,9 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx,
state->format == PIPE_FORMAT_S8_UINT) state->format == PIPE_FORMAT_S8_UINT)
view->is_stencil_sampler = true; view->is_stencil_sampler = true;
view->tex_resource = &tmp->resource; view->tex_resource = unlikely(view->replace_resource) ?
&r600_as_texture(view->replace_resource)->resource :
&tmp->resource;
return &view->base; return &view->base;
} }
@ -4740,7 +4756,7 @@ static void evergreen_set_shader_images(struct pipe_context *ctx,
tex_params.swizzle[3] = PIPE_SWIZZLE_W; tex_params.swizzle[3] = PIPE_SWIZZLE_W;
evergreen_fill_tex_resource_words(rctx, &resource->b.b, &tex_params, evergreen_fill_tex_resource_words(rctx, &resource->b.b, &tex_params,
&rview->skip_mip_address_reloc, &rview->skip_mip_address_reloc,
rview->resource_words); rview->resource_words, NULL);
} else { } else {
memset(&buf_params, 0, sizeof(buf_params)); memset(&buf_params, 0, sizeof(buf_params));

1
src/gallium/drivers/r600/r600_pipe.h
View file

@ -261,6 +261,7 @@ struct r600_pipe_sampler_view {
struct pipe_sampler_view base; struct pipe_sampler_view base;
struct list_head list; struct list_head list;
struct r600_resource *tex_resource; struct r600_resource *tex_resource;
struct pipe_resource *replace_resource;
uint32_t tex_resource_words[8]; uint32_t tex_resource_words[8];
bool skip_mip_address_reloc; bool skip_mip_address_reloc;
bool is_stencil_sampler; bool is_stencil_sampler;

5
src/gallium/drivers/r600/r600_state_common.c
View file

@ -424,6 +424,11 @@ static void r600_sampler_view_destroy(struct pipe_context *ctx,
view->tex_resource->b.b.target == PIPE_BUFFER) view->tex_resource->b.b.target == PIPE_BUFFER)
list_delinit(&view->list); list_delinit(&view->list);
if (unlikely(view->replace_resource)) {
struct r600_context *rctx = (struct r600_context *)ctx;
r600_texture_destroy(&rctx->screen->b.b, view->replace_resource);
}
pipe_resource_reference(&state->texture, NULL); pipe_resource_reference(&state->texture, NULL);
FREE(view); FREE(view);
} }