Do not include glapi/dispatch.h outside Mesa core.

Include the glapi*.h directly instead.  glapi/dispatch.h became a Mesa
core header since 22884db174b9fb0736cec1c6a192f8b9a97500c1.

diff --git a/src/gallium/winsys/xlib/xlib.c b/src/gallium/winsys/xlib/xlib.c
index 541ea7ae352d5d90186eecebb3c4dcd97d4b632a..67617a470d632dbce7827a8941c897d19c4ed9e3 100644 (file)
--- a/src/gallium/winsys/xlib/xlib.c
+++ b/src/gallium/winsys/xlib/xlib.c
@@ -116,7 +116,8 @@ extern void (*linker_foo(const unsigned char *procName))()
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "glapi/glapi.h"
-#include "glapi/dispatch.h"
+#include "glapi/glapitable.h"
+#include "glapi/glapidispatch.h"
 
 #if defined(USE_MGL_NAMESPACE)
 #define NAME(func)  mgl##func

diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
index 262637a9473399786527367da13e8be33008ac55..48bae1478f4b4e92528bee6ec96bba68c82a9e71 100644 (file)
--- a/src/glx/x11/indirect.c
+++ b/src/glx/x11/indirect.c
@@ -30,7 +30,8 @@
 #include "indirect.h"
 #include "glxclient.h"
 #include "indirect_size.h"
-#include "dispatch.h"
+#include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
 #include <GL/glxproto.h>

diff --git a/src/glx/x11/single2.c b/src/glx/x11/single2.c
index d128ba20537b237fd031fedf8789fec7afe10127..9ecf589ffffa47d658d42aeee39e9549988eb1a1 100644 (file)
--- a/src/glx/x11/single2.c
+++ b/src/glx/x11/single2.c
@@ -35,7 +35,8 @@
 #include "glxextensions.h"
 #include "indirect.h"
 #include "indirect_vertex_array.h"
-#include "dispatch.h"
+#include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #ifdef USE_XCB
 #include <xcb/xcb.h>

diff --git a/src/glx/x11/singlepix.c b/src/glx/x11/singlepix.c
index fa12ac3bbcb71b13fefb6beacfe0a5e2ea918f42..f5ebf4dfdbf7124337f5bf6ce342c7212038fc4b 100644 (file)
--- a/src/glx/x11/singlepix.c
+++ b/src/glx/x11/singlepix.c
@@ -30,7 +30,8 @@
 
 #include "packsingle.h"
 #include "indirect.h"
-#include "dispatch.h"
+#include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
 #include "glapioffsets.h"

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 5c7e8eb90cd460c935f01319e09ee1bb8da15ae4..e11aff1a849beb82cb655c76596d93b07205b59a 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -57,7 +57,8 @@ struct display_dispatch {
  */
 #ifdef GLX_INDIRECT_RENDERING
 
-#include "glapi/dispatch.h"
+#include "glapi/glapitable.h"
+#include "glapi/glapidispatch.h"
 
 #define KEYWORD1 PUBLIC
 

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 4db0ff1425e9079c86eceacb808fb223246787a7..846c041cde1798cad9b8d183cffd93136b1356d4 100644 (file)
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -43,7 +43,6 @@ SERVER_OUTPUTS = \
        $(GLX_DIR)/glapioffsets.h \
        $(GLX_DIR)/glapidispatch.h \
        $(GLX_DIR)/glprocs.h \
-       $(GLX_DIR)/dispatch.h \
        $(SERVER_GLAPI_FILES)
 
 API_XML = gl_API.xml \