[Mesa-dev] [PATCH] gallivm: fix compilation against LLVM r317488

[Samuel Pitoiset]

On 11/08/2017 10:52 AM, Michel Dänzer wrote:
> On 07/11/17 09:20 PM, Tobias Droste wrote:
>> Am Dienstag, 7. November 2017, 11:16:14 CET schrieb Samuel Pitoiset:
>>> On 11/07/2017 11:15 AM, Michel Dänzer wrote:
>>>> On 07/11/17 11:03 AM, Michel Dänzer wrote:
>>>>> On 07/11/17 09:25 AM, Samuel Pitoiset wrote:
>>>>>> The unsafe algebra codepath has been redefined a lot, and
>>>>>> setUnsafeAlgebra() has been replaced with setFast().
>>>>>>
>>>>>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>>>>>> ---
>>>>>>    src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
>>>>>>    1 file changed, 4 insertions(+)
>>>>>>
>>>>>> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
>>>>>> index d988910a7e..1319407290 100644
>>>>>> --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
>>>>>> +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
>>>>>> @@ -830,7 +830,11 @@ lp_create_builder(LLVMContextRef ctx, enum lp_float_mode float_mode)
>>>>>>          llvm::unwrap(builder)->setFastMathFlags(flags);
>>>>>>          break;
>>>>>>       case LP_FLOAT_MODE_UNSAFE_FP_MATH:
>>>>>> +#if HAVE_LLVM >= 0x0600
>>>>>> +      flags.setFast();
>>>>>> +#else
>>>>>>          flags.setUnsafeAlgebra();
>>>>>> +#endif
>>>>>>          llvm::unwrap(builder)->setFastMathFlags(flags);
>>>>>>          break;
>>>>>>       }
>>>>>>
>>>>>
>>>>> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at amd.com>
>>>>
>>>> But note that Tobias Droste already submitted the same patch last night:
>>>>
>>>> https://patchwork.freedesktop.org/patch/186737/
>>>
>>> Ah right.
>>
>> If you want to use my patch, then someone needs to push my patch for me, as I don't have the rights to do so.
> 
> Done, thanks for the fix.
> 
>> But I don't insist on it being chosen as the one that goes in. I'm fine if you just push yours.
> 
> All else being equal, we usually apply the first patch submitted.

Sure, no problem! Thanks for pushing the patch.

> 
>