glapi: Generated GLX sources should use glapidispatch.h.

Fix glX_proto_recv.py and glX_proto_send.py, and regenerate the sources.

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

diff --git a/src/mesa/glapi/gen/glX_proto_recv.py b/src/mesa/glapi/gen/glX_proto_recv.py
index f423c6db08476aa4f97f4758bb2c774b7d202fbe..31745fcef77e54c0d30d27d0d6fcbd49a08de898 100644 (file)
--- a/src/mesa/glapi/gen/glX_proto_recv.py
+++ b/src/mesa/glapi/gen/glX_proto_recv.py
@@ -92,7 +92,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
                print '#include "glapi.h"'
                print '#include "glapitable.h"'
                print '#include "glthread.h"'
-               print '#include "dispatch.h"'
+               print '#include "glapidispatch.h"'
                print ''
                print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'
                print ''

diff --git a/src/mesa/glapi/gen/glX_proto_send.py b/src/mesa/glapi/gen/glX_proto_send.py
index daca1b767a3cbcaf47d3eed20430f91de61b058f..4d484c833a8e90b0550a1269218d27774c555990 100644 (file)
--- a/src/mesa/glapi/gen/glX_proto_send.py
+++ b/src/mesa/glapi/gen/glX_proto_send.py
@@ -166,7 +166,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto):
                print '#include "indirect.h"'
                print '#include "glxclient.h"'
                print '#include "indirect_size.h"'
-               print '#include "dispatch.h"'
+               print '#include "glapidispatch.h"'
                print '#include "glapi.h"'
                print '#include "glthread.h"'
                print '#include <GL/glxproto.h>'