commit 21a8052fdca2115668dfc747b0b58db437b4eb6d Author: George Sapountzis Date: Fri May 23 22:39:09 2008 +0300 glx: fix forgotten swrast -> SWRast M hw/dmx/glxProxy/glxext.c M hw/xfree86/dixmods/glxmodule.c commit 877e6c35ff1f0f110627590ac0f12fddf47de506 Author: George Sapountzis Date: Fri May 23 22:38:36 2008 +0300 glx: missing swrast is fatal M glx/glxdriswrast.c M hw/xfree86/dixmods/glxmodule.c commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a Author: George Sapountzis Date: Fri May 23 22:38:11 2008 +0300 glx: drop stray glcore.h include M glx/glxutil.c commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35 Author: George Sapountzis Date: Fri May 23 22:40:03 2008 +0300 kdrive: need not export symbols for glx anymore M hw/kdrive/ephyr/Makefile.am M hw/kdrive/fake/Makefile.am M hw/kdrive/fbdev/Makefile.am M hw/kdrive/sdl/Makefile.am M hw/kdrive/vesa/Makefile.am commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c Author: Dan Nicholson Date: Wed May 21 10:51:15 2008 -0700 Fix up paths for GL/glx -> glx renaming M hw/kdrive/ephyr/ephyrglxext.c M hw/xfree86/dixmods/Makefile.am M hw/xfree86/dri/Makefile.am M hw/xgl/Makefile.am M hw/xgl/glx/Makefile.am M hw/xgl/glxext/Makefile.am M hw/xgl/glxext/module/Makefile.am M hw/xquartz/GL/Makefile.am commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55 Author: Kristian Høgsberg Date: Wed May 21 13:33:36 2008 -0400 Move GL/glx on level up now that it's the only thing left under GL. D GL/Makefile.am D GL/glx/Makefile.am D GL/glx/dispatch.h D GL/glx/extension_string.c D GL/glx/extension_string.h D GL/glx/g_disptab.h D GL/glx/glapi.c D GL/glx/glapi.h D GL/glx/glapioffsets.h D GL/glx/glapitable.h D GL/glx/glapitemp.h D GL/glx/glprocs.h D GL/glx/glthread.c D GL/glx/glthread.h D GL/glx/glxbyteorder.h D GL/glx/glxcmds.c D GL/glx/glxcmdsswap.c D GL/glx/glxcontext.h D GL/glx/glxdrawable.h D GL/glx/glxdri.c D GL/glx/glxdri2.c D GL/glx/glxdricommon.c D GL/glx/glxdricommon.h D GL/glx/glxdriswrast.c D GL/glx/glxext.c D GL/glx/glxext.h D GL/glx/glxscreens.c D GL/glx/glxscreens.h D GL/glx/glxserver.h D GL/glx/glxutil.c D GL/glx/glxutil.h D GL/glx/indirect_dispatch.c D GL/glx/indirect_dispatch.h D GL/glx/indirect_dispatch_swap.c D GL/glx/indirect_program.c D GL/glx/indirect_reqsize.c D GL/glx/indirect_reqsize.h D GL/glx/indirect_size.h D GL/glx/indirect_size_get.c D GL/glx/indirect_size_get.h D GL/glx/indirect_table.c D GL/glx/indirect_table.h D GL/glx/indirect_texture_compression.c D GL/glx/indirect_util.c D GL/glx/indirect_util.h D GL/glx/render2.c D GL/glx/render2swap.c D GL/glx/renderpix.c D GL/glx/renderpixswap.c D GL/glx/rensize.c D GL/glx/single2.c D GL/glx/single2swap.c D GL/glx/singlepix.c D GL/glx/singlepixswap.c D GL/glx/singlesize.c D GL/glx/singlesize.h D GL/glx/swap_interval.c D GL/glx/unpack.h D GL/glx/xfont.c M Makefile.am M configure.ac A glx/Makefile.am A glx/dispatch.h A glx/extension_string.c A glx/extension_string.h A glx/g_disptab.h A glx/glapi.c A glx/glapi.h A glx/glapioffsets.h A glx/glapitable.h A glx/glapitemp.h A glx/glprocs.h A glx/glthread.c A glx/glthread.h A glx/glxbyteorder.h A glx/glxcmds.c A glx/glxcmdsswap.c A glx/glxcontext.h A glx/glxdrawable.h A glx/glxdri.c A glx/glxdri2.c A glx/glxdricommon.c A glx/glxdricommon.h A glx/glxdriswrast.c A glx/glxext.c A glx/glxext.h A glx/glxscreens.c A glx/glxscreens.h A glx/glxserver.h A glx/glxutil.c A glx/glxutil.h A glx/indirect_dispatch.c A glx/indirect_dispatch.h A glx/indirect_dispatch_swap.c A glx/indirect_program.c A glx/indirect_reqsize.c A glx/indirect_reqsize.h A glx/indirect_size.h A glx/indirect_size_get.c A glx/indirect_size_get.h A glx/indirect_table.c A glx/indirect_table.h A glx/indirect_texture_compression.c A glx/indirect_util.c A glx/indirect_util.h A glx/render2.c A glx/render2swap.c A glx/renderpix.c A glx/renderpixswap.c A glx/rensize.c A glx/single2.c A glx/single2swap.c A glx/singlepix.c A glx/singlepixswap.c A glx/singlesize.c A glx/singlesize.h A glx/swap_interval.c A glx/unpack.h A glx/xfont.c commit a8a9b40e554dd0c184866978889a39519afc466a Author: Kristian Høgsberg Date: Wed May 21 12:34:07 2008 -0400 Move the windows GL files to the xwin DDX. D GL/windows/ChangeLog D GL/windows/glwindows.h D GL/windows/glwrap.c D GL/windows/indirect.c M hw/xwin/Makefile.am A hw/xwin/glx/ChangeLog A hw/xwin/glx/glwindows.h A hw/xwin/glx/glwrap.c A hw/xwin/glx/indirect.c commit e5aad4bc087036489e2af576628aa9b612054a6e Author: Kristian Høgsberg Date: Wed May 21 11:44:12 2008 -0400 Get out of the mesa symlinking business. This copies over the files generated from mesa/src/mesa/glapi. There's a corresponding mesa commit that makes it easy to generate the glapi files straight into the xserver tree when the XML definitions change. The only few files that are copied from mesa but aren't generated are glapi.[ch] and glthread.[ch]. Everything in there is technically DRI driver API and the whole setup is still a bit fragile, but it's not a new problem. The --with-mesa-source configure option is still around since other parts of the server (XGL and DMX - grep for MESA_SOURCE) need that, but for common case of building with GLX and AIGLX support, that option is no longer needed. D GL/glx/.gitignore M GL/glx/Makefile.am A GL/glx/dispatch.h A GL/glx/glapi.c A GL/glx/glapi.h A GL/glx/glapioffsets.h A GL/glx/glapitable.h A GL/glx/glapitemp.h A GL/glx/glprocs.h A GL/glx/glthread.c A GL/glx/glthread.h A GL/glx/indirect_dispatch.c A GL/glx/indirect_dispatch.h A GL/glx/indirect_dispatch_swap.c A GL/glx/indirect_reqsize.c A GL/glx/indirect_reqsize.h A GL/glx/indirect_size.h A GL/glx/indirect_size_get.c A GL/glx/indirect_size_get.h A GL/glx/indirect_table.c D GL/symlink-mesa.sh M configure.ac M hw/xfree86/dri/Makefile.am M hw/xfree86/dri2/Makefile.am commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c Author: Dan Nicholson Date: Wed May 21 10:51:15 2008 -0700 Fix up paths for GL/glx -> glx renaming M hw/xquartz/GL/Makefile.am commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8 Author: Kristian Høgsberg Date: Wed May 21 10:18:16 2008 -0400 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest. M hw/xnest/Makefile.am commit 77ff8fd5072fa57158463bfd84656389eeb7b503 Author: Kristian Høgsberg Date: Wed May 21 10:17:53 2008 -0400 Drop glcore GLX provider. Obsoleted by the DRI swrast driver. M GL/glx/Makefile.am M GL/glx/glxdriswrast.c D GL/glx/glxglcore.c M hw/dmx/glxProxy/glxext.c M hw/xfree86/dixmods/glxmodule.c M hw/xquartz/GL/indirect.c M mi/miinitext.c commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82 Author: Jeremy Huddleston Date: Wed Apr 23 10:22:34 2008 -0700 Moved Apple GL bits into our DDX subtree (cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff) M GL/Makefile.am D GL/apple/Makefile.am D GL/apple/indirect.c M configure.ac A hw/xquartz/GL/Makefile.am A hw/xquartz/GL/indirect.c M hw/xquartz/Makefile.am commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7 Author: Kristian Høgsberg Date: Tue May 20 16:56:27 2008 -0400 Stop symlinking glcontextmodes.[ch] from mesa. M GL/glx/Makefile.am M GL/symlink-mesa.sh commit 63853e4ad211945ed25541223207a78f83766ced Author: Jeremy Huddleston Date: Thu Apr 24 18:21:42 2008 -0700 XQuartz: Compile in missing glx source that we still need (cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e) commit 744d0cfda74f8283801cc2d6c5eda48402455bc3 Author: Ben Byer Date: Mon Apr 21 22:06:38 2008 -0700 add missing DARWIN_GLX_LIBS in configure.ac (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44) commit 3685b171da51f853bfdb312d36622dfa03ee75be Author: Ben Byer Date: Tue Apr 22 23:53:23 2008 -0700 xquartz: remove vestigial aglGlx.c (cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39) M GL/apple/Makefile.am D GL/apple/aglGlx.c commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad Author: George Sapountzis Date: Wed May 21 18:13:47 2008 +0300 glx: drop drm.h, sareaHandle from swrast loader M GL/glx/glxdriswrast.c commit 6ff6465931c397f72db27a4fd0ca0dcac0609537 Author: George Sapountzis Date: Tue May 20 16:36:22 2008 -0400 Add loader for the swrast dri driver. M GL/glx/Makefile.am M GL/glx/glxdri.c M GL/glx/glxdri2.c A GL/glx/glxdricommon.c A GL/glx/glxdricommon.h A GL/glx/glxdriswrast.c M hw/xfree86/dixmods/glxmodule.c M mi/miinitext.c commit a88c6b66465c039bf92a54a496516fee4d900784 Author: George Sapountzis Date: Fri Apr 18 17:47:16 2008 +0300 glcore: drop GLcore (files) D GL/mesa/.gitignore D GL/mesa/Makefile.am D GL/mesa/X/Makefile.am D GL/mesa/dummy.c D GL/mesa/glapi/Makefile.am D GL/mesa/main/Makefile.am D GL/mesa/math/Makefile.am D GL/mesa/shader/Makefile.am D GL/mesa/shader/grammar/Makefile.am D GL/mesa/shader/slang/Makefile.am D GL/mesa/swrast/Makefile.am D GL/mesa/swrast_setup/Makefile.am D GL/mesa/tnl/Makefile.am D GL/mesa/vbo/Makefile.am M GL/symlink-mesa.sh D hw/xfree86/dixmods/GLcoremodule.c commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e Author: George Sapountzis Date: Fri Apr 18 17:47:01 2008 +0300 glcore: drop GLcore (build system) M GL/Makefile.am M GL/symlink-mesa.sh M configure.ac M hw/xfree86/dixmods/Makefile.am commit 567d389d47dee233a973b101e04ce41c47a68f34 Author: George Sapountzis Date: Fri Apr 18 17:46:18 2008 +0300 glcore: build from mesa, dlopen from xorg * The GLcore interface is disposable * GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for GLX_PROVIDER_INSTALL_DIR M GL/glx/glxglcore.c M hw/xfree86/dixmods/glxmodule.c commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0 Author: George Sapountzis Date: Fri Apr 18 17:45:53 2008 +0300 glcore: prepare for dynamic loading glcore gets linked with -ldl, -lpthread for s3tc and glapi xserver needs DLOPEN_LIBS - to dlopen the glcore dso LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use the ld flag is added to kdrive only when GLX is enabled, the net overhead for Xephyr is ~155KB, could be reduced with --dynamic-list. M configure.ac M hw/kdrive/ati/Makefile.am M hw/kdrive/chips/Makefile.am M hw/kdrive/ephyr/Makefile.am M hw/kdrive/epson/Makefile.am M hw/kdrive/fake/Makefile.am M hw/kdrive/fbdev/Makefile.am M hw/kdrive/i810/Makefile.am M hw/kdrive/mach64/Makefile.am M hw/kdrive/mga/Makefile.am M hw/kdrive/neomagic/Makefile.am M hw/kdrive/nvidia/Makefile.am M hw/kdrive/pm2/Makefile.am M hw/kdrive/r128/Makefile.am M hw/kdrive/sdl/Makefile.am M hw/kdrive/sis300/Makefile.am M hw/kdrive/smi/Makefile.am M hw/kdrive/vesa/Makefile.am M hw/kdrive/via/Makefile.am