scons: Make scons and meson agree about path to glapi generated headers

Currently scons puts them in src/mapi/glapi, meosn puts them in
src/mapi/glapi/gen. This results in some things being compilable only by
one or the other, put them in the same places so that everyone is happy.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

src/gallium/targets/libgl-xlib/SConscript

@@ -11,6 +11,7 @@ env.Append(CPPPATH = [
     '#/src/mesa/main',
     '#src/gallium/state_trackers/glx/xlib',
     Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+    Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers
 ])
 
 env.Append(CPPDEFINES = ['USE_XSHM'])

src/gallium/targets/libgl-xlib/xlib.c

@@ -132,6 +132,6 @@ extern void (*linker_foo(const unsigned char *procName))()
 
 /* skip normal ones */
 #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
 
 #endif /* GLX_INDIRECT_RENDERING */

src/mapi/glapi/SConscript

@@ -27,7 +27,7 @@ env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
     Dir('.'), # src/mapi/glapi build path
-    Dir('..'), # src/mapi build path
+    Dir('gen'), # src/mapi/glapi/gen build path
 ])
 
 glapi_sources = [

src/mapi/glapi/gen/SConscript

@@ -28,7 +28,7 @@ env.CodeGenerate(
     )
 
 env.CodeGenerate(
-    target = '../../../mapi/glapi/glapitemp.h',
+    target = '../../../mapi/glapi/gen/glapitemp.h',
     script = 'gl_apitemp.py',
     source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'

src/mapi/glapi/glapi_dispatch.c

@@ -175,6 +175,6 @@ GL_API void GL_APIENTRY glPrimitiveBoundingBox (GLfloat minX, GLfloat minY, GLfl
 #  endif
 #endif
 
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
 
 #endif /* USE_X86_ASM */

src/mesa/drivers/osmesa/SConscript

@@ -8,6 +8,7 @@ env.Prepend(CPPPATH = [
     '#src/mesa',
     Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
     Dir('../../../mapi/glapi'), # src/mapi/glapi build path
+    Dir('../../../mapi/glapi/gen'), # src/mapi/glapi build path
 ])
 
 env.Prepend(LIBS = [

src/mesa/drivers/x11/SConscript

@@ -8,6 +8,7 @@ env.Append(CPPPATH = [
     '#/src/mesa',
     '#/src/mesa/main',
     Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
+    Dir('../../../mapi/glapi/gen'), # src/mapi/glapi/gen build path for python-generated GL API files/headers
 ])
 
 env.Append(CPPDEFINES = ['USE_XSHM'])

src/mesa/drivers/x11/glxapi.c

@@ -73,7 +73,7 @@ struct display_dispatch {
 
 /* skip normal ones */
 #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
 
 #endif /* GLX_INDIRECT_RENDERING */