diff mbox series

[meta-arago,master/kirkstone,1/6] arago.conf: drop the explicit removal of x11, add vulkan

Message ID 20230426213214.3501230-2-rs@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series Vulkan prep and some cleanup | expand

Commit Message

Randolph Sapp April 26, 2023, 9:32 p.m. UTC
From: Randolph Sapp <rs@ti.com>

Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime
dependencies on libx11.

Add vulkan as a distro feature.

Signed-off-by: Randolph Sapp <rs@ti.com>
---
 meta-arago-distro/conf/distro/arago.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Andrew Davis April 26, 2023, 11:17 p.m. UTC | #1
On 4/26/23 4:32 PM, rs@ti.com wrote:
> From: Randolph Sapp <rs@ti.com>
> 
> Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime
> dependencies on libx11.
> 
> Add vulkan as a distro feature.
> 
> Signed-off-by: Randolph Sapp <rs@ti.com>
> ---
>   meta-arago-distro/conf/distro/arago.conf | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
> index 094e67da..58841051 100644
> --- a/meta-arago-distro/conf/distro/arago.conf
> +++ b/meta-arago-distro/conf/distro/arago.conf
> @@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}"
>   # Start with default set of distro features
>   DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
>   
> -# Remove some unwanted features
> -DISTRO_FEATURES:remove = "x11"

This is probably fine, but to get it to work on our SGX platforms
I also needed:

PACKAGECONFIG:remove:pn-xserver-xorg = "dri3"
PACKAGECONFIG:remove:pn-xserver-xorg = "xshmfence"
PACKAGECONFIG:remove:pn-xserver-xorg = "glx"
PACKAGECONFIG:remove:pn-cairo = "opengl"
PACKAGECONFIG:remove:pn-libepoxy = "x11"
PACKAGECONFIG:remove:pn-mesa-demos = "gbm"
PACKAGECONFIG:remove:pn-mesa-demos = "wayland"
PACKAGECONFIG:remove:pn-mesa-demos = "glew"
PACKAGECONFIG:remove:pn-mesa-demos = "glu"

To prevent any of these trying to build against desktop OpenGL or GLESv3.

> -
>   # Add additional distro features
>   DISTRO_FEATURES:append = " pam wayland opengl"
>   #DISTRO_FEATURES:append = " opencl"
> +DISTRO_FEATURES:append = " vulkan"

You going to add Vulkan support to SGX? You do remember we have
to turn that back on at some point...

Ideally, like "opengl", these should become machine features, not distro.

Andrew

>   DISTRO_FEATURES:append = " opencv"
>   DISTRO_FEATURES:append = " openmp"
>
Randolph Sapp April 27, 2023, 4:18 p.m. UTC | #2
On 4/26/23 18:17, Andrew Davis wrote:
> On 4/26/23 4:32 PM, rs@ti.com wrote:
>> From: Randolph Sapp <rs@ti.com>
>>
>> Drop the explicit removal of x11 as the new PVR Vulkan libs have runtime
>> dependencies on libx11.
>>
>> Add vulkan as a distro feature.
>>
>> Signed-off-by: Randolph Sapp <rs@ti.com>
>> ---
>>   meta-arago-distro/conf/distro/arago.conf | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/meta-arago-distro/conf/distro/arago.conf 
>> b/meta-arago-distro/conf/distro/arago.conf
>> index 094e67da..58841051 100644
>> --- a/meta-arago-distro/conf/distro/arago.conf
>> +++ b/meta-arago-distro/conf/distro/arago.conf
>> @@ -45,12 +45,10 @@ TMPDIR .= "${TCMODEAPPEND}"
>>   # Start with default set of distro features
>>   DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
>> -# Remove some unwanted features
>> -DISTRO_FEATURES:remove = "x11"
> 
> This is probably fine, but to get it to work on our SGX platforms
> I also needed:
> 
> PACKAGECONFIG:remove:pn-xserver-xorg = "dri3"
> PACKAGECONFIG:remove:pn-xserver-xorg = "xshmfence"
> PACKAGECONFIG:remove:pn-xserver-xorg = "glx"
> PACKAGECONFIG:remove:pn-cairo = "opengl"
> PACKAGECONFIG:remove:pn-libepoxy = "x11"
> PACKAGECONFIG:remove:pn-mesa-demos = "gbm"
> PACKAGECONFIG:remove:pn-mesa-demos = "wayland"
> PACKAGECONFIG:remove:pn-mesa-demos = "glew"
> PACKAGECONFIG:remove:pn-mesa-demos = "glu"
> 
> To prevent any of these trying to build against desktop OpenGL or GLESv3.
> 
>> -
>>   # Add additional distro features
>>   DISTRO_FEATURES:append = " pam wayland opengl"
>>   #DISTRO_FEATURES:append = " opencl"
>> +DISTRO_FEATURES:append = " vulkan"
> 
> You going to add Vulkan support to SGX? You do remember we have
> to turn that back on at some point...
> 
> Ideally, like "opengl", these should become machine features, not distro.
> 
> Andrew
> 
>>   DISTRO_FEATURES:append = " opencv"
>>   DISTRO_FEATURES:append = " openmp"

Invalid arg. Enabling vulkan doesn't have the same effect is enabling 
opengl. It changes compilation flags but right now all userspace tools 
that we care about are capable of switching backends at runtime. SGX 
doesn't have a vulkan driver so it should fail-over to gl automatically.
diff mbox series

Patch

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 094e67da..58841051 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -45,12 +45,10 @@  TMPDIR .= "${TCMODEAPPEND}"
 # Start with default set of distro features
 DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
 
-# Remove some unwanted features
-DISTRO_FEATURES:remove = "x11"
-
 # Add additional distro features
 DISTRO_FEATURES:append = " pam wayland opengl"
 #DISTRO_FEATURES:append = " opencl"
+DISTRO_FEATURES:append = " vulkan"
 DISTRO_FEATURES:append = " opencv"
 DISTRO_FEATURES:append = " openmp"