From 2e168758738fae3998090d41471aeb5b13887f80 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 5 Dec 2011 15:20:06 -0800 Subject: [PATCH] glapi/glx: Xserver wants dispatch.h, not glapidispatch.h Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Adam Jackson --- src/mapi/glapi/gen/Makefile | 6 ++++-- src/mapi/glapi/gen/glX_proto_recv.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile index 13bd383..c409285 100644 --- a/src/mapi/glapi/gen/Makefile +++ b/src/mapi/glapi/gen/Makefile @@ -43,9 +43,8 @@ XORG_GLAPI_DIR = $(XORG_BASE)/glx XORG_GLAPI_OUTPUTS = \ $(XORG_GLAPI_DIR)/glprocs.h \ - $(XORG_GLAPI_DIR)/glapioffsets.h \ $(XORG_GLAPI_DIR)/glapitable.h \ - $(XORG_GLAPI_DIR)/glapidispatch.h \ + $(XORG_GLAPI_DIR)/dispatch.h \ $(XORG_GLAPI_DIR)/glapi_gentable.c XORG_OUTPUTS = \ @@ -141,6 +140,9 @@ clean: $(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c cp $< $@ +$(XORG_GLAPI_DIR)/dispatch.h: $(MESA_DIR)/main/dispatch.h + cp $< $@ + $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h cp $< $@ diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py index 31745fc..f423c6d 100644 --- a/src/mapi/glapi/gen/glX_proto_recv.py +++ b/src/mapi/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 "glapidispatch.h"' + print '#include "dispatch.h"' print '' print '#define __GLX_PAD(x) (((x) + 3) & ~3)' print '' -- 2.7.4