[PATCH 0/2] Keep generated glapi sources in mesa

Dan Nicholson dbn.lists at gmail.com
Wed Feb 13 06:40:32 PST 2008


The glapi source files for the xserver's GLX module are currently
generated in the mesa tree and then manually merged into the the xserver
tree. This step in the GLX build is error prone as the files can easily
become unsynchronized from the rest of the glapi in mesa.

This patchset changes the mesa build to generate the files in a standard
location in the mesa tree. Likewise, the xserver glx build has the
necessary files symlinked in by symlink-mesa.sh at build time.

I put the files in src/glx/x11 in mesa with the rest of the glx sources.
I'm not sure if this is the best place.

--
Dan

mesa:
 src/glx/x11/indirect_dispatch.c      | 5889 +++++++++++++++++++++++++++++++++
 src/glx/x11/indirect_dispatch.h      | 1047 ++++++
 src/glx/x11/indirect_dispatch_swap.c | 6051 ++++++++++++++++++++++++++++++++++
 src/glx/x11/indirect_reqsize.c       |  832 +++++
 src/glx/x11/indirect_reqsize.h       |  121 +
 src/glx/x11/indirect_size_get.c      | 1206 +++++++
 src/glx/x11/indirect_size_get.h      |  102 +
 src/glx/x11/indirect_table.c         | 1596 +++++++++
 src/mesa/glapi/Makefile              |   31 +-
 9 files changed, 16857 insertions(+), 18 deletions(-)
 create mode 100644 src/glx/x11/indirect_dispatch.c
 create mode 100644 src/glx/x11/indirect_dispatch.h
 create mode 100644 src/glx/x11/indirect_dispatch_swap.c
 create mode 100644 src/glx/x11/indirect_reqsize.c
 create mode 100644 src/glx/x11/indirect_reqsize.h
 create mode 100644 src/glx/x11/indirect_size_get.c
 create mode 100644 src/glx/x11/indirect_size_get.h
 create mode 100644 src/glx/x11/indirect_table.c

xserver:
 GL/glx/.gitignore               |   12 +-
 GL/glx/Makefile.am              |   18 +-
 GL/glx/indirect_dispatch.c      | 5889 -------------------------------------
 GL/glx/indirect_dispatch.h      | 1047 -------
 GL/glx/indirect_dispatch_swap.c | 6051 ---------------------------------------
 GL/glx/indirect_reqsize.c       |  832 ------
 GL/glx/indirect_reqsize.h       |  121 -
 GL/glx/indirect_size_get.c      | 1206 --------
 GL/glx/indirect_size_get.h      |  102 -
 GL/glx/indirect_table.c         | 1596 -----------
 GL/symlink-mesa.sh              |    8 +
 11 files changed, 27 insertions(+), 16855 deletions(-)
 delete mode 100644 GL/glx/indirect_dispatch.c
 delete mode 100644 GL/glx/indirect_dispatch.h
 delete mode 100644 GL/glx/indirect_dispatch_swap.c
 delete mode 100644 GL/glx/indirect_reqsize.c
 delete mode 100644 GL/glx/indirect_reqsize.h
 delete mode 100644 GL/glx/indirect_size_get.c
 delete mode 100644 GL/glx/indirect_size_get.h
 delete mode 100644 GL/glx/indirect_table.c



More information about the xorg mailing list