[Mesa-dev] [PATCH 1/2] Unify OpenGL and OpenCL version string suffix

[Brian Paul]

On 05/23/2016 03:20 AM, Emil Velikov wrote:
> Hi Giuseppe,
>
> On 23 May 2016 at 08:21, Giuseppe Bilotta <giuseppe.bilotta at gmail.com> 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 <giuseppe.bilotta at gmail.com>
>> ---
>>   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 ?)

Yeah, I think we need to do something like that.  We'd like to include 
the git_sha1.h file in our VMware gallium driver and it feels wrong to 
include from src/mesa/main/.

-Brian


> 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
> mesa-dev at lists.freedesktop.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.freedesktop.org_mailman_listinfo_mesa-2Ddev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=o3f19nrwt2gXHSuHYY5SB5BsY3hopkwx75Z2X-Xv29s&s=QSrPjqtMuhYEu9Pfq1V2N23hTffls81w0I_fUg8pS_w&e=
>