Hi Giuseppe, On 23 May 2016 at 08:21, Giuseppe Bilotta <[email protected]> wrote: > Refactor the "Mesa " PACKAGE_VERSION [optional git SHA1] string into a > separate version_string.h header, and use it from both Mesa and clover > to report the Mesa version in both the OpenGL (resp. OpenCL) > implementation-specific version string suffix. > > This changes the reported OpenCL version string suffix from MESA to > Mesa, and adds the previously missing git SHA1. > > Signed-off-by: Giuseppe Bilotta <[email protected]> > --- > src/gallium/state_trackers/clover/api/device.cpp | 3 +- > src/gallium/state_trackers/clover/api/platform.cpp | 3 +- > src/mesa/main/version.c | 8 ++--- > src/mesa/main/version_string.h | 34 > ++++++++++++++++++++++ > 4 files changed, 40 insertions(+), 8 deletions(-) > create mode 100644 src/mesa/main/version_string.h > > diff --git a/src/gallium/state_trackers/clover/api/device.cpp > b/src/gallium/state_trackers/clover/api/device.cpp > index bc93f91..1c0ee76 100644 > --- a/src/gallium/state_trackers/clover/api/device.cpp > +++ b/src/gallium/state_trackers/clover/api/device.cpp > @@ -23,6 +23,7 @@ > #include "api/util.hpp" > #include "core/platform.hpp" > #include "core/device.hpp" > +#include "mesa/main/version_string.h" > It seems like this won't work if one builds --enable-clover --disable-dri.
The following should keep mesa and gallium code separate, can we try that one ? - move the git_sha1.h rule 'higher up' (src/Makefile.am perhaps ?) Please try and do the same for scons/android. - I'm split if we should have a single file or multiple or mesa and gallium 'flavours' in respective folders. - introduce a st/clover header (please add it in the sources lists in Makefile.sources) which is included in the respective places. - wire up the LLVM version/string in src/mesa (using HAVE_LLVM & MESA_LLVM_VERSION_PATCH) - ^^ for st/clover. - print the LLVM version for r300 (based on r600_common_screen_init) How does this sound ? The way I see if the first two should be single patch (or a patch per build system) while the rest ought to be separate ones. Thanks Emil _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
