aboutsummaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2020-05-07 11:36:36 +0300
committerMarge Bot <[email protected]>2020-05-07 16:42:44 +0000
commit4f17e9eef6f9f8a2986264b3da5157542983a1da (patch)
tree10213c073d8b85688d7070f09d70e5830cd75b8c /src/intel
parent6d513eb0db25a272da65822f35907456b544f172 (diff)
anv: don't expose VK_INTEL_performance_query without kernel support
Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: 2b5f30b1d91b ("anv: implement VK_INTEL_performance_query") Acked-by: Timothy Strelchun <[email protected]> Reviewed-by: Rafael Antognolli <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4937>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/vulkan/anv_extensions.py2
-rw-r--r--src/intel/vulkan/anv_extensions_gen.py2
2 files changed, 3 insertions, 1 deletions
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[];