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

pvr: fix segfault in dEQP-VK.ycbcr.query.*

Browse Source 
Signed-off-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22061>
This commit is contained in:
Luigi Santivetti
2023-03-09 15:54:35 +00:00
committed by Marge Bot
parent fd3ea4ffc2
commit 71fd9c2be0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/imagination/vulkan/pvr_descriptor_set.c
View File

@@ -1191,7 +1191,6 @@ pvr_descriptor_set_create(struct pvr_device *device,
struct pvr_descriptor_set *set; struct pvr_descriptor_set *set;
VkResult result; VkResult result;
size_t size; size_t size;
void *map;
size = sizeof(*set) + sizeof(set->descriptors[0]) * layout->descriptor_count; size = sizeof(*set) + sizeof(set->descriptors[0]) * layout->descriptor_count;
@@ -1231,7 +1230,6 @@ pvr_descriptor_set_create(struct pvr_device *device,
set->layout = layout; set->layout = layout;
set->pool = pool; set->pool = pool;
map = set->pvr_bo->bo->map;
for (uint32_t i = 0; i < layout->binding_count; i++) { for (uint32_t i = 0; i < layout->binding_count; i++) {
const struct pvr_descriptor_set_layout_binding *binding = const struct pvr_descriptor_set_layout_binding *binding =
&layout->bindings[i]; &layout->bindings[i];
@@ -1254,6 +1252,7 @@ pvr_descriptor_set_create(struct pvr_device *device,
binding, binding,
stage, stage,
j); j);
void *map = set->pvr_bo->bo->map;
if (binding->type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) if (binding->type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)
offset_in_dwords += 4; offset_in_dwords += 4;