diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-05 15:20:06 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-13 16:07:17 -0800 |
| commit | 2e168758738fae3998090d41471aeb5b13887f80 (patch) | |
| tree | f10a47a4ccc275b80be7c141bf91fcbeec389423 /src/mapi | |
| parent | c0d2f4c123989158a845813cb1703a7b49307a37 (diff) | |
| download | external_mesa3d-2e168758738fae3998090d41471aeb5b13887f80.zip external_mesa3d-2e168758738fae3998090d41471aeb5b13887f80.tar.gz external_mesa3d-2e168758738fae3998090d41471aeb5b13887f80.tar.bz2 | |
glapi/glx: Xserver wants dispatch.h, not glapidispatch.h
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/Makefile | 6 | ||||
| -rw-r--r-- | 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 31745fce..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 '' |