diff --git a/src/amd/vulkan/radv_buffer_view.c b/src/amd/vulkan/radv_buffer_view.c index 947337d70dc..1361a7388f4 100644 --- a/src/amd/vulkan/radv_buffer_view.c +++ b/src/amd/vulkan/radv_buffer_view.c @@ -20,8 +20,8 @@ #include "vk_log.h" void -radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned offset, - unsigned range, uint32_t *state) +radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned range, + uint32_t *state) { const struct radv_physical_device *pdev = radv_device_physical(device); const struct util_format_description *desc; @@ -33,8 +33,6 @@ radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFor radv_compose_swizzle(desc, NULL, swizzle); - va += offset; - if (pdev->info.gfx_level != GFX8 && stride) { range /= stride; } @@ -73,7 +71,7 @@ radv_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInf view->bo = buffer->bo; - radv_make_texel_buffer_descriptor(device, buffer->vk.device_address, view->vk.format, view->vk.offset, + radv_make_texel_buffer_descriptor(device, buffer->vk.device_address + view->vk.offset, view->vk.format, view->vk.range, view->state); *pView = radv_buffer_view_to_handle(view); diff --git a/src/amd/vulkan/radv_buffer_view.h b/src/amd/vulkan/radv_buffer_view.h index 38a76b0ff8c..bcdd6dfa886 100644 --- a/src/amd/vulkan/radv_buffer_view.h +++ b/src/amd/vulkan/radv_buffer_view.h @@ -23,7 +23,7 @@ struct radv_buffer_view { VK_DEFINE_NONDISP_HANDLE_CASTS(radv_buffer_view, vk.base, VkBufferView, VK_OBJECT_TYPE_BUFFER_VIEW) -void radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned offset, - unsigned range, uint32_t *state); +void radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned range, + uint32_t *state); #endif /* RADV_BUFFER_VIEW_H */ diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 1ac8bae2f42..bc13b84b78c 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -1702,7 +1702,7 @@ radv_GetDescriptorEXT(VkDevice _device, const VkDescriptorGetInfoEXT *pDescripto const VkDescriptorAddressInfoEXT *addr_info = pDescriptorInfo->data.pUniformTexelBuffer; if (addr_info && addr_info->address) { - radv_make_texel_buffer_descriptor(device, addr_info->address, addr_info->format, 0, addr_info->range, + radv_make_texel_buffer_descriptor(device, addr_info->address, addr_info->format, addr_info->range, pDescriptor); } else { memset(pDescriptor, 0, 4 * 4); @@ -1713,7 +1713,7 @@ radv_GetDescriptorEXT(VkDevice _device, const VkDescriptorGetInfoEXT *pDescripto const VkDescriptorAddressInfoEXT *addr_info = pDescriptorInfo->data.pStorageTexelBuffer; if (addr_info && addr_info->address) { - radv_make_texel_buffer_descriptor(device, addr_info->address, addr_info->format, 0, addr_info->range, + radv_make_texel_buffer_descriptor(device, addr_info->address, addr_info->format, addr_info->range, pDescriptor); } else { memset(pDescriptor, 0, 4 * 4);