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

gallium/radeon: fix a possible crash for buffer exports

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2017-06-27 19:24:20 +02:00
parent fee2883bd7
commit e6dbe975ef
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gallium/drivers/radeon/r600_texture.c
View File

@@ -589,16 +589,22 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
res->external_usage = usage;
}
if (rscreen->chip_class >= GFX9) {
offset = rtex->surface.u.gfx9.surf_offset;
stride = rtex->surface.u.gfx9.surf_pitch *
rtex->surface.bpe;
slice_size = rtex->surface.u.gfx9.surf_slice_size;
if (res->b.b.target == PIPE_BUFFER) {
offset = 0;
stride = 0;
slice_size = 0;
} else {
offset = rtex->surface.u.legacy.level[0].offset;
stride = rtex->surface.u.legacy.level[0].nblk_x *
rtex->surface.bpe;
slice_size = rtex->surface.u.legacy.level[0].slice_size;
if (rscreen->chip_class >= GFX9) {
offset = rtex->surface.u.gfx9.surf_offset;
stride = rtex->surface.u.gfx9.surf_pitch *
rtex->surface.bpe;
slice_size = rtex->surface.u.gfx9.surf_slice_size;
} else {
offset = rtex->surface.u.legacy.level[0].offset;
stride = rtex->surface.u.legacy.level[0].nblk_x *
rtex->surface.bpe;
slice_size = rtex->surface.u.legacy.level[0].slice_size;
}
}
return rscreen->ws->buffer_get_handle(res->buf, stride, offset,
slice_size, whandle);