[Mesa-dev] [PATCHv2 01/22] gallium/ilo: cleanup intel_winsys.h

[Emil Velikov]

On 19/08/14 10:40, Chia-I Wu wrote:
> On Tue, Aug 19, 2014 at 5:32 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> Make the header location, inclusion and contents more common with
>> its i915,r* and nouveau counterparts:
>>
>>  - Move the header within drivers/ilo.
>>  - Separate out intel_winsys_create_for_fd into 'drm_public' header.
>>  - Cleanup the compiler includes.
>>
>> v2: Move the header to drivers/ilo. Suggested by Chia-I.
>>
>> Cc: Chia-I Wu <olvaffe at gmail.com>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> ---
>>
>> The patch is generated with -M, and likely won't apply as is.
>> It makes it alot easier to read though ;)
>>
>> -Emil
>>
>>  src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 2 +-
>>  src/gallium/drivers/ilo/Android.mk                       | 3 +--
>>  src/gallium/drivers/ilo/Makefile.am                      | 1 -
>>  src/gallium/winsys/intel/drm/Makefile.am                 | 1 +
>>  src/gallium/winsys/intel/drm/intel_drm_public.h          | 8 ++++++++
>>  src/gallium/winsys/intel/drm/intel_drm_winsys.c          | 3 ++-
>>  src/gallium/winsys/intel/{ => drm}/intel_winsys.h        | 3 ---
>>  7 files changed, 13 insertions(+), 8 deletions(-)
>>  create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h
>>  rename src/gallium/winsys/intel/{ => drm}/intel_winsys.h (99%)
>>
[snip]
>> diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
>> index b394e5f..2c8f7b2 100644
>> --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c
>> +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
>> @@ -41,7 +41,8 @@
>>  #include "util/u_inlines.h"
>>  #include "util/u_memory.h"
>>  #include "util/u_debug.h"
>> -#include "../intel_winsys.h"
>> +#include "intel_drm_public.h"
>> +#include "intel/intel_winsys.h"
> Should be ilo/intel_winsys.h?  Otherwise, looks good to me.
> 
Indeed, will amend before pushing later on this week.

Thanks
Emil