glapi: drop dispatch.hglapi-sync

22 files changed, 17 insertions, 58 deletions

diff --git a/glx/glapi/dispatch.h b/glx/glapi/dispatch.h
deleted file mode 100644
index 27f80a506..000000000
--- a/glx/glapi/dispatch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _DISPATCH_H
-#define _DISPATCH_H
-
-#ifdef IN_DRI_DRIVER
-#define _GLAPI_USE_REMAP_TABLE
-#endif
-
-#include "glapi/glapitable.h"
-#include "glapi/glapioffsets.h"
-#include "glapi/glapidispatch.h"
-
-#endif /* _DISPATCH_H */
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 77afbf4b1..68dc0567d 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -44,9 +44,9 @@
 #include "glxutil.h"
 #include "glxext.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index f1c0ce69f..a3fff462d 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -44,7 +44,6 @@
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 21e44d12d..f16c8cd54 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -57,9 +57,9 @@
 
 #include "g_disptab.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "extension_string.h"
 
 typedef struct __GLXDRIscreen   __GLXDRIscreen;
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index edd29b0e1..d8a668766 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -52,7 +52,6 @@
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "extension_string.h"
 
 typedef struct __GLXDRIscreen   __GLXDRIscreen;
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index c647d83ca..849d5112b 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -52,7 +52,6 @@
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "extension_string.h"
 
 /* RTLD_LOCAL is not defined on Cygwin */
diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index d3a10458c..38ca20901 100644
--- a/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
@@ -39,7 +39,7 @@
 #include "glapi.h"
 #include "glapitable.h"
 #include "glthread.h"
-#include "dispatch.h"
+#include "glapidispatch.h"
 
 #define __GLX_PAD(x)  (((x) + 3) & ~3)
 
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index ab80e22d6..7a8085350 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -39,7 +39,7 @@
 #include "glapi.h"
 #include "glapitable.h"
 #include "glthread.h"
-#include "dispatch.h"
+#include "glapidispatch.h"
 
 #define __GLX_PAD(x)  (((x) + 3) & ~3)
 
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index 237da2908..ca0bb75ce 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -43,8 +43,8 @@
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "glapioffsets.h"
+#include "glapidispatch.h"
 
 static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc,
     unsigned get_programiv_offset, unsigned get_program_string_offset,
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 5f44d7b1a..f357a7856 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -35,9 +35,9 @@
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte *pc)
 {
diff --git a/glx/indirect_util.c b/glx/indirect_util.c
index 44309104e..29a19535b 100644
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@@ -40,9 +40,9 @@
 #include "glxbyteorder.h"
 #include "singlesize.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "glxext.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
diff --git a/glx/render2.c b/glx/render2.c
index eb7c30ba0..e09cde424 100644
--- a/glx/render2.c
+++ b/glx/render2.c
@@ -37,9 +37,9 @@
 #include "indirect_size.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 
 void __glXDisp_Map1f(GLbyte *pc)
diff --git a/glx/render2swap.c b/glx/render2swap.c
index 17354c4f8..1f60a5e9b 100644
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@@ -37,9 +37,9 @@
 #include "indirect_size.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 
 void __glXDispSwap_Map1f(GLbyte *pc)
diff --git a/glx/renderpix.c b/glx/renderpix.c
index 056e62c87..a823a58ff 100644
--- a/glx/renderpix.c
+++ b/glx/renderpix.c
@@ -36,9 +36,9 @@
 #include "unpack.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 void __glXDisp_SeparableFilter2D(GLbyte *pc)
 {
diff --git a/glx/renderpixswap.c b/glx/renderpixswap.c
index 9cd57410e..fa78d1295 100644
--- a/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
@@ -36,9 +36,9 @@
 #include "unpack.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 void __glXDispSwap_SeparableFilter2D(GLbyte *pc)
 {
diff --git a/glx/single2.c b/glx/single2.c
index 50a59ed71..9998a3efc 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -42,9 +42,9 @@
 #include "indirect_dispatch.h"
 #include "unpack.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
diff --git a/glx/single2swap.c b/glx/single2swap.c
index cf83bdc88..9a582d3bf 100644
--- a/glx/single2swap.c
+++ b/glx/single2swap.c
@@ -38,9 +38,9 @@
 #include "indirect_dispatch.h"
 #include "unpack.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
diff --git a/glx/singlepix.c b/glx/singlepix.c
index a0a6a7918..0dc753b52 100644
--- a/glx/singlepix.c
+++ b/glx/singlepix.c
@@ -39,9 +39,9 @@
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {
diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c
index a7febc9a6..db02271ab 100644
--- a/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
@@ -39,9 +39,9 @@
 #include "indirect_dispatch.h"
 #include "indirect_size_get.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
 {
diff --git a/glx/singlesize.c b/glx/singlesize.c
index 9e95dd3d3..575198e2c 100644
--- a/glx/singlesize.c
+++ b/glx/singlesize.c
@@ -37,9 +37,9 @@
 #include "singlesize.h"
 #include "indirect_size_get.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 
 /*
 ** These routines compute the size of variable-size returned parameters.
diff --git a/glx/swap_interval.c b/glx/swap_interval.c
index 0bae3247e..999e532f9 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@@ -36,7 +36,6 @@
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "glapioffsets.h"
 #include "glxbyteorder.h"
 
diff --git a/glx/xfont.c b/glx/xfont.c
index b8b466d87..ca11bdc43 100644
--- a/glx/xfont.c
+++ b/glx/xfont.c
@@ -37,9 +37,9 @@
 #include "unpack.h"
 #include "g_disptab.h"
 #include "glapitable.h"
+#include "glapidispatch.h"
 #include "glapi.h"
 #include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include <GL/gl.h>
 #include <pixmapstr.h>