[Mesa-dev] [PATCH 06/11] loader: Use drirc device_id parameter in complement to DRI_PRIME

[Emil Velikov]

On 28/05/14 14:24, Axel Davy wrote:
> On 28/05/2014 08:40, Emil Velikov wrote :
>> On 28/05/14 01:55, Axel Davy wrote:
>>> Signed-off-by: Axel Davy <axel.davy at ens.fr>
>> Hi Axel
>>
>> Can you give the scons build a try. I suspect that this patch will leave it in
>> somewhat broken state.
> I'll give a try.
>>
>>> ---
>>>   src/Makefile.am                                 |  4 +++-
>>>   src/loader/Makefile.am                          | 21 ++++++++++++++++---
>>>   src/loader/loader.c                             | 27
>>> +++++++++++++++++++++++++
>>>   src/mesa/drivers/dri/common/xmlconfig.h         |  2 ++
>>>   src/mesa/drivers/dri/common/xmlpool/t_options.h | 14 +++++++++++++
>>>   5 files changed, 64 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/src/Makefile.am b/src/Makefile.am
>>> index 9d1580f..d4a7090 100644
>>> --- a/src/Makefile.am
>>> +++ b/src/Makefile.am
>>> @@ -19,12 +19,14 @@
>>>   # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>>> DEALINGS
>>>   # IN THE SOFTWARE.
>>>   -SUBDIRS = gtest loader mapi
>>> +SUBDIRS = gtest mapi
>>>     if NEED_OPENGL_COMMON
>>>   SUBDIRS += glsl mesa
>>>   endif
>>>   +SUBDIRS += loader
>>> +
>>>   if HAVE_DRI_GLX
>>>   SUBDIRS += glx
>>>   endif
>>> diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
>>> index bddf7ac..3503a51 100644
>>> --- a/src/loader/Makefile.am
>>> +++ b/src/loader/Makefile.am
>>> @@ -29,6 +29,23 @@ libloader_la_CPPFLAGS = \
>>>       $(VISIBILITY_CFLAGS) \
>>>       $(LIBUDEV_CFLAGS)
>>>   +libloader_la_SOURCES = $(LOADER_C_FILES)
>>> +libloader_la_LIBADD = $()
>>> +
>> Please drop the "$()"
> What could I use instead to enable to use '+=' after ?
libloader_la_LIBADD =

Pretty much all of mesa uses this approach.

>>
>>> +if NEED_OPENGL_COMMON
>>> +libloader_la_CPPFLAGS += \
>>> +    -I$(top_srcdir)/src/mesa/drivers/dri/common/ \
>> Out of tree builds will fail without
>> -I$(top_builddir)/src/mesa/drivers/dri/common/ \
> Yes it should be that. It's what is done for dri-swrast.
Indeed. xmlpool.h pulls in xmlpool/options.h which is generated at buildtime
from xmlpool/t_options.h

-Emil

>>
>> and possibly similar treatment for the other two
>>> +    -I$(top_srcdir)/src/mesa/ \
>>> +    -I$(top_srcdir)/src/mapi/ \
>>> +    -DUSE_DRICONF
>>> +
>>> +libloader_la_SOURCES += \
>>> +    $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
>>> +
>>> +libloader_la_LIBADD += \
>>> +    -lexpat
>> EXPAT_LIBS might be better.
>>
>>> +#include <GL/gl.h>
>>> +
>> ^^ This is rather ugly, although the GL* types used throughout kind of mandate
>> it :\
> Yes, this would need a series of cleanups to remove all GL* types used in Mesa
> when not neccessary.
> 
> Thanks,
> 
> Axel Davy