<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Sun, Sep 30, 2018 at 12:29 PM Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl">bas@basnieuwenhuizen.nl</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Sat, Sep 29, 2018 at 4:40 PM Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>> wrote:<br>
><br>
> ---<br>
>  src/intel/vulkan/anv_device.c      | 27 +++++++++++++++++++++++++++<br>
>  src/intel/vulkan/anv_extensions.py |  1 +<br>
>  2 files changed, 28 insertions(+)<br>
><br>
> diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c<br>
> index aa75de4e1ac..ad690b58e23 100644<br>
> --- a/src/intel/vulkan/anv_device.c<br>
> +++ b/src/intel/vulkan/anv_device.c<br>
> @@ -37,6 +37,7 @@<br>
>  #include "util/build_id.h"<br>
>  #include "util/disk_cache.h"<br>
>  #include "util/mesa-sha1.h"<br>
> +#include "git_sha1.h"<br>
>  #include "vk_util.h"<br>
>  #include "common/gen_defines.h"<br>
><br>
> @@ -1114,6 +1115,32 @@ void anv_GetPhysicalDeviceProperties2(<br>
>           break;<br>
>        }<br>
><br>
> +      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR: {<br>
> +         VkPhysicalDeviceDriverPropertiesKHR *driver_props =<br>
> +            (VkPhysicalDeviceDriverPropertiesKHR *) ext;<br>
> +<br>
> +         driver_props->driverID = 6; /* Intel Mesa driver */<br>
As far as I can tell the enum for this got included in the header, why<br>
not just use VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR?</blockquote><div><br></div><div>Yup.  I'll fix that.  I went looking for it before I sent these patches but, for some reason, I didn't find it at the time.  I've found it now though.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> With that<br>
changed, and assuming you really passed CTS 1.1.1.0, this is<br></blockquote><div><br></div><div>I'm doing a full CTS run on 1.1.2.0 right now.  I'll update to that before pushing assuming it passes.  It should, we're running the CTS in CI.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Reviewed-by: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl" target="_blank">bas@basnieuwenhuizen.nl</a>><br></blockquote><div><br></div><div>Thanks!</div><div><br></div><div>--Jason<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
> +         memset(driver_props->driverName, 0, VK_MAX_DRIVER_NAME_SIZE_KHR);<br>
> +         strcpy(driver_props->driverName,<br>
> +                "Intel open-source Mesa driver");<br>
> +<br>
> +         memset(driver_props->driverInfo, 0, VK_MAX_DRIVER_INFO_SIZE_KHR);<br>
> +         strcpy(driver_props->driverInfo,<br>
> +                  "Mesa " PACKAGE_VERSION<br>
> +#ifdef MESA_GIT_SHA1<br>
> +                  " ("MESA_GIT_SHA1")"<br>
> +#endif<br>
> +                );<br>
> +<br>
> +         driver_props->conformanceVersion = (VkConformanceVersionKHR) {<br>
> +            .major = 1,<br>
> +            .minor = 1,<br>
> +            .subminor = 1,<br>
> +            .patch = 0,<br>
> +         };<br>
> +         break;<br>
> +      }<br>
> +<br>
>        case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES: {<br>
>           VkPhysicalDeviceIDProperties *id_props =<br>
>              (VkPhysicalDeviceIDProperties *)ext;<br>
> diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py<br>
> index 951505a854e..d4915c95013 100644<br>
> --- a/src/intel/vulkan/anv_extensions.py<br>
> +++ b/src/intel/vulkan/anv_extensions.py<br>
> @@ -78,6 +78,7 @@ EXTENSIONS = [<br>
>      Extension('VK_KHR_descriptor_update_template',        1, True),<br>
>      Extension('VK_KHR_device_group',                      1, True),<br>
>      Extension('VK_KHR_device_group_creation',             1, True),<br>
> +    Extension('VK_KHR_driver_properties',                 1, True),<br>
>      Extension('VK_KHR_external_fence',                    1,<br>
>                'device->has_syncobj_wait'),<br>
>      Extension('VK_KHR_external_fence_capabilities',       1, True),<br>
> --<br>
> 2.17.1<br>
><br>
> _______________________________________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div></div>