[Mesa-dev] [PATCH] egl: more define fixes for EGL_MESA_image_dma_buf_export

[Emil Velikov]

On 11 May 2015 at 20:07, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 11 May 2015 at 14:23, Marc-André Lureau <marcandre.lureau at gmail.com> wrote:
>> s/EGL_MESA_dma_buf_image_export/EGL_MESA_image_dma_buf_export as defined by the spec
>> ---
>>  src/egl/main/eglapi.c       | 2 +-
>>  src/egl/main/eglfallbacks.c | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
>> index ba1d0dd..6d2b51d 100644
>> --- a/src/egl/main/eglapi.c
>> +++ b/src/egl/main/eglapi.c
>> @@ -1245,7 +1245,7 @@ eglGetProcAddress(const char *procname)
>>        { "eglCreatePlatformWindowSurfaceEXT", (_EGLProc) eglCreatePlatformWindowSurfaceEXT },
>>        { "eglCreatePlatformPixmapSurfaceEXT", (_EGLProc) eglCreatePlatformPixmapSurfaceEXT },
>>        { "eglGetSyncValuesCHROMIUM", (_EGLProc) eglGetSyncValuesCHROMIUM },
>> -#ifdef EGL_MESA_dma_buf_image_export
>> +#ifdef EGL_MESA_image_dma_buf_export
>>        { "eglExportDMABUFImageQueryMESA", (_EGLProc) eglExportDMABUFImageQueryMESA },
>>        { "eglExportDMABUFImageMESA", (_EGLProc) eglExportDMABUFImageMESA },
>>  #endif
>> diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
>> index 83d7756..ef65d2c 100644
>> --- a/src/egl/main/eglfallbacks.c
>> +++ b/src/egl/main/eglfallbacks.c
>> @@ -120,7 +120,7 @@ _eglInitDriverFallbacks(_EGLDriver *drv)
>>     drv->API.SwapBuffersRegionNOK = NULL;
>>  #endif
>>
>> -#ifdef EGL_MESA_dma_buf_image_export
>> +#ifdef EGL_MESA_image_dma_buf_export
>>     drv->API.ExportDMABUFImageQueryMESA = NULL;
>>     drv->API.ExportDMABUFImageMESA = NULL;
>>  #endif
> Considering how these can go (have been) subtly broken without many
> people realising can we just nuke the #ifdef spaghetti ? I'm
> suspecting that they are present in order to prevent build issues,
> when the compiler picks up the non-mesa headers - egl{,ext}.h.
>
> Wouldn't it be better to coerce the compiler to prioritise the mesa
> headers over the rest ? GCC's -isystem and automake's nostdinc comes
> to mind, but I never had the pleasure to work with either one.
>
^^ is not meant as an objection against the patch (if it ever come
across as such).

-Emil