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

crocus: copy views before adjusting

Browse source 
The current code overwrote the original view which meant if we
had to reemit a surface the second emit would be wrong.

This fixes cubemaps on gm45 and maybe some issues with 3D textures
elsewhere.

Fixes: f3630548f1 ("crocus: initial gallium driver for Intel gfx 4-7")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12514>
(cherry picked from commit 63138c42c5)

Conflicts:
	src/gallium/drivers/crocus/crocus_state.c
This commit is contained in:
Dave Airlie 2021-08-24 02:16:59 -04:00 • committed by Dylan Baker
parent ece6458c04
commit 68df13f3ce
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -184,7 +184,7 @@
"description": "crocus: copy views before adjusting",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f3630548f1da904ec6c63b43ece7e68afdb8867e"
},

21
src/gallium/drivers/crocus/crocus_state.c
View file

@ -4939,7 +4939,7 @@ emit_surface_state(struct crocus_batch *batch,
struct crocus_resource *res,
const struct isl_surf *in_surf,
bool adjust_surf,
struct isl_view *view,
struct isl_view *in_view,
bool writeable,
enum isl_aux_usage aux_usage,
bool blend_enable,
@ -4956,23 +4956,24 @@ emit_surface_state(struct crocus_batch *batch,
reloc |= RELOC_WRITE;
struct isl_surf surf = *in_surf;
struct isl_view view = *in_view;
if (adjust_surf) {
if (res->base.b.target == PIPE_TEXTURE_3D && view->array_len == 1) {
if (res->base.b.target == PIPE_TEXTURE_3D && view.array_len == 1) {
isl_surf_get_image_surf(isl_dev, in_surf,
view->base_level, 0,
view->base_array_layer,
view.base_level, 0,
view.base_array_layer,
&surf, &offset,
&tile_x_sa, &tile_y_sa);
view->base_array_layer = 0;
view->base_level = 0;
view.base_array_layer = 0;
view.base_level = 0;
} else if (res->base.b.target == PIPE_TEXTURE_CUBE && devinfo->ver == 4) {
isl_surf_get_image_surf(isl_dev, in_surf,
view->base_level, view->base_array_layer,
view.base_level, view.base_array_layer,
0,
&surf, &offset,
&tile_x_sa, &tile_y_sa);
view->base_array_layer = 0;
view->base_level = 0;
view.base_array_layer = 0;
view.base_level = 0;
} else if (res->base.b.target == PIPE_TEXTURE_1D_ARRAY)
surf.dim = ISL_SURF_DIM_2D;
}
@ -4991,7 +4992,7 @@ emit_surface_state(struct crocus_batch *batch,
isl_surf_fill_state(isl_dev, surf_state,
.surf = &surf,
.view = view,
.view = &view,
.address = crocus_state_reloc(batch,
addr_offset + isl_dev->ss.addr_offset,
res->bo, offset, reloc),