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

r300: fix crash when creating surfaces

Browse source 
pipe_surface_width and pipe_surface_height helpers actually need
a pipe surface with a texture attached instead of just passing
directly the pipe_surface we get from the st.

The compressed formats are still broken unfortunatelly, so add them
to CI fails for now.

Partial fix for: 9d359c6d10

Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34087>
This commit is contained in:
Pavel Ondračka 2025-03-16 08:42:45 +01:00 • committed by Marge Bot
parent 85983e060c
commit 7a2946711e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/r300/r300_texture.c
View file

@ -1197,7 +1197,7 @@ struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx,
/* Parameters for the CBZB clear. */
surface->cbzb_allowed = tex->tex.cbzb_allowed[level];
surface->cbzb_width = align(pipe_surface_width(surf_tmpl), 64);
surface->cbzb_width = align(u_minify(width0_override, level), 64);
/* Height must be aligned to the size of a tile. */
tile_height = r300_get_pixel_alignment(surface->base.format,
@ -1207,7 +1207,7 @@ struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx,
DIM_HEIGHT, 0,
tex->b.bind & PIPE_BIND_SCANOUT);
surface->cbzb_height = align((pipe_surface_height(surf_tmpl) + 1) / 2,
surface->cbzb_height = align((u_minify(height0_override, level) + 1) / 2,
tile_height);
/* Offset must be aligned to 2K and must point at the beginning