fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: drop always-successful VkResult

Browse source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Eric Engestrom 2019-01-08 12:50:49 +00:00
parent f2ece26601
commit 9af77fcf98
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/intel/vulkan/anv_device.c
View file

@ -60,8 +60,8 @@ compiler_perf_log(void *data, const char *fmt, ...)
va_end(args);
}
static VkResult
anv_compute_heap_size(int fd, uint64_t gtt_size, uint64_t *heap_size)
static uint64_t
anv_compute_heap_size(int fd, uint64_t gtt_size)
{
/* Query the total ram from the system */
struct sysinfo info;
@ -83,9 +83,7 @@ anv_compute_heap_size(int fd, uint64_t gtt_size, uint64_t *heap_size)
*/
uint64_t available_gtt = gtt_size * 3 / 4;
*heap_size = MIN2(available_ram, available_gtt);
return VK_SUCCESS;
return MIN2(available_ram, available_gtt);
}
static VkResult
@ -109,10 +107,7 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd)
device->supports_48bit_addresses = (device->info.gen >= 8) &&
gtt_size > (4ULL << 30 /* GiB */);
uint64_t heap_size = 0;
VkResult result = anv_compute_heap_size(fd, gtt_size, &heap_size);
if (result != VK_SUCCESS)
return result;
uint64_t heap_size = anv_compute_heap_size(fd, gtt_size);
if (heap_size > (2ull << 30) && !device->supports_48bit_addresses) {
/* When running with an overridden PCI ID, we may get a GTT size from