thud migration: default to use older Vulkan v1.0.65.2
Vulkan v1.1.73 fails building with spirv-tools https://jira.digi.com/browse/DEL-6412 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra
parent
2e28c68d38
commit
a53072391e
|
|
@ -73,6 +73,9 @@ PREFERRED_VERSION_nativesdk-dtc ?= "1.4.5"
|
|||
# Use git recipe for libsoc
|
||||
PREFERRED_VERSION_libsoc = "git"
|
||||
|
||||
# Gstreamer 1.14.0 requires a specific vulkan version.
|
||||
PREFERRED_VERSION_vulkan ?= "1.0.65%"
|
||||
|
||||
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
|
||||
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
commit f63cbe944107b5cd8f150ceaaec43b26099d5688
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Tue Feb 16 10:05:25 2016 -0500
|
||||
|
||||
demos: Don't build tri or cube
|
||||
|
||||
There are more interesting demos, all we really want here is vulkaninfo.
|
||||
This helps because we don't need to pre-build glslang/llvm/lunarglass
|
||||
just to get the loader and layers.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
Index: git/demos/CMakeLists.txt
|
||||
===================================================================
|
||||
--- git.orig/demos/CMakeLists.txt
|
||||
+++ git/demos/CMakeLists.txt
|
||||
@@ -63,46 +63,6 @@ elseif(UNIX)
|
||||
else()
|
||||
endif()
|
||||
|
||||
-if(WIN32)
|
||||
- # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory.
|
||||
- # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the
|
||||
- # appropriate data at build time.
|
||||
- if (CMAKE_CL_64)
|
||||
- set (BUILDTGT_DIR build)
|
||||
- else ()
|
||||
- set (BUILDTGT_DIR build32)
|
||||
- endif()
|
||||
-
|
||||
- # Use static MSVCRT libraries
|
||||
- foreach(configuration in CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
|
||||
- CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO)
|
||||
- if(${configuration} MATCHES "/MD")
|
||||
- string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}")
|
||||
- endif()
|
||||
- endforeach()
|
||||
-
|
||||
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
|
||||
- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
|
||||
- DEPENDS cube.vert ${GLSLANG_VALIDATOR}
|
||||
- )
|
||||
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
|
||||
- COMMAND ${GLSLANG_VALIDATOR} -s -V -o ${CMAKE_BINARY_DIR}/demos/cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
|
||||
- DEPENDS cube.frag ${GLSLANG_VALIDATOR}
|
||||
- )
|
||||
- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
|
||||
- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
|
||||
-else()
|
||||
- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
||||
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
|
||||
- COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
|
||||
- DEPENDS cube.vert ${GLSLANG_VALIDATOR}
|
||||
- )
|
||||
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
|
||||
- COMMAND ${GLSLANG_VALIDATOR} -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
|
||||
- DEPENDS cube.frag ${GLSLANG_VALIDATOR}
|
||||
- )
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
if(WIN32)
|
||||
include_directories (
|
||||
@@ -116,43 +76,6 @@ endif()
|
||||
add_executable(${API_LOWERCASE}info vulkaninfo.c)
|
||||
target_link_libraries(${API_LOWERCASE}info ${LIBRARIES})
|
||||
|
||||
-if(NOT WIN32)
|
||||
- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
||||
- add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
|
||||
- target_link_libraries(cube ${LIBRARIES})
|
||||
- endif()
|
||||
-else()
|
||||
- if (CMAKE_CL_64)
|
||||
- set (LIB_DIR "Win64")
|
||||
- else()
|
||||
- set (LIB_DIR "Win32")
|
||||
- endif()
|
||||
-
|
||||
- add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
|
||||
- target_link_libraries(cube ${LIBRARIES})
|
||||
-endif()
|
||||
-
|
||||
-if(NOT WIN32)
|
||||
- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
||||
- add_executable(cubepp cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
|
||||
- target_link_libraries(cubepp ${LIBRARIES})
|
||||
- endif()
|
||||
-else()
|
||||
- if (CMAKE_CL_64)
|
||||
- set (LIB_DIR "Win64")
|
||||
- else()
|
||||
- set (LIB_DIR "Win32")
|
||||
- endif()
|
||||
-
|
||||
- add_executable(cubepp WIN32 cube.cpp ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
|
||||
- target_link_libraries(cubepp ${LIBRARIES})
|
||||
-endif()
|
||||
-
|
||||
-if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}))
|
||||
- if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android"))
|
||||
- add_subdirectory(smoke)
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
if(UNIX)
|
||||
if(INSTALL_LVL_FILES)
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
SUMMARY = "3D graphics and compute API common loader"
|
||||
DESCRIPTION = "Vulkan is a new generation graphics and compute API \
|
||||
that provides efficient access to modern GPUs. These packages \
|
||||
provide only the common vendor-agnostic library loader, headers and \
|
||||
the vulkaninfo utility."
|
||||
HOMEPAGE = "https://www.khronos.org/vulkan/"
|
||||
BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \
|
||||
file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d"
|
||||
SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.65 \
|
||||
file://demos-Don-t-build-tri-or-cube.patch \
|
||||
"
|
||||
SRCREV = "73486a1a169d862d5210e2ad520d95319a2383fa"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "vulkan"
|
||||
|
||||
inherit cmake python3native lib_package distro_features_check
|
||||
ANY_OF_DISTRO_FEATURES = "x11 wayland"
|
||||
|
||||
EXTRA_OECMAKE = "-DBUILD_WSI_MIR_SUPPORT=OFF \
|
||||
-DBUILD_LAYERS=OFF \
|
||||
-DBUILD_TESTS=OFF"
|
||||
|
||||
# must choose x11 or wayland or both
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}"
|
||||
PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr"
|
||||
PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
|
||||
|
||||
RRECOMMENDS_${PN} = "mesa-vulkan-drivers"
|
||||
Loading…
Reference in New Issue