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

anv/image: Get rid of the memset(aux, 0, sizeof(aux)) hack

Browse source 
Up until now, we've been memsetting the auxiliary surface to 0 at
BindImageMemory time to ensure that it is properly initialized.
However, this isn't correct because apps are allowed to freely alias
memory between different images and buffers so long as they properly
track whether or not a particular image is valid and, if it isn't,
transition from UNINITIALIZED to something else before using it.  We
now implement those transitions so we can drop the hack.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Cc: "17.1" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand 2017-05-18 11:31:48 -07:00
parent cc45c4bb80
commit 4eecd534f0
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/intel/vulkan/anv_image.c
View file

@ -332,7 +332,6 @@ VkResult anv_BindImageMemory(
VkDeviceMemory _memory,
VkDeviceSize memoryOffset)
{
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
ANV_FROM_HANDLE(anv_image, image, _image);
@ -345,33 +344,6 @@ VkResult anv_BindImageMemory(
image->bo = mem->bo;
image->offset = memoryOffset;
if (image->aux_surface.isl.size > 0) {
/* The offset and size must be a multiple of 4K or else the
* anv_gem_mmap call below will fail.
*/
assert((image->offset + image->aux_surface.offset) % 4096 == 0);
assert(image->aux_surface.isl.size % 4096 == 0);
/* Auxiliary surfaces need to have their memory cleared to 0 before they
* can be used. For CCS surfaces, this puts them in the "resolved"
* state so they can be used with CCS enabled before we ever touch it
* from the GPU. For HiZ, we need something valid or else we may get
* GPU hangs on some hardware and 0 works fine.
*/
void *map = anv_gem_mmap(device, image->bo->gem_handle,
image->offset + image->aux_surface.offset,
image->aux_surface.isl.size,
device->info.has_llc ? 0 : I915_MMAP_WC);
if (map == MAP_FAILED)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
memset(map, 0, image->aux_surface.isl.size);
anv_gem_munmap(map, image->aux_surface.isl.size);
}
return VK_SUCCESS;
}