diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 17da1d5c164..ddf1c1c51c4 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -2457,7 +2457,7 @@ lvp_image_plane_bind(struct lvp_device *device, VkDeviceSize memory_offset, VkDeviceSize *min_plane_offset) { - VkDeviceSize plane_offset = MAX2(plane->plane_offset, *min_plane_offset); + VkDeviceSize plane_offset = MAX2(plane->offset, *min_plane_offset); if (!device->pscreen->resource_bind_backing(device->pscreen, plane->bo, @@ -2470,7 +2470,7 @@ lvp_image_plane_bind(struct lvp_device *device, */ return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); } - plane->plane_offset = plane_offset; + plane->offset = plane_offset; *min_plane_offset = plane_offset + plane->size; return VK_SUCCESS; } diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c index 8e09d99835c..21bcbef045c 100644 --- a/src/gallium/frontends/lavapipe/lvp_image.c +++ b/src/gallium/frontends/lavapipe/lvp_image.c @@ -153,7 +153,7 @@ lvp_image_init(struct lvp_device *device, struct lvp_image *image, whandle.stride = layouts[p].rowPitch; whandle.array_stride = layouts[p].arrayPitch; whandle.image_stride = layouts[p].depthPitch; - image->planes[p].plane_offset = layouts[p].offset; + image->planes[p].offset = layouts[p].offset; whandle.format = pCreateInfo->format; whandle.modifier = modifier; image->planes[p].bo = device->pscreen->resource_from_handle(device->pscreen, @@ -515,7 +515,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetImageSubresourceLayout( pLayout->depthPitch = 0; pLayout->arrayPitch = value; } - pLayout->offset += plane->plane_offset; + pLayout->offset += plane->offset; pLayout->size = plane->size; } diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 6a31f071439..54d58c1e03b 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -279,7 +279,7 @@ vk_sync_as_lvp_pipe_sync(struct vk_sync *sync) struct lvp_image_plane { struct pipe_resource *bo; - VkDeviceSize plane_offset; + VkDeviceSize offset; VkDeviceSize size; };