diff options
Diffstat (limited to 'lib/mesa/src/amd')
| -rw-r--r-- | lib/mesa/src/amd/vulkan/Makefile.am | 14 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/Makefile.in | 13 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/radv_device.c | 4 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 3 |
4 files changed, 34 insertions, 0 deletions
diff --git a/lib/mesa/src/amd/vulkan/Makefile.am b/lib/mesa/src/amd/vulkan/Makefile.am index 14b222d40..1e10f9ffb 100644 --- a/lib/mesa/src/amd/vulkan/Makefile.am +++ b/lib/mesa/src/amd/vulkan/Makefile.am @@ -199,6 +199,20 @@ dev_icd.json : radv_extensions.py radv_icd.py radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ --lib-path="${libdir}" --out $@ +else +radeon_icd.@host_cpu@.json : + @echo -e "{" > $@ + @echo -e " \"ICD\": {" >> $@ + @echo -e " \"api_version\": \"1.1.70\"," >> $@ + @echo -e " \"library_path\": \"${libdir}/libvulkan_radeon.so\"" >> $@ + @echo -e " }," >> $@ + @echo -e " \"file_format_version\": \"1.0.0\"" >> $@ + @echo -ne "}" >> $@ + +.PHONY: radeon_icd.@host_cpu@.json + +dev_icd.json : radeon_icd.@host_cpu@.json + cp radeon_icd.@host_cpu@.json $@ endif include $(top_srcdir)/install-lib-links.mk diff --git a/lib/mesa/src/amd/vulkan/Makefile.in b/lib/mesa/src/amd/vulkan/Makefile.in index f2d99f42f..e13095598 100644 --- a/lib/mesa/src/amd/vulkan/Makefile.in +++ b/lib/mesa/src/amd/vulkan/Makefile.in @@ -1286,6 +1286,19 @@ uninstall-am: uninstall-icdconfDATA uninstall-libLTLIBRARIES @REGEN_SOURCES_TRUE@radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py @REGEN_SOURCES_TRUE@ $(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \ @REGEN_SOURCES_TRUE@ --lib-path="${libdir}" --out $@ +@REGEN_SOURCES_FALSE@radeon_icd.@host_cpu@.json : +@REGEN_SOURCES_FALSE@ @echo -e "{" > $@ +@REGEN_SOURCES_FALSE@ @echo -e " \"ICD\": {" >> $@ +@REGEN_SOURCES_FALSE@ @echo -e " \"api_version\": \"1.1.70\"," >> $@ +@REGEN_SOURCES_FALSE@ @echo -e " \"library_path\": \"${libdir}/libvulkan_radeon.so\"" >> $@ +@REGEN_SOURCES_FALSE@ @echo -e " }," >> $@ +@REGEN_SOURCES_FALSE@ @echo -e " \"file_format_version\": \"1.0.0\"" >> $@ +@REGEN_SOURCES_FALSE@ @echo -ne "}" >> $@ + +@REGEN_SOURCES_FALSE@.PHONY: radeon_icd.@host_cpu@.json + +@REGEN_SOURCES_FALSE@dev_icd.json : radeon_icd.@host_cpu@.json +@REGEN_SOURCES_FALSE@ cp radeon_icd.@host_cpu@.json $@ @BUILD_SHARED_TRUE@@HAVE_COMPAT_SYMLINKS_TRUE@all-local : .install-mesa-links diff --git a/lib/mesa/src/amd/vulkan/radv_device.c b/lib/mesa/src/amd/vulkan/radv_device.c index 334c8bd45..a81cb456a 100644 --- a/lib/mesa/src/amd/vulkan/radv_device.c +++ b/lib/mesa/src/amd/vulkan/radv_device.c @@ -49,6 +49,10 @@ #include "util/debug.h" #include "util/mesa-sha1.h" +#ifndef CLOCK_MONOTONIC_RAW +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +#endif + static int radv_device_get_cache_uuid(enum radeon_family family, void *uuid) { diff --git a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 49a86a72c..0c779806e 100644 --- a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -35,6 +35,9 @@ #include "radv_amdgpu_bo.h" #include "sid.h" +#ifndef ETIME +#define ETIME ETIMEDOUT +#endif enum { VIRTUAL_BUFFER_HASH_TABLE_SIZE = 1024 |