[PATCH] Make the morphologies of Mesa generic. - baserock-dev - listmaster.pepperfish.net

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[PATCH] Make the morphologies of Mesa generic.

DRAFT: Baserock 14.24 Release Notes

[PATCH 1/2] Consolidate X...

Pedro Alvarez

Friday, 4 April 2014 Fri, 4 Apr '14

5:25 a.m.

Repo: upstream:mesa Branch: baserock/genivi/morph-generic Sha1: d880498b44107e847a5da94b37a61b60fb0db446 With this change, the mesa chunk morphology will be generic for armv7 and x86. As a consecuence can drop one of the following strata morphologies: - wayland-armv7-versatile.morph - wayland-x86_64-versatile.morph Pedro Alvarez (1): Make the morphologies genieric. mesa-wayland.morph | 2 +- mesa-x.morph | 2 +- morph-arch-config | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 morph-arch-config -- 1.7.10.4

Reply

Show replies by date

Pedro Alvarez

Friday, 4 April Fri, 4 Apr

5:25 a.m.

New subject: [PATCH] Make the morphologies genieric.

This is possible adding a script "morph-arch-config" which decides the configuration depending on the architecture. --- mesa-wayland.morph | 2 +- mesa-x.morph | 2 +- morph-arch-config | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 morph-arch-config diff --git a/mesa-wayland.morph b/mesa-wayland.morph index 545e4b1..e4f46d3 100644 --- a/mesa-wayland.morph +++ b/mesa-wayland.morph @@ -3,6 +3,6 @@ "kind": "chunk", "build-system": "autotools", "configure-commands": [ - "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast" + "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)" ] } diff --git a/mesa-x.morph b/mesa-x.morph index 7dc5763..6346577 100644 --- a/mesa-x.morph +++ b/mesa-x.morph @@ -3,6 +3,6 @@ "kind": "chunk", "build-system": "autotools", "configure-commands": [ - "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast" + "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)" ] } diff --git a/morph-arch-config b/morph-arch-config new file mode 100644 index 0000000..d8e60ac --- /dev/null +++ b/morph-arch-config @@ -0,0 +1,10 @@ +#!/bin/sh + +# morph-arch-config: ouput MESA-specific configuration for specific +# Morph architectures + +# Morph's armv7* architecture is always armv7-a +case "$MORPH_ARCH" in + armv7*) echo "--with-dri-drivers=swrast" ;; + x86*) echo "--with-dri-drivers=intel,i915,i965,swrast" ;; +esac -- 1.7.10.4

Reply

Richard Maw

6:16 a.m.

New subject: [PATCH] Make the morphologies genieric.

On Fri, Apr 04, 2014 at 10:25:29AM +0100, Pedro Alvarez wrote:

This is possible adding a script "morph-arch-config" which decides the configuration depending on the architecture. --- mesa-wayland.morph | 2 +- mesa-x.morph | 2 +- morph-arch-config | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 morph-arch-config diff --git a/mesa-wayland.morph b/mesa-wayland.morph index 545e4b1..e4f46d3 100644 --- a/mesa-wayland.morph +++ b/mesa-wayland.morph @@ -3,6 +3,6 @@ "kind": "chunk", "build-system": "autotools", "configure-commands": [ - "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast" + "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)" ] } diff --git a/mesa-x.morph b/mesa-x.morph index 7dc5763..6346577 100644 --- a/mesa-x.morph +++ b/mesa-x.morph @@ -3,6 +3,6 @@ "kind": "chunk", "build-system": "autotools", "configure-commands": [ - "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast" + "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast $(./morph-arch-config)" ] } diff --git a/morph-arch-config b/morph-arch-config new file mode 100644

Are you sure this works? It doesn't appear to have the executable bit set.

index 0000000..d8e60ac --- /dev/null +++ b/morph-arch-config @@ -0,0 +1,10 @@ +#!/bin/sh + +# morph-arch-config: ouput MESA-specific configuration for specific +# Morph architectures + +# Morph's armv7* architecture is always armv7-a +case "$MORPH_ARCH" in + armv7*) echo "--with-dri-drivers=swrast" ;; + x86*) echo "--with-dri-drivers=intel,i915,i965,swrast" ;; +esac

I like the deduplication of strata possible by doing this, I'm just a little concerned about adding new files to the repository, since we're aiming to reduce our number of branches by moving the morphologies into the definitions repository, and adding a script means we would still need to keep the branch around. While I would normally applaud reducing redundancy like this, I think in this case it would be more useful to convert the morphology to yaml, and work out the arch-config flags before running the command, putting the result in a handy variable, then running the autogen command and interpolating it in.

Reply

Michael Drake

Thursday, 12 June Thu, 12 Jun

10:51 a.m.

New subject: [PATCH] Make the morphologies genieric.

On 04/04/14 11:16, Richard Maw wrote:

I like the deduplication of strata possible by doing this, I'm just a little concerned about adding new files to the repository, since we're aiming to reduce our number of branches by moving the morphologies into the definitions repository, and adding a script means we would still need to keep the branch around.

This has been discussed on #baserock today, since the X consolidation work depends on fixing this. Emmet Hikory proposed doing something like the attached. This logic would need to be duplicated in both the mesa-wayland.morph and mesa-x.morph files present on the baserock/genivi/morph branch. -- Michael Drake http://www.codethink.co.uk/

Reply

Richard Maw

Friday, 4 April Fri, 4 Apr

6:18 a.m.

On Fri, Apr 04, 2014 at 10:25:28AM +0100, Pedro Alvarez wrote:

Repo: upstream:mesa Branch: baserock/genivi/morph-generic Sha1: d880498b44107e847a5da94b37a61b60fb0db446 With this change, the mesa chunk morphology will be generic for armv7 and x86. As a consecuence can drop one of the following strata morphologies: - wayland-armv7-versatile.morph - wayland-x86_64-versatile.morph

I'm not sure how to respond to this one, your current approach will cause a bit more pain when we move chunk morphologies to the definitions repository, but it's a better approach for the current design of morph and we need to make a bunch of changes for this anyway. So, I'm going to give you a +1 and let you decide.

Reply

2942

days inactive

3011

days old

baserock-dev@baserock.org

Manage subscription

4 comments

3 participants

tags (0)

participants (3)

Michael Drake
Pedro Alvarez
Richard Maw