Mesa (main): turnip: Claim 1.2.7.1 CTS conformance.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1e850f23b1c93ac2522ce09b81d19ee94dd61e8f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e850f23b1c93ac2522ce09b81d19ee94dd61e8f

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Nov  2 13:55:29 2021 -0700

turnip: Claim 1.2.7.1 CTS conformance.

I submitted a conformance package for A618 today, so let's stop doing all
this warning about non-conformance.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6251>

---

 src/freedreno/ci/gitlab-ci.yml   |  1 -
 src/freedreno/vulkan/tu_device.c | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 52bc71199ab..6a2d17a8ce2 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -24,7 +24,6 @@
   variables:
     DEQP_VER: vk
     VK_DRIVER: freedreno
-    MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
 
 .freedreno-test-traces:
   extends:
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index 0811259dd47..f3f892cfcea 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -252,8 +252,6 @@ tu_physical_device_init(struct tu_physical_device *device,
    disk_cache_format_hex_id(buf, device->cache_uuid, VK_UUID_SIZE * 2);
    device->disk_cache = disk_cache_create(device->name, buf, 0);
 
-   vk_warn_non_conformant_implementation("tu");
-
    fd_get_driver_uuid(device->driver_uuid);
    fd_get_device_uuid(device->device_uuid, &device->dev_id);
 
@@ -845,12 +843,11 @@ tu_get_physical_device_properties_1_2(struct tu_physical_device *pdevice,
    memset(p->driverInfo, 0, sizeof(p->driverInfo));
    snprintf(p->driverInfo, VK_MAX_DRIVER_INFO_SIZE_KHR,
             "Mesa " PACKAGE_VERSION MESA_GIT_SHA1);
-   /* XXX: VK 1.2: Need to pass conformance. */
    p->conformanceVersion = (VkConformanceVersionKHR) {
-      .major = 0,
-      .minor = 0,
-      .subminor = 0,
-      .patch = 0,
+      .major = 1,
+      .minor = 2,
+      .subminor = 7,
+      .patch = 1,
    };
 
    p->denormBehaviorIndependence =