[Mesa-dev] [PATCH v3 06/10] swr: Windows-related changes

[Emil Velikov]

On 17 November 2016 at 20:51, Kyriazis, George
<george.kyriazis at intel.com> wrote:
>
>
>> -----Original Message-----
>> From: mesa-dev [mailto:mesa-dev-bounces at lists.freedesktop.org] On
>> Behalf Of Emil Velikov
>> Sent: Thursday, November 17, 2016 11:12 AM
>> To: Kyriazis, George <george.kyriazis at intel.com>
>> Cc: ML mesa-dev <mesa-dev at lists.freedesktop.org>
>> Subject: Re: [Mesa-dev] [PATCH v3 06/10] swr: Windows-related changes
>>
>> Hi George,
>>
>> Seems I was unclear as a few suggestions got missed.
>>
>> On 16 November 2016 at 02:26, George Kyriazis <george.kyriazis at intel.com>
>> wrote:
>> > - Handle dynamic library loading for windows
>> > - Implement swap for gdi
>> > - fix prototypes
>> > - update include paths on configure-based build for swr_loader.cpp
>> > ---
>> >  src/gallium/drivers/swr/Makefile.am    |  7 +++++++
>> >  src/gallium/drivers/swr/swr_loader.cpp | 28
>> +++++++++++++++++++++++++---
>> >  src/gallium/drivers/swr/swr_public.h   | 11 +++++++----
>> >  3 files changed, 39 insertions(+), 7 deletions(-)
>> >
>> > diff --git a/src/gallium/drivers/swr/Makefile.am
>> > b/src/gallium/drivers/swr/Makefile.am
>> > index dd1c2e6..305154f 100644
>> > --- a/src/gallium/drivers/swr/Makefile.am
>> > +++ b/src/gallium/drivers/swr/Makefile.am
>> > @@ -217,6 +217,12 @@ libswrAVX2_la_CXXFLAGS = \
>> libswrAVX2_la_SOURCES
>> > = \
>> >         $(COMMON_SOURCES)
>> >
>> > +# XXX: $(SWR_AVX_CXXFLAGS) should not be included, but we end up
>> > +including # simdintrin.h, which throws a warning if AVX is not
>> > +enabled libmesaswr_la_CXXFLAGS = \
>> > +       $(COMMON_CXXFLAGS) \
>> > +       $(SWR_AVX_CXXFLAGS)
>> > +
>> Drop this.
>>
> This is needed for linux configure-based build.
>
As you can see per your v4 this don't fold true. I would kindly ask
you to compile test (2 minute job) - saves a lot of confusing moments
on each end.


>> > --- a/src/gallium/drivers/swr/swr_loader.cpp
>> > +++ b/src/gallium/drivers/swr/swr_loader.cpp
>>
>> > +#include "swr_screen.h"
>> > +#include "swr_resource.h"
>> > +
>> You only need p_screen.h here. Adding the swr ones is wrong (afaict).
>>
> Ok, replaced.
>
Same goes here - these wrong includes were the reason for extra includes above.

Emil