fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: don't disable KHR_performance_query in debug mode

Browse source 
This is useful to verify that queries are built properly and avoiding
to deal with i915-perf (typically under simulation).

v2: Remove likely() (Marcin)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8525>
This commit is contained in:
Lionel Landwerlin 2020-08-27 15:29:07 +03:00
parent 08b16cfe0b
commit dbeca67a1d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/vulkan/anv_extensions.py
View file

@ -90,7 +90,7 @@ EXTENSIONS = [
Extension('VK_KHR_multiview', 1, True),
Extension('VK_KHR_performance_query', 1,
'device->use_softpin && device->perf && ' +
'device->perf->i915_perf_version >= 3 && ' +
'(device->perf->i915_perf_version >= 3 || INTEL_DEBUG & DEBUG_NO_OACONFIG) && ' +
'device->use_call_secondary'),
Extension('VK_KHR_pipeline_executable_properties', 1, True),
Extension('VK_KHR_push_descriptor', 2, True),

6
src/intel/vulkan/anv_perf.c
View file

@ -56,8 +56,10 @@ anv_get_perf(const struct gen_device_info *devinfo, int fd)
/* We need DRM_I915_PERF_PROP_HOLD_PREEMPTION support, only available in
* perf revision 2.
*/
if (perf->i915_perf_version < 3)
goto err;
if (!(INTEL_DEBUG & DEBUG_NO_OACONFIG)) {
if (perf->i915_perf_version < 3)
goto err;
}
return perf;