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>
This commit is contained in:
Ian Romanick 2011-12-05 15:20:06 -08:00
parent c0d2f4c123
commit 2e16875873
2 changed files with 5 additions and 3 deletions

View File

@ -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 $< $@

View File

@ -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 ''