osmesa: Include generated headers without path

This makes things much easier to ensure correctness with meson. Tested
with make dist-check and with meson.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 2c8d4668b1b236ebf2014dfd86fa4428131da35d..3c7def5c5c92287a4474bad34269fec1beb5fb3a 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -30,6 +30,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_builddir)/src/mapi \
        -I$(top_srcdir)/src/mapi \
+       -I$(top_builddir)/src/mapi/glapi \
+       -I$(top_srcdir)/src/mapi/glapi \
        -I$(top_srcdir)/src/mesa/ \
        $(DEFINES)
 AM_CFLAGS = $(PTHREAD_CFLAGS) \

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 734a4e891cbbb1f5d25bc735b6c471fcc755aa0f..72bff3da2c64d9a1801c864f005228e191e85a18 100644 (file)
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1291,7 +1291,7 @@ OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "glapi/glapi.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
 
 #if defined(USE_MGL_NAMESPACE)
 #define NAME(func)  mgl##func
@@ -1307,6 +1307,6 @@ OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
 
 /* skip normal ones */
 #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
 
 #endif /* GLX_INDIRECT_RENDERING */