Mesa (master): turnip: set the API version

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c95b250a4c26cd4576af41b5e6262d7bfbfce1f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c95b250a4c26cd4576af41b5e6262d7bfbfce1f7

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Wed Jun 17 09:57:56 2020 -0400

turnip: set the API version

Some CTS tests don't run because of this.

Fixes: 91c757b7963f458 ("turnip: use the common code for generating extensions and dispatch tables")

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5522>

---

 .gitlab-ci/deqp-freedreno-a630-fails.txt | 3 +++
 .gitlab-ci/deqp-freedreno-a630-skips.txt | 3 +++
 src/freedreno/vulkan/tu_extensions.py    | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/deqp-freedreno-a630-fails.txt b/.gitlab-ci/deqp-freedreno-a630-fails.txt
index 6243f34cf74..73d3b3c41af 100644
--- a/.gitlab-ci/deqp-freedreno-a630-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-fails.txt
@@ -13,6 +13,9 @@ dEQP-VK.renderpass.dedicated_allocation.formats.d24_unorm_s8_uint.input.load.don
 dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.clear.dont_care.draw
 dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.dont_care.dont_care.clear_draw
 dEQP-VK.renderpass.suballocation.formats.d24_unorm_s8_uint.input.load.dont_care.clear_draw_use_input_aspect_stencil_read_only
+dEQP-VK.spirv_assembly.instruction.compute.float_controls.fp32.input_args.denorm_fma_inf_preserve
+dEQP-VK.subgroups.basic.framebuffer.subgroupmemorybarrierbuffer_vertex
+dEQP-VK.subgroups.quad.framebuffer.subgroupquadbroadcast_bvec2_geometry
 dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_blit_image_read_blit_image.image_128_r32_uint_opaque_fd
 dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_blit_image_read_image_compute_indirect.image_128x128_r8_unorm_opaque_fd
 dEQP-VK.synchronization.signal_order.shared_binary_semaphore.write_copy_buffer_read_ssbo_fragment.buffer_262144_opaque_fd
diff --git a/.gitlab-ci/deqp-freedreno-a630-skips.txt b/.gitlab-ci/deqp-freedreno-a630-skips.txt
index 6007aeb4e20..b4a473f8aea 100644
--- a/.gitlab-ci/deqp-freedreno-a630-skips.txt
+++ b/.gitlab-ci/deqp-freedreno-a630-skips.txt
@@ -65,6 +65,9 @@ dEQP-GLES3.functional.transform_feedback.array_element.separate.triangles.lowp_m
 # Non-sysmem flakes
 dEQP-VK.pipeline.spec_constant.compute.composite.matrix.mat3x2
 
+# Fails NIR_VALIDATE so probably flaky
+dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_nonlocal.workgroup.guard_local.buffer.comp
+
 # Sysmem flake: this one is fairly frequent, but if you enable it then
 # it moves to dEQP-VK.renderpass.dedicated_allocation.attachment.3.393
 #
diff --git a/src/freedreno/vulkan/tu_extensions.py b/src/freedreno/vulkan/tu_extensions.py
index f19a8cbd90b..7d5c3eacc80 100644
--- a/src/freedreno/vulkan/tu_extensions.py
+++ b/src/freedreno/vulkan/tu_extensions.py
@@ -82,7 +82,7 @@ EXTENSIONS = [
 ]
 
 MAX_API_VERSION = VkVersion(MAX_API_VERSION)
-API_VERSIONS = []
+API_VERSIONS = [ ApiVersion(MAX_API_VERSION,  True) ]
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()