[Mesa-dev] code de-duplication and non-pci support v2

Rob Clark robdclark at gmail.com
Fri Jan 17 08:06:47 PST 2014


On Thu, Jan 16, 2014 at 6:55 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 16/01/14 23:29, Kristian Høgsberg wrote:
>> On Sat, Jan 11, 2014 at 04:51:42PM -0500, Rob Clark wrote:
>>> On Sat, Jan 11, 2014 at 11:54 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>>>> This is an updated series of Rob's patches
>>>>
>>>> * The introduction of the util library is separated from the
>>>> de-duplication.
>>>> * Each commit targets individual part of mesa and it should
>>>> build/work regardless of build system/options.
>>>> * Handles a couple more cases of de-duplication.
>>>> * Hides the loader funcs so that they are not exported.
>>>> * Building platform_android, will correctly set the logger to
>>>> _eglLog(), which on itself is rapped around Androids (A)LOG.
>>>> * Non-pci devices support has been ripped out and is left at
>>>> the end of the series.
>>>> * automake and scons build tested, Android should after
>>>> correcting the following
>>>> defined(PIPE_OS_ANDROID) && !defined(_EGL_NO_DRM)
>>>
>>> Very cool, thanks for taking this and running with it.  Especially the
>>> other build systems which I have no clue about :-)
>>>
>>> I had a look at the patches, and they look good.  So with the
>>> disclaimer that I am certainly not expert on these parts, for the
>>> series:
>>>
>>> Reviewed-by: Rob Clark <robdclark at gmail.com>
>>
>> I'm not familiar with the other build systems either, but aside for
>> those two issues I pointed out
>>
> Good points Kristian I'll update patches 1 & 2.
>
> I'm suspecting that there will not be many more people interested in
> reviewing/testing the series, so unless someone has anything to add I
> plan on pushing it this Saturday.

cool, thanks Emil.. I look forward to being able to run weston without
needing some out of tree patches :-)

BR,
-R

> Cheers
> Emil
>
>> Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
>>
>> for the series.
>>
>>>> Brief list of which patches affect which build system
>>>> (android A, automake M, scons S)
>>>> patch 1 - A, M, S
>>>> patch 2 - M, S
>>>> patch 3 - M
>>>> patch 4 - A, M, S
>>>> patch 5 - M, S
>>>> patch 6 - M
>>>> patch 7 - A, M
>>>> patch 8 - S
>>>>
>>>> Notes:
>>>> * Eric's comment about moving the driver_name allocation to
>>>> egl_dri2.c does not seem easily achiveable due to platform_x11.
>>>>
>>>> * Keith's patch can be relatively easily rebased on top of this.
>>>>
>>>> * Andoid logging should work via (A)LOG.
>>>>
>>>> Cheers,
>>>> Emil
>>>>
>>>> Emil Velikov (9):
>>>>       loader: introduce the loader util lib
>>>>       glx: use the loader util lib
>>>>       gbm: use the loader util lib
>>>>       egl-static: use loader util lib
>>>>       st/egl: use loader util lib
>>>>       pipe-loader: use loader util lib
>>>>       egl_dri2: use loader util lib
>>>>       pci_ids: no not include loader.h
>>>>       pipe-loader: add support for non-pci (platform) devices
>>>>
>>>> Rob Clark (1):
>>>>       loader: fallback to drmGetVersion() for non-pci devices
>>>>
>>>>  Android.mk                                         |   1 +
>>>>  configure.ac                                       |   1 +
>>>>  include/pci_ids/pci_id_driver_map.h                |  27 +-
>>>>  src/Makefile.am                                    |   2 +-
>>>>  src/SConscript                                     |   1 +
>>>>  src/egl/drivers/dri2/Android.mk                    |   5 +-
>>>>  src/egl/drivers/dri2/Makefile.am                   |   5 +-
>>>>  src/egl/drivers/dri2/common.c                      | 144 -----------
>>>>  src/egl/drivers/dri2/egl_dri2.h                    |   5 -
>>>>  src/egl/drivers/dri2/platform_android.c            | 107 +-------
>>>>  src/egl/drivers/dri2/platform_drm.c                |   5 +-
>>>>  src/egl/drivers/dri2/platform_wayland.c            |   5 +-
>>>>  src/egl/main/Android.mk                            |   1 +
>>>>  src/gallium/auxiliary/pipe-loader/Makefile.am      |   8 +-
>>>>  src/gallium/auxiliary/pipe-loader/pipe_loader.h    |   1 +
>>>>  .../auxiliary/pipe-loader/pipe_loader_drm.c        |  92 +------
>>>>  src/gallium/state_trackers/clover/core/device.cpp  |   2 +
>>>>  src/gallium/state_trackers/egl/Makefile.am         |   2 +
>>>>  src/gallium/state_trackers/egl/SConscript          |   4 +
>>>>  src/gallium/state_trackers/egl/drm/native_drm.c    |  44 +---
>>>>  .../state_trackers/gbm/gbm_gallium_drmint.h        |   1 -
>>>>  src/gallium/targets/egl-static/Android.mk          |   1 +
>>>>  src/gallium/targets/egl-static/Makefile.am         |   2 +
>>>>  src/gallium/targets/egl-static/SConscript          |   2 +
>>>>  src/gallium/targets/egl-static/egl.c               | 185 +-------------
>>>>  src/gbm/Makefile.am                                |  13 +-
>>>>  src/gbm/backends/dri/driver_name.c                 |  89 -------
>>>>  src/gbm/backends/dri/gbm_dri.c                     |   3 +-
>>>>  src/gbm/backends/dri/gbm_driint.h                  |   4 -
>>>>  src/gbm/main/common.c                              |  88 -------
>>>>  src/gbm/main/common.h                              |  42 ----
>>>>  src/gbm/main/gbm.c                                 |   1 -
>>>>  src/glx/Makefile.am                                |   6 +-
>>>>  src/glx/SConscript                                 |   3 +-
>>>>  src/glx/dri3_common.c                              | 146 -----------
>>>>  src/glx/dri3_glx.c                                 |   3 +-
>>>>  src/glx/dri3_priv.h                                |   3 -
>>>>  src/loader/Android.mk                              |  43 ++++
>>>>  src/loader/Makefile.am                             |  37 +++
>>>>  src/loader/Makefile.sources                        |   2 +
>>>>  src/loader/SConscript                              |  27 ++
>>>>  src/loader/loader.c                                | 276 +++++++++++++++++++++
>>>>  src/loader/loader.h                                |  57 +++++
>>>>  43 files changed, 539 insertions(+), 957 deletions(-)
>>>>
>>>>
>>>> _______________________________________________
>>>> mesa-dev mailing list
>>>> mesa-dev at lists.freedesktop.org
>>>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>> _______________________________________________
>>> mesa-dev mailing list
>>> mesa-dev at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>


More information about the mesa-dev mailing list