Mesa (master): anv: don't expose VK_INTEL_performance_query without kernel support
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu May 7 17:14:24 UTC 2020
Module: Mesa
Branch: master
Commit: 4f17e9eef6f9f8a2986264b3da5157542983a1da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f17e9eef6f9f8a2986264b3da5157542983a1da
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Thu May 7 11:36:36 2020 +0300
anv: don't expose VK_INTEL_performance_query without kernel support
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 2b5f30b1d91b ("anv: implement VK_INTEL_performance_query")
Acked-by: Timothy Strelchun <timothy.strelchun at intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4937>
---
src/intel/vulkan/anv_extensions.py | 2 +-
src/intel/vulkan/anv_extensions_gen.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
index a86ca6b10bb..3da10c724b9 100644
--- a/src/intel/vulkan/anv_extensions.py
+++ b/src/intel/vulkan/anv_extensions.py
@@ -171,7 +171,7 @@ EXTENSIONS = [
Extension('VK_ANDROID_native_buffer', 7, 'ANDROID'),
Extension('VK_GOOGLE_decorate_string', 1, True),
Extension('VK_GOOGLE_hlsl_functionality1', 1, True),
- Extension('VK_INTEL_performance_query', 1, 'device->perf'),
+ Extension('VK_INTEL_performance_query', 1, 'device->perf && device->perf->i915_perf_version >= 3'),
Extension('VK_INTEL_shader_integer_functions2', 1, 'device->info.gen >= 8'),
Extension('VK_NV_compute_shader_derivatives', 1, True),
]
diff --git a/src/intel/vulkan/anv_extensions_gen.py b/src/intel/vulkan/anv_extensions_gen.py
index 187a58491c1..7bdde5e54d4 100644
--- a/src/intel/vulkan/anv_extensions_gen.py
+++ b/src/intel/vulkan/anv_extensions_gen.py
@@ -62,6 +62,8 @@ _TEMPLATE_H = Template(COPYRIGHT + """
#include "stdbool.h"
+#include "perf/gen_perf.h"
+
#define ANV_INSTANCE_EXTENSION_COUNT ${len(instance_extensions)}
extern const VkExtensionProperties anv_instance_extensions[];
More information about the mesa-commit
mailing list