These two patches move things around in GLX a bit. To make it possible
to use libGL with EGL on framebuffer without pulling in X dependencies
this patch make the GLX entry points and all the indirect API a
./configure time option. When disabled, libGL is essentially just glapi
and needs libEGL to be useful. I had to go back to using a list of
glapi object files instead of libglapi.a, since without the glx functions
nothing is left to pull in the glapi files.
The other patch renames glx to gl, now that it's no longer glx only, and
moves the code up one level from src/glx/x11 to src/gl. The patch
drops src/glx/mini; it's DRI1 only, not maintained and EGL on KMS is a
better solution for the use cases where miniglx was useful.
Kristian Høgsberg (2):
libgl: Enable compiling libGL without GLX functions and X
dependencies
Move src/glx/x11 to src/gl, drop glx/mini
Makefile | 7 +-
configs/autoconf.in | 2 +
configs/darwin | 4 +-
configs/freebsd-dri | 2 +-
configs/linux-dri | 2 +-
configs/linux-dri-xcb | 2 +-
configs/linux-indirect | 2 +-
configure.ac | 101 +-
src/gallium/state_trackers/egl/Makefile | 5 +-
src/gallium/state_trackers/egl/x11/glxinit.c | 2 +-
src/gl/Makefile | 99 +
src/gl/XF86dri.c | 637 ++
src/gl/clientattrib.c | 142 +
src/gl/compsize.c | 189 +
src/gl/dri2.c | 631 ++
src/gl/dri2.h | 106 +
src/gl/dri2_glx.c | 655 ++
src/gl/dri_common.c | 450 ++
src/gl/dri_common.h | 63 +
src/gl/dri_glx.c | 751 ++
src/gl/drisw_glx.c | 456 ++
src/gl/eval.c | 132 +
src/gl/glcontextmodes.c | 544 ++
src/gl/glcontextmodes.h | 54 +
src/gl/glx_pbuffer.c | 724 ++
src/gl/glx_query.c | 177 +
src/gl/glxclient.h | 803 ++
src/gl/glxcmds.c | 3173 ++++++++
src/gl/glxcurrent.c | 513 ++
src/gl/glxext.c | 1048 +++
src/gl/glxextensions.c | 714 ++
src/gl/glxextensions.h | 292 +
src/gl/glxhash.c | 473 ++
src/gl/glxhash.h | 20 +
src/gl/indirect.c |10669 ++++++++++++++++++++++++++
src/gl/indirect.h | 721 ++
src/gl/indirect_init.c | 785 ++
src/gl/indirect_init.h | 41 +
src/gl/indirect_size.c | 388 +
src/gl/indirect_size.h | 88 +
src/gl/indirect_texture_compression.c | 343 +
src/gl/indirect_transpose_matrix.c | 85 +
src/gl/indirect_vertex_array.c | 1985 +++++
src/gl/indirect_vertex_array.h | 64 +
src/gl/indirect_vertex_array_priv.h | 311 +
src/gl/indirect_vertex_program.c | 293 +
src/gl/indirect_window_pos.c | 112 +
src/gl/packrender.h | 243 +
src/gl/packsingle.h | 213 +
src/gl/pixel.c | 461 ++
src/gl/pixelstore.c | 352 +
src/gl/render2.c | 381 +
src/gl/renderpix.c | 218 +
src/gl/single2.c | 974 +++
src/gl/singlepix.c | 196 +
src/gl/vertarr.c | 212 +
src/gl/xf86dri.h | 124 +
src/gl/xf86dristr.h | 367 +
src/gl/xfont.c | 377 +
src/glx/Makefile | 12 -
src/glx/mini/Makefile | 89 -
src/glx/mini/NOTES | 115 -
src/glx/mini/dispatch.c | 64 -
src/glx/mini/driver.h | 168 -
src/glx/mini/example.miniglx.conf | 36 -
src/glx/mini/miniglx.c | 2580 -------
src/glx/mini/miniglxP.h | 205 -
src/glx/mini/miniglx_events.c | 983 ---
src/glx/x11/Makefile | 97 -
src/glx/x11/XF86dri.c | 637 --
src/glx/x11/clientattrib.c | 142 -
src/glx/x11/compsize.c | 189 -
src/glx/x11/dri2.c | 631 --
src/glx/x11/dri2.h | 106 -
src/glx/x11/dri2_glx.c | 655 --
src/glx/x11/dri_common.c | 450 --
src/glx/x11/dri_common.h | 63 -
src/glx/x11/dri_glx.c | 751 --
src/glx/x11/drisw_glx.c | 456 --
src/glx/x11/eval.c | 132 -
src/glx/x11/glcontextmodes.c | 544 --
src/glx/x11/glcontextmodes.h | 54 -
src/glx/x11/glx_pbuffer.c | 724 --
src/glx/x11/glx_query.c | 177 -
src/glx/x11/glxclient.h | 803 --
src/glx/x11/glxcmds.c | 3173 --------
src/glx/x11/glxcurrent.c | 513 --
src/glx/x11/glxext.c | 1048 ---
src/glx/x11/glxextensions.c | 714 --
src/glx/x11/glxextensions.h | 292 -
src/glx/x11/glxhash.c | 473 --
src/glx/x11/glxhash.h | 20 -
src/glx/x11/indirect.c |10669 --------------------------
src/glx/x11/indirect.h | 721 --
src/glx/x11/indirect_init.c | 785 --
src/glx/x11/indirect_init.h | 41 -
src/glx/x11/indirect_size.c | 388 -
src/glx/x11/indirect_size.h | 88 -
src/glx/x11/indirect_texture_compression.c | 343 -
src/glx/x11/indirect_transpose_matrix.c | 85 -
src/glx/x11/indirect_vertex_array.c | 1985 -----
src/glx/x11/indirect_vertex_array.h | 64 -
src/glx/x11/indirect_vertex_array_priv.h | 311 -
src/glx/x11/indirect_vertex_program.c | 293 -
src/glx/x11/indirect_window_pos.c | 112 -
src/glx/x11/packrender.h | 243 -
src/glx/x11/packsingle.h | 213 -
src/glx/x11/pixel.c | 461 --
src/glx/x11/pixelstore.c | 352 -
src/glx/x11/render2.c | 381 -
src/glx/x11/renderpix.c | 218 -
src/glx/x11/single2.c | 974 ---
src/glx/x11/singlepix.c | 196 -
src/glx/x11/vertarr.c | 212 -
src/glx/x11/xf86dri.h | 124 -
src/glx/x11/xf86dristr.h | 367 -
src/glx/x11/xfont.c | 377 -
src/mesa/glapi/Makefile | 20 +-
src/mesa/main/dispatch.c | 2 +-
119 files changed, 32936 insertions(+), 37163 deletions(-)
create mode 100644 src/gl/Makefile
create mode 100644 src/gl/XF86dri.c
create mode 100644 src/gl/clientattrib.c
create mode 100644 src/gl/compsize.c
create mode 100644 src/gl/dri2.c
create mode 100644 src/gl/dri2.h
create mode 100644 src/gl/dri2_glx.c
create mode 100644 src/gl/dri_common.c
create mode 100644 src/gl/dri_common.h
create mode 100644 src/gl/dri_glx.c
create mode 100644 src/gl/drisw_glx.c
create mode 100644 src/gl/eval.c
create mode 100644 src/gl/glcontextmodes.c
create mode 100644 src/gl/glcontextmodes.h
create mode 100644 src/gl/glx_pbuffer.c
create mode 100644 src/gl/glx_query.c
create mode 100644 src/gl/glxclient.h
create mode 100644 src/gl/glxcmds.c
create mode 100644 src/gl/glxcurrent.c
create mode 100644 src/gl/glxext.c
create mode 100644 src/gl/glxextensions.c
create mode 100644 src/gl/glxextensions.h
create mode 100644 src/gl/glxhash.c
create mode 100644 src/gl/glxhash.h
create mode 100644 src/gl/indirect.c
create mode 100644 src/gl/indirect.h
create mode 100644 src/gl/indirect_init.c
create mode 100644 src/gl/indirect_init.h
create mode 100644 src/gl/indirect_size.c
create mode 100644 src/gl/indirect_size.h
create mode 100644 src/gl/indirect_texture_compression.c
create mode 100644 src/gl/indirect_transpose_matrix.c
create mode 100644 src/gl/indirect_vertex_array.c
create mode 100644 src/gl/indirect_vertex_array.h
create mode 100644 src/gl/indirect_vertex_array_priv.h
create mode 100644 src/gl/indirect_vertex_program.c
create mode 100644 src/gl/indirect_window_pos.c
create mode 100644 src/gl/packrender.h
create mode 100644 src/gl/packsingle.h
create mode 100644 src/gl/pixel.c
create mode 100644 src/gl/pixelstore.c
create mode 100644 src/gl/render2.c
create mode 100644 src/gl/renderpix.c
create mode 100644 src/gl/single2.c
create mode 100644 src/gl/singlepix.c
create mode 100644 src/gl/vertarr.c
create mode 100644 src/gl/xf86dri.h
create mode 100644 src/gl/xf86dristr.h
create mode 100644 src/gl/xfont.c
delete mode 100644 src/glx/Makefile
delete mode 100644 src/glx/mini/Makefile
delete mode 100644 src/glx/mini/NOTES
delete mode 100644 src/glx/mini/dispatch.c
delete mode 100644 src/glx/mini/driver.h
delete mode 100644 src/glx/mini/example.miniglx.conf
delete mode 100644 src/glx/mini/miniglx.c
delete mode 100644 src/glx/mini/miniglxP.h
delete mode 100644 src/glx/mini/miniglx_events.c
delete mode 100644 src/glx/x11/Makefile
delete mode 100644 src/glx/x11/XF86dri.c
delete mode 100644 src/glx/x11/clientattrib.c
delete mode 100644 src/glx/x11/compsize.c
delete mode 100644 src/glx/x11/dri2.c
delete mode 100644 src/glx/x11/dri2.h
delete mode 100644 src/glx/x11/dri2_glx.c
delete mode 100644 src/glx/x11/dri_common.c
delete mode 100644 src/glx/x11/dri_common.h
delete mode 100644 src/glx/x11/dri_glx.c
delete mode 100644 src/glx/x11/drisw_glx.c
delete mode 100644 src/glx/x11/eval.c
delete mode 100644 src/glx/x11/glcontextmodes.c
delete mode 100644 src/glx/x11/glcontextmodes.h
delete mode 100644 src/glx/x11/glx_pbuffer.c
delete mode 100644 src/glx/x11/glx_query.c
delete mode 100644 src/glx/x11/glxclient.h
delete mode 100644 src/glx/x11/glxcmds.c
delete mode 100644 src/glx/x11/glxcurrent.c
delete mode 100644 src/glx/x11/glxext.c
delete mode 100644 src/glx/x11/glxextensions.c
delete mode 100644 src/glx/x11/glxextensions.h
delete mode 100644 src/glx/x11/glxhash.c
delete mode 100644 src/glx/x11/glxhash.h
delete mode 100644 src/glx/x11/indirect.c
delete mode 100644 src/glx/x11/indirect.h
delete mode 100644 src/glx/x11/indirect_init.c
delete mode 100644 src/glx/x11/indirect_init.h
delete mode 100644 src/glx/x11/indirect_size.c
delete mode 100644 src/glx/x11/indirect_size.h
delete mode 100644 src/glx/x11/indirect_texture_compression.c
delete mode 100644 src/glx/x11/indirect_transpose_matrix.c
delete mode 100644 src/glx/x11/indirect_vertex_array.c
delete mode 100644 src/glx/x11/indirect_vertex_array.h
delete mode 100644 src/glx/x11/indirect_vertex_array_priv.h
delete mode 100644 src/glx/x11/indirect_vertex_program.c
delete mode 100644 src/glx/x11/indirect_window_pos.c
delete mode 100644 src/glx/x11/packrender.h
delete mode 100644 src/glx/x11/packsingle.h
delete mode 100644 src/glx/x11/pixel.c
delete mode 100644 src/glx/x11/pixelstore.c
delete mode 100644 src/glx/x11/render2.c
delete mode 100644 src/glx/x11/renderpix.c
delete mode 100644 src/glx/x11/single2.c
delete mode 100644 src/glx/x11/singlepix.c
delete mode 100644 src/glx/x11/vertarr.c
delete mode 100644 src/glx/x11/xf86dri.h
delete mode 100644 src/glx/x11/xf86dristr.h
delete mode 100644 src/glx/x11/xfont.c
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
