Merge remote-tracking branch 'mesa-public/master' into vulkan

2015-11-03 15:45:04 -08:00
parent a1e7b8701a 5d4b019d2a
commit b00e3f221b
340 changed files with 16562 additions and 3672 deletions
@@ -74,7 +74,7 @@ anv_physical_device_init(struct anv_physical_device *device,
   }

   device->name = brw_get_device_name(device->chipset_id);
-   device->info = brw_get_device_info(device->chipset_id, -1);
+   device->info = brw_get_device_info(device->chipset_id);
   if (!device->info) {
      result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED,
                         "failed to get device info");