* [ptxdist] [PATCH v2 2/7] mesalib: enable zink gallium driver
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 3/7] mesalib: enable vulkan drivers Philipp Zabel
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
No changes since v1.
---
rules/mesalib.in | 5 +++++
rules/mesalib.make | 1 +
2 files changed, 6 insertions(+)
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 56c2d9ed26ad..7e200ee9ec23 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -19,6 +19,7 @@ menuconfig MESALIB
select LIBDRM_RADEON if MESALIB_DRI_R600
select LIBDRM_RADEON if MESALIB_DRI_RADEONSI
select LIBDRM_NOUVEAU if MESALIB_DRI_NOUVEAU || MESALIB_DRI_NOUVEAU_VIEUX
+ select VULKAN_LOADER if MESALIB_DRI_ZINK
select LM_SENSORS if MESALIB_LMSENSORS
select XORGPROTO if MESALIB_GLX
select XORG_LIB_X11 if MESALIB_GLX || MESALIB_EGL_X11 && MESALIB_EGL_DRM
@@ -115,6 +116,10 @@ config MESALIB_DRI_LIMA
bool
prompt "lima"
+config MESALIB_DRI_ZINK
+ bool
+ prompt "zink"
+
comment "API Support"
config MESALIB_OPENGL
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 1558553abf7a..35b71795dcc3 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -58,6 +58,7 @@ MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_LIMA) += lima
ifdef PTXCONF_ARCH_X86
MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IRIS) += iris
endif
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ZINK) += zink
MESALIB_DRI_LIBS-y = \
$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y))
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH v2 3/7] mesalib: enable vulkan drivers
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 2/7] mesalib: enable zink gallium driver Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 4/7] gst-plugins-bad1: enable vulkan plugin Philipp Zabel
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Radv still requires LLVM support.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
No changes since v1.
---
rules/mesalib.in | 12 ++++++++++++
rules/mesalib.make | 19 +++++++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/rules/mesalib.in b/rules/mesalib.in
index 7e200ee9ec23..2fa8156bab8e 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -178,5 +178,17 @@ config MESALIB_LMSENSORS
depends on MESALIB_EXTENDED_HUD
bool
+comment "Vulkan drivers"
+
+config MESALIB_VULKAN_AMD
+ bool
+ # needs LLVM
+ depends on BROKEN
+ prompt "AMD (Radv)"
+
+config MESALIB_VULKAN_INTEL
+ bool
+ prompt "Intel (Anvil)"
+
endif
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 35b71795dcc3..0fcdbbc0977e 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -66,6 +66,13 @@ MESALIB_DRI_LIBS-y = \
MESALIB_DRI_GALLIUM_LIBS-y = \
$(subst kmsro,imx-drm pl111 hx8357d stm,$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y)))
+ifdef PTXCONF_ARCH_X86
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd
+MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel
+endif
+
+MESALIB_VULKAN_LIBS-y = $(subst amd,radeon,$(MESALIB_VULKAN_DRIVERS-y))
+
MESALIB_LIBS-y := libglapi
MESALIB_LIBS-$(PTXCONF_MESALIB_GLX) += libGL
MESALIB_LIBS-$(PTXCONF_MESALIB_GLES1) += libGLESv1_CM
@@ -120,7 +127,7 @@ MESALIB_CONF_OPT := \
-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
-Dpower8=false \
-Dselinux=false \
- -Dshader-cache=false \
+ -Dshader-cache=$(call ptx/truefalse, PTXCONF_MESALIB_VULKAN_AMD) \
-Dshared-glapi=true \
-Dshared-llvm=false \
-Dswr-arches=[] \
@@ -128,7 +135,7 @@ MESALIB_CONF_OPT := \
-Dva-libs-path=/usr/lib/dri \
-Dvalgrind=false \
-Dvdpau-libs-path=/usr/lib/vdpau \
- -Dvulkan-drivers=[] \
+ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \
-Dvulkan-icd-dir=/etc/vulkan/icd.d \
-Dvulkan-overlay-layer=false \
-Dxlib-lease=false \
@@ -171,6 +178,14 @@ ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
endif
+ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),)
+ @$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \
+ $(call install_copy, mesalib, 0, 0, 0644, -, \
+ /usr/lib/libvulkan_$(lib).so)$(ptx/nl) \
+ $(call install_copy, mesalib, 0, 0, 0644, -, \
+ /etc/vulkan/icd.d/$(lib)_icd.$(subst _,-,$(PTXCONF_ARCH_STRING)).json)$(ptx/nl))
+endif
+
@$(foreach lib, $(MESALIB_LIBS-y), \
$(call install_lib, mesalib, 0, 0, 0644, $(lib))$(ptx/nl))
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH v2 4/7] gst-plugins-bad1: enable vulkan plugin
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 2/7] mesalib: enable zink gallium driver Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 3/7] mesalib: enable vulkan drivers Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 5/7] glslang: new package Philipp Zabel
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
No changes since v1.
---
rules/gst-plugins-bad1.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/gst-plugins-bad1.in b/rules/gst-plugins-bad1.in
index d1dd4f471df7..f535a8198d6b 100644
--- a/rules/gst-plugins-bad1.in
+++ b/rules/gst-plugins-bad1.in
@@ -803,7 +803,7 @@ config GST_PLUGINS_BAD1_VOAMRWBENC
config GST_PLUGINS_BAD1_VULKAN
bool
- depends on BROKEN
+ depends on VULKAN_LOADER
prompt "vulkan"
help
Vulkan video sink plugin
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH v2 5/7] glslang: new package
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
` (2 preceding siblings ...)
2020-01-17 10:00 ` [ptxdist] [PATCH v2 4/7] gst-plugins-bad1: enable vulkan plugin Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-02-02 14:46 ` Michael Olbrich
2020-01-17 10:00 ` [ptxdist] [PATCH v2 6/7] spirv-tools: " Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 7/7] vulkan-validationlayers: " Philipp Zabel
5 siblings, 1 reply; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Add reference SPIR-V generator, required to build Vulkan validation
layers.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
New in v2.
---
rules/glslang.in | 25 +++++++++++++++
rules/glslang.make | 77 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
create mode 100644 rules/glslang.in
create mode 100644 rules/glslang.make
diff --git a/rules/glslang.in b/rules/glslang.in
new file mode 100644
index 000000000000..c2a660243d31
--- /dev/null
+++ b/rules/glslang.in
@@ -0,0 +1,25 @@
+## SECTION=multimedia_libs
+
+menuconfig GLSLANG
+ tristate
+ prompt "glslang"
+ select HOST_CMAKE
+ help
+ Khronos-reference SPIR-V generator
+
+if GLSLANG
+
+config GLSLANG_TOOLS
+ bool
+ prompt "install tools"
+ help
+ Install glslangValidator and spirv-remap tools.
+
+config GLSLANG_LIBS
+ bool
+ prompt "install shared libraries"
+ help
+ Install libglslang, libHLSL, libSPIRV, and libSPVRemapper shared
+ libraries.
+
+endif
diff --git a/rules/glslang.make b/rules/glslang.make
new file mode 100644
index 000000000000..b4752f0235e1
--- /dev/null
+++ b/rules/glslang.make
@@ -0,0 +1,77 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GLSLANG) += glslang
+
+#
+# Paths and names
+#
+GLSLANG_VERSION := 8.13.3559
+GLSLANG_MD5 := cb32322377cee2bc1cee5b60ebe46133
+GLSLANG := glslang-$(GLSLANG_VERSION)
+GLSLANG_SUFFIX := tar.gz
+GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
+GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
+GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
+GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
+GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+GLSLANG_CONF_TOOL := cmake
+GLSLANG_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DBUILD_SHARED_LIBS=ON \
+ -DBUILD_EXTERNAL=OFF \
+ -DSKIP_GLSLANG_INSTALL=OFF \
+ -DENABLE_SPVREMAPPER=ON \
+ -DENABLE_GLSLANG_BINARIES=ON \
+ -DENABLE_GLSLANG_WEB=OFF \
+ -DENABLE_GLSLANG_WEB_DEVEL=OFF \
+ -DENABLE_OPT=ON \
+ -DENABLE_PCH=ON \
+ -DENABLE_CTEST=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/glslang.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, glslang)
+ @$(call install_fixup, glslang, PRIORITY, optional)
+ @$(call install_fixup, glslang, SECTION, base)
+ @$(call install_fixup, glslang, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
+ @$(call install_fixup, glslang, DESCRIPTION, Khronos-reference SPIR-V generator)
+
+ifdef GLSLANG_TOOLS
+ @$(call install_file, glslang, 0, 0, 0755, -, /usr/bin/glslangValidator)
+ @$(call install_file, glslang, 0, 0, 0755, -, /usr/bin/spirv-remap)
+endif
+
+ifdef GLSLANG_LIBS
+ @$(call install_lib, glslang, 0, 0, 0644, libglslang-default-resource-limits)
+ @$(call install_lib, glslang, 0, 0, 0644, libglslang)
+ @$(call install_lib, glslang, 0, 0, 0644, libHLSL)
+ @$(call install_lib, glslang, 0, 0, 0644, libSPIRV)
+ @$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper)
+endif
+
+ @$(call install_finish, glslang)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [ptxdist] [PATCH v2 5/7] glslang: new package
2020-01-17 10:00 ` [ptxdist] [PATCH v2 5/7] glslang: new package Philipp Zabel
@ 2020-02-02 14:46 ` Michael Olbrich
0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2020-02-02 14:46 UTC (permalink / raw)
To: ptxdist
On Fri, Jan 17, 2020 at 11:00:53AM +0100, Philipp Zabel wrote:
> Add reference SPIR-V generator, required to build Vulkan validation
> layers.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> New in v2.
> ---
> rules/glslang.in | 25 +++++++++++++++
> rules/glslang.make | 77 ++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 102 insertions(+)
> create mode 100644 rules/glslang.in
> create mode 100644 rules/glslang.make
>
> diff --git a/rules/glslang.in b/rules/glslang.in
> new file mode 100644
> index 000000000000..c2a660243d31
> --- /dev/null
> +++ b/rules/glslang.in
> @@ -0,0 +1,25 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig GLSLANG
> + tristate
> + prompt "glslang"
> + select HOST_CMAKE
> + help
> + Khronos-reference SPIR-V generator
> +
> +if GLSLANG
> +
> +config GLSLANG_TOOLS
> + bool
> + prompt "install tools"
> + help
> + Install glslangValidator and spirv-remap tools.
> +
> +config GLSLANG_LIBS
> + bool
> + prompt "install shared libraries"
> + help
> + Install libglslang, libHLSL, libSPIRV, and libSPVRemapper shared
> + libraries.
> +
> +endif
> diff --git a/rules/glslang.make b/rules/glslang.make
> new file mode 100644
> index 000000000000..b4752f0235e1
> --- /dev/null
> +++ b/rules/glslang.make
> @@ -0,0 +1,77 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_GLSLANG) += glslang
> +
> +#
> +# Paths and names
> +#
> +GLSLANG_VERSION := 8.13.3559
> +GLSLANG_MD5 := cb32322377cee2bc1cee5b60ebe46133
> +GLSLANG := glslang-$(GLSLANG_VERSION)
> +GLSLANG_SUFFIX := tar.gz
> +GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> +GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
> +GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
> +GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License
> +GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +GLSLANG_CONF_TOOL := cmake
> +GLSLANG_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DCMAKE_BUILD_TYPE=Release \
> + -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> + -DBUILD_SHARED_LIBS=ON \
> + -DBUILD_EXTERNAL=OFF \
> + -DSKIP_GLSLANG_INSTALL=OFF \
> + -DENABLE_SPVREMAPPER=ON \
> + -DENABLE_GLSLANG_BINARIES=ON \
> + -DENABLE_GLSLANG_WEB=OFF \
> + -DENABLE_GLSLANG_WEB_DEVEL=OFF \
> + -DENABLE_OPT=ON \
> + -DENABLE_PCH=ON \
> + -DENABLE_CTEST=OFF
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/glslang.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, glslang)
> + @$(call install_fixup, glslang, PRIORITY, optional)
> + @$(call install_fixup, glslang, SECTION, base)
> + @$(call install_fixup, glslang, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
> + @$(call install_fixup, glslang, DESCRIPTION, Khronos-reference SPIR-V generator)
> +
> +ifdef GLSLANG_TOOLS
> + @$(call install_file, glslang, 0, 0, 0755, -, /usr/bin/glslangValidator)
> + @$(call install_file, glslang, 0, 0, 0755, -, /usr/bin/spirv-remap)
install_copy
Michael
> +endif
> +
> +ifdef GLSLANG_LIBS
> + @$(call install_lib, glslang, 0, 0, 0644, libglslang-default-resource-limits)
> + @$(call install_lib, glslang, 0, 0, 0644, libglslang)
> + @$(call install_lib, glslang, 0, 0, 0644, libHLSL)
> + @$(call install_lib, glslang, 0, 0, 0644, libSPIRV)
> + @$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper)
> +endif
> +
> + @$(call install_finish, glslang)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH v2 6/7] spirv-tools: new package
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
` (3 preceding siblings ...)
2020-01-17 10:00 ` [ptxdist] [PATCH v2 5/7] glslang: new package Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-01-17 10:00 ` [ptxdist] [PATCH v2 7/7] vulkan-validationlayers: " Philipp Zabel
5 siblings, 0 replies; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Add SPIR-V tools, required to build Vulkan validation layers.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
New in v2.
---
rules/spirv-tools.in | 18 ++++++++
rules/spirv-tools.make | 101 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
create mode 100644 rules/spirv-tools.in
create mode 100644 rules/spirv-tools.make
diff --git a/rules/spirv-tools.in b/rules/spirv-tools.in
new file mode 100644
index 000000000000..e14eeecb1321
--- /dev/null
+++ b/rules/spirv-tools.in
@@ -0,0 +1,18 @@
+## SECTION=multimedia_libs
+
+menuconfig SPIRV_TOOLS
+ tristate
+ prompt "spirv-tools"
+ select HOST_CMAKE
+ help
+ SPIR-V Tools
+
+if SPIRV_TOOLS
+
+config SPIRV_TOOLS_LIB
+ bool
+ prompt "install shared library"
+ help
+ Install libSPIRV-Tools-shared library
+
+endif
diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
new file mode 100644
index 000000000000..9267152a2d00
--- /dev/null
+++ b/rules/spirv-tools.make
@@ -0,0 +1,101 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
+
+#
+# Paths and names
+#
+SPIRV_TOOLS_VERSION := 2019.5
+SPIRV_TOOLS_MD5 := b502db437d874d3cd1a4046f21fce61c
+SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
+SPIRV_TOOLS_SUFFIX := tar.gz
+SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
+SPIRV_TOOLS_SOURCE := $(SRCDIR)/$(SPIRV_TOOLS).$(SPIRV_TOOLS_SUFFIX)
+SPIRV_TOOLS_DIR := $(BUILDDIR)/$(SPIRV_TOOLS)
+SPIRV_TOOLS_LICENSE := Apache-2.0
+SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
+
+SPIRV_HEADERS_VERSION := 1.5.1.corrected
+SPIRV_HEADERS_MD5 := c8af73a139d18a40706f800b1e35cb9d
+SPIRV_HEADERS_SUFFIX := tar.gz
+SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
+SPIRV_HEADERS_SOURCE := $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
+$(SPIRV_HEADERS_SOURCE) := SPIRV_HEADERS
+SPIRV_HEADERS_DIR := $(SPIRV_TOOLS_DIR)/external/spirv-headers
+
+SPIRV_TOOLS_SOURCES := $(SPIRV_TOOLS_SOURCE) $(SPIRV_HEADERS_SOURCE)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/spirv-tools.extract:
+ @$(call targetinfo)
+ @$(call clean, $(SPIRV_TOOLS_DIR))
+ @$(call extract, SPIRV_TOOLS)
+ @$(call extract, SPIRV_HEADERS)
+ @$(call patchin, SPIRV_TOOLS)
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+SPIRV_TOOLS_CONF_TOOL := cmake
+SPIRV_TOOLS_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DSPIRV_ALLOW_TIMERS=ON \
+ -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
+ -DSPIRV_WERROR=OFF \
+ -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_COLOR_TERMINAL=ON \
+ -DSPIRV_LOG_DEBUG=OFF \
+ -DSPIRV_SKIP_EXECUTABLES=ON \
+ -DSPIRV_SKIP_TESTS=ON
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/spirv-tools.install:
+ @$(call targetinfo)
+ @install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools.a
+ @install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/opt/libSPIRV-Tools-opt.a $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-opt.a
+ @install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools-shared.so $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-shared.so
+ @mkdir -p $(SPIRV_TOOLS_PKGDIR)/usr/include
+ @cp -r $(SPIRV_TOOLS_DIR)/include/spirv-tools $(SPIRV_TOOLS_PKGDIR)/usr/include
+ $(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/spirv-tools.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, spirv-tools)
+ @$(call install_fixup, spirv-tools, PRIORITY, optional)
+ @$(call install_fixup, spirv-tools, SECTION, base)
+ @$(call install_fixup, spirv-tools, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
+ @$(call install_fixup, spirv-tools, DESCRIPTION, SPIR-V Tools)
+
+ifdef PTXCONF_SPIRV_TOOLS_LIB
+ @$(call install_lib, spirv-tools, 0, 0, 0644, libSPIRV-Tools-shared)
+endif
+
+ @$(call install_finish, spirv-tools)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH v2 7/7] vulkan-validationlayers: new package
2020-01-17 10:00 [ptxdist] [PATCH v2 1/7] vulkan-loader: new package Philipp Zabel
` (4 preceding siblings ...)
2020-01-17 10:00 ` [ptxdist] [PATCH v2 6/7] spirv-tools: " Philipp Zabel
@ 2020-01-17 10:00 ` Philipp Zabel
2020-02-02 14:09 ` Michael Olbrich
5 siblings, 1 reply; 9+ messages in thread
From: Philipp Zabel @ 2020-01-17 10:00 UTC (permalink / raw)
To: ptxdist
Add Vulkan standard validation layer package.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
New in v2.
---
rules/vulkan-validationlayers.in | 22 ++++++++++
rules/vulkan-validationlayers.make | 66 ++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+)
create mode 100644 rules/vulkan-validationlayers.in
create mode 100644 rules/vulkan-validationlayers.make
diff --git a/rules/vulkan-validationlayers.in b/rules/vulkan-validationlayers.in
new file mode 100644
index 000000000000..f7eb3e9f68b7
--- /dev/null
+++ b/rules/vulkan-validationlayers.in
@@ -0,0 +1,22 @@
+## SECTION=multimedia_libs
+
+config VULKAN_VALIDATIONLAYERS
+ tristate
+ prompt "vulkan-validationlayers"
+ select HOST_CMAKE
+ select HOST_GLSLANG
+ select VULKAN_LOADER
+ select GLSLANG if BUILDTIME
+ select SPIRV_TOOLS if BUILDTIME
+ select LIBXCB if VULKAN_VALIDATIONLAYERS_XCB
+ select WAYLAND if VULKAN_VALIDATIONLAYERS_WAYLAND
+ help
+ Vulkan Validation Layers
+
+config VULKAN_VALIDATIONLAYERS_XCB
+ bool
+ default y if VULKAN_LOADER_XCB
+
+config VULKAN_VALIDATIONLAYERS_WAYLAND
+ bool
+ default y if VULKAN_LOADER_WAYLAND
diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
new file mode 100644
index 000000000000..0432ca0a850e
--- /dev/null
+++ b/rules/vulkan-validationlayers.make
@@ -0,0 +1,66 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
+
+#
+# Paths and names
+#
+VULKAN_VALIDATIONLAYERS_VERSION := 1.1.130
+VULKAN_VALIDATIONLAYERS_MD5 := 25c9a2c34457ecf81c248e34c02ad983
+VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
+VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
+VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).0.$(VULKAN_VALIDATIONLAYERS_SUFFIX)
+VULKAN_VALIDATIONLAYERS_SOURCE := $(SRCDIR)/$(VULKAN_VALIDATIONLAYERS).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
+VULKAN_VALIDATIONLAYERS_DIR := $(BUILDDIR)/$(VULKAN_VALIDATIONLAYERS)
+VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0
+VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake
+VULKAN_VALIDATIONLAYERS_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DBUILD_LAYERS=ON \
+ -DBUILD_LAYER_SUPPORT_FILES=OFF \
+ -DBUILD_TESTS=OFF \
+ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
+ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \
+ -DBUILD_WSI_XLIB_SUPPORT=OFF \
+ -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/vulkan-validationlayers.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, vulkan-validationlayers)
+ @$(call install_fixup, vulkan-validationlayers, PRIORITY, optional)
+ @$(call install_fixup, vulkan-validationlayers, SECTION, base)
+ @$(call install_fixup, vulkan-validationlayers, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
+ @$(call install_fixup, vulkan-validationlayers, DESCRIPTION, Vulkan Validation Layers)
+
+ @$(call install_lib, vulkan-validationlayers, 0, 0, 0644, libVkLayer_khronos_validation)
+
+ @$(call install_copy, vulkan-validationlayers, 0, 0, 0644, -, /usr/share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json)
+ @$(call install_copy, vulkan-validationlayers, 0, 0, 0644, -, /usr/share/vulkan/explicit_layer.d/VkLayer_standard_validation.json)
+
+ @$(call install_finish, vulkan-validationlayers)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [ptxdist] [PATCH v2 7/7] vulkan-validationlayers: new package
2020-01-17 10:00 ` [ptxdist] [PATCH v2 7/7] vulkan-validationlayers: " Philipp Zabel
@ 2020-02-02 14:09 ` Michael Olbrich
0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2020-02-02 14:09 UTC (permalink / raw)
To: ptxdist
On Fri, Jan 17, 2020 at 11:00:55AM +0100, Philipp Zabel wrote:
> Add Vulkan standard validation layer package.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> New in v2.
> ---
> rules/vulkan-validationlayers.in | 22 ++++++++++
> rules/vulkan-validationlayers.make | 66 ++++++++++++++++++++++++++++++
> 2 files changed, 88 insertions(+)
> create mode 100644 rules/vulkan-validationlayers.in
> create mode 100644 rules/vulkan-validationlayers.make
>
> diff --git a/rules/vulkan-validationlayers.in b/rules/vulkan-validationlayers.in
> new file mode 100644
> index 000000000000..f7eb3e9f68b7
> --- /dev/null
> +++ b/rules/vulkan-validationlayers.in
> @@ -0,0 +1,22 @@
> +## SECTION=multimedia_libs
> +
> +config VULKAN_VALIDATIONLAYERS
> + tristate
> + prompt "vulkan-validationlayers"
> + select HOST_CMAKE
> + select HOST_GLSLANG
HOST_GLSLANG missing.
Michael
> + select VULKAN_LOADER
> + select GLSLANG if BUILDTIME
> + select SPIRV_TOOLS if BUILDTIME
> + select LIBXCB if VULKAN_VALIDATIONLAYERS_XCB
> + select WAYLAND if VULKAN_VALIDATIONLAYERS_WAYLAND
> + help
> + Vulkan Validation Layers
> +
> +config VULKAN_VALIDATIONLAYERS_XCB
> + bool
> + default y if VULKAN_LOADER_XCB
> +
> +config VULKAN_VALIDATIONLAYERS_WAYLAND
> + bool
> + default y if VULKAN_LOADER_WAYLAND
> diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make
> new file mode 100644
> index 000000000000..0432ca0a850e
> --- /dev/null
> +++ b/rules/vulkan-validationlayers.make
> @@ -0,0 +1,66 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Philipp Zabel <p.zabel@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += vulkan-validationlayers
> +
> +#
> +# Paths and names
> +#
> +VULKAN_VALIDATIONLAYERS_VERSION := 1.1.130
> +VULKAN_VALIDATIONLAYERS_MD5 := 25c9a2c34457ecf81c248e34c02ad983
> +VULKAN_VALIDATIONLAYERS := vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION)
> +VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz
> +VULKAN_VALIDATIONLAYERS_URL := https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).0.$(VULKAN_VALIDATIONLAYERS_SUFFIX)
> +VULKAN_VALIDATIONLAYERS_SOURCE := $(SRCDIR)/$(VULKAN_VALIDATIONLAYERS).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
> +VULKAN_VALIDATIONLAYERS_DIR := $(BUILDDIR)/$(VULKAN_VALIDATIONLAYERS)
> +VULKAN_VALIDATIONLAYERS_LICENSE := Apache-2.0
> +VULKAN_VALIDATIONLAYERS_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake
> +VULKAN_VALIDATIONLAYERS_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DCMAKE_BUILD_TYPE=Release \
> + -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> + -DBUILD_LAYERS=ON \
> + -DBUILD_LAYER_SUPPORT_FILES=OFF \
> + -DBUILD_TESTS=OFF \
> + -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
> + -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \
> + -DBUILD_WSI_XLIB_SUPPORT=OFF \
> + -DGLSLANG_INSTALL_DIR=$(PTXDIST_SYSROOT_HOST)/bin
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/vulkan-validationlayers.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, vulkan-validationlayers)
> + @$(call install_fixup, vulkan-validationlayers, PRIORITY, optional)
> + @$(call install_fixup, vulkan-validationlayers, SECTION, base)
> + @$(call install_fixup, vulkan-validationlayers, AUTHOR, "Philipp Zabel <p.zabel@pengutronix.de>")
> + @$(call install_fixup, vulkan-validationlayers, DESCRIPTION, Vulkan Validation Layers)
> +
> + @$(call install_lib, vulkan-validationlayers, 0, 0, 0644, libVkLayer_khronos_validation)
> +
> + @$(call install_copy, vulkan-validationlayers, 0, 0, 0644, -, /usr/share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json)
> + @$(call install_copy, vulkan-validationlayers, 0, 0, 0644, -, /usr/share/vulkan/explicit_layer.d/VkLayer_standard_validation.json)
> +
> + @$(call install_finish, vulkan-validationlayers)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 9+ messages in thread