diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-21 17:13:42 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-21 17:48:38 +0800 |
| commit | bdd250080593c6d0d5addcaff0b2a5c880d7a3b2 (patch) | |
| tree | 03c124a9834332d76c5bb20c0189997e82ab8bb9 | |
| parent | 1af67195b31f66c725293c916b794fbdb633aec9 (diff) | |
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.
| -rw-r--r-- | src/gallium/winsys/xlib/xlib.c | 3 | ||||
| -rw-r--r-- | src/glx/x11/indirect.c | 3 | ||||
| -rw-r--r-- | src/glx/x11/single2.c | 3 | ||||
| -rw-r--r-- | src/glx/x11/singlepix.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 3 | ||||
| -rw-r--r-- | src/mesa/glapi/Makefile | 1 |
6 files changed, 10 insertions, 6 deletions
diff --git a/src/gallium/winsys/xlib/xlib.c b/src/gallium/winsys/xlib/xlib.c index 541ea7ae35..67617a470d 100644 --- 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 262637a947..48bae1478f 100644 --- 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 d128ba2053..9ecf589fff 100644 --- 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 fa12ac3bbc..f5ebf4dfdb 100644 --- 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 5c7e8eb90c..e11aff1a84 100644 --- 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 4db0ff1425..846c041cde 100644 --- 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 \ |