Pushed. On Wed, Oct 18, 2017 at 3:31 AM, Eric Engestrom <eric.engest...@imgtec.com> wrote:
> On Wednesday, 2017-10-18 08:12:27 +0000, Vinson Lee wrote: > > Fix build error. > > > > CC vulkan/vulkan_libvulkan_common_la-anv_device.lo > > In file included from vulkan/anv_device.c:33:0: > > vulkan/anv_device.c: In function ‘anv_AllocateMemory’: > > vulkan/anv_device.c:1562:37: error: ‘struct anv_device’ has no member > named ‘instace’; did you mean ‘instance’? > > result = vk_errorf(device->instace, device, > > ^ > > vulkan/anv_private.h:317:17: note: in definition of macro ‘vk_errorf’ > > __vk_errorf(instance, obj, REPORT_OBJECT_TYPE(obj), error,\ > > ^~~~~~~~ > > > > Fixes: 9775894f1025 ("anv: Move size check from anv_bo_cache_import() to > caller (v2)") > > Signed-off-by: Vinson Lee <v...@freedesktop.org> > > Was about to send the exact same patch, then decided to check the list > first :) > Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> > > > --- > > src/intel/vulkan/anv_device.c | 2 +- > > src/intel/vulkan/anv_intel.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/intel/vulkan/anv_device.c > b/src/intel/vulkan/anv_device.c > > index 546ed2d0ca55..a305afebc32d 100644 > > --- a/src/intel/vulkan/anv_device.c > > +++ b/src/intel/vulkan/anv_device.c > > @@ -1559,7 +1559,7 @@ VkResult anv_AllocateMemory( > > * this sort of attack but only if it can trust the buffer size. > > */ > > if (mem->bo->size < aligned_alloc_size) { > > - result = vk_errorf(device->instace, device, > > + result = vk_errorf(device->instance, device, > > VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR, > > "aligned allocationSize too large for " > > > > "VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR: > " > > diff --git a/src/intel/vulkan/anv_intel.c b/src/intel/vulkan/anv_intel.c > > index 885888e82d87..82373f0c91d0 100644 > > --- a/src/intel/vulkan/anv_intel.c > > +++ b/src/intel/vulkan/anv_intel.c > > @@ -83,7 +83,7 @@ VkResult anv_CreateDmaBufImageINTEL( > > VkDeviceSize aligned_image_size = align_u64(image->size, 4096); > > > > if (mem->bo->size < aligned_image_size) { > > - result = vk_errorf(device->instace, device, > > + result = vk_errorf(device->instance, device, > > VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR, > > "dma-buf too small for image in " > > "vkCreateDmaBufImageINTEL: %"PRIu64"B < > "PRIu64"B", > > -- > > 2.14.1 > > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev