From a194718e9d83b488f21226332b8b5b250f48e274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 21 May 2008 13:33:36 -0400 Subject: [PATCH] Move GL/glx on level up now that it's the only thing left under GL. (cherry picked from commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55) --- GL/Makefile.am | 9 --------- Makefile.am | 4 ++-- configure.ac | 7 +++---- {GL/glx => glx}/Makefile.am | 0 {GL/glx => glx}/dispatch.h | 0 {GL/glx => glx}/extension_string.c | 0 {GL/glx => glx}/extension_string.h | 0 {GL/glx => glx}/g_disptab.h | 0 {GL/glx => glx}/glapi.c | 0 {GL/glx => glx}/glapi.h | 0 {GL/glx => glx}/glapioffsets.h | 0 {GL/glx => glx}/glapitable.h | 0 {GL/glx => glx}/glapitemp.h | 0 {GL/glx => glx}/glprocs.h | 0 {GL/glx => glx}/glthread.c | 0 {GL/glx => glx}/glthread.h | 0 {GL/glx => glx}/glxbyteorder.h | 0 {GL/glx => glx}/glxcmds.c | 0 {GL/glx => glx}/glxcmdsswap.c | 0 {GL/glx => glx}/glxcontext.h | 0 {GL/glx => glx}/glxdrawable.h | 0 {GL/glx => glx}/glxdri.c | 0 {GL/glx => glx}/glxdri2.c | 0 {GL/glx => glx}/glxdricommon.c | 0 {GL/glx => glx}/glxdricommon.h | 0 {GL/glx => glx}/glxdriswrast.c | 0 {GL/glx => glx}/glxext.c | 0 {GL/glx => glx}/glxext.h | 0 {GL/glx => glx}/glxscreens.c | 0 {GL/glx => glx}/glxscreens.h | 0 {GL/glx => glx}/glxserver.h | 0 {GL/glx => glx}/glxutil.c | 0 {GL/glx => glx}/glxutil.h | 0 {GL/glx => glx}/indirect_dispatch.c | 0 {GL/glx => glx}/indirect_dispatch.h | 0 {GL/glx => glx}/indirect_dispatch_swap.c | 0 {GL/glx => glx}/indirect_program.c | 0 {GL/glx => glx}/indirect_reqsize.c | 0 {GL/glx => glx}/indirect_reqsize.h | 0 {GL/glx => glx}/indirect_size.h | 0 {GL/glx => glx}/indirect_size_get.c | 0 {GL/glx => glx}/indirect_size_get.h | 0 {GL/glx => glx}/indirect_table.c | 0 {GL/glx => glx}/indirect_table.h | 0 {GL/glx => glx}/indirect_texture_compression.c | 0 {GL/glx => glx}/indirect_util.c | 0 {GL/glx => glx}/indirect_util.h | 0 {GL/glx => glx}/render2.c | 0 {GL/glx => glx}/render2swap.c | 0 {GL/glx => glx}/renderpix.c | 0 {GL/glx => glx}/renderpixswap.c | 0 {GL/glx => glx}/rensize.c | 0 {GL/glx => glx}/single2.c | 0 {GL/glx => glx}/single2swap.c | 0 {GL/glx => glx}/singlepix.c | 0 {GL/glx => glx}/singlepixswap.c | 0 {GL/glx => glx}/singlesize.c | 0 {GL/glx => glx}/singlesize.h | 0 {GL/glx => glx}/swap_interval.c | 0 {GL/glx => glx}/unpack.h | 0 {GL/glx => glx}/xfont.c | 0 61 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 GL/Makefile.am rename {GL/glx => glx}/Makefile.am (100%) rename {GL/glx => glx}/dispatch.h (100%) rename {GL/glx => glx}/extension_string.c (100%) rename {GL/glx => glx}/extension_string.h (100%) rename {GL/glx => glx}/g_disptab.h (100%) rename {GL/glx => glx}/glapi.c (100%) rename {GL/glx => glx}/glapi.h (100%) rename {GL/glx => glx}/glapioffsets.h (100%) rename {GL/glx => glx}/glapitable.h (100%) rename {GL/glx => glx}/glapitemp.h (100%) rename {GL/glx => glx}/glprocs.h (100%) rename {GL/glx => glx}/glthread.c (100%) rename {GL/glx => glx}/glthread.h (100%) rename {GL/glx => glx}/glxbyteorder.h (100%) rename {GL/glx => glx}/glxcmds.c (100%) rename {GL/glx => glx}/glxcmdsswap.c (100%) rename {GL/glx => glx}/glxcontext.h (100%) rename {GL/glx => glx}/glxdrawable.h (100%) rename {GL/glx => glx}/glxdri.c (100%) rename {GL/glx => glx}/glxdri2.c (100%) rename {GL/glx => glx}/glxdricommon.c (100%) rename {GL/glx => glx}/glxdricommon.h (100%) rename {GL/glx => glx}/glxdriswrast.c (100%) rename {GL/glx => glx}/glxext.c (100%) rename {GL/glx => glx}/glxext.h (100%) rename {GL/glx => glx}/glxscreens.c (100%) rename {GL/glx => glx}/glxscreens.h (100%) rename {GL/glx => glx}/glxserver.h (100%) rename {GL/glx => glx}/glxutil.c (100%) rename {GL/glx => glx}/glxutil.h (100%) rename {GL/glx => glx}/indirect_dispatch.c (100%) rename {GL/glx => glx}/indirect_dispatch.h (100%) rename {GL/glx => glx}/indirect_dispatch_swap.c (100%) rename {GL/glx => glx}/indirect_program.c (100%) rename {GL/glx => glx}/indirect_reqsize.c (100%) rename {GL/glx => glx}/indirect_reqsize.h (100%) rename {GL/glx => glx}/indirect_size.h (100%) rename {GL/glx => glx}/indirect_size_get.c (100%) rename {GL/glx => glx}/indirect_size_get.h (100%) rename {GL/glx => glx}/indirect_table.c (100%) rename {GL/glx => glx}/indirect_table.h (100%) rename {GL/glx => glx}/indirect_texture_compression.c (100%) rename {GL/glx => glx}/indirect_util.c (100%) rename {GL/glx => glx}/indirect_util.h (100%) rename {GL/glx => glx}/render2.c (100%) rename {GL/glx => glx}/render2swap.c (100%) rename {GL/glx => glx}/renderpix.c (100%) rename {GL/glx => glx}/renderpixswap.c (100%) rename {GL/glx => glx}/rensize.c (100%) rename {GL/glx => glx}/single2.c (100%) rename {GL/glx => glx}/single2swap.c (100%) rename {GL/glx => glx}/singlepix.c (100%) rename {GL/glx => glx}/singlepixswap.c (100%) rename {GL/glx => glx}/singlesize.c (100%) rename {GL/glx => glx}/singlesize.h (100%) rename {GL/glx => glx}/swap_interval.c (100%) rename {GL/glx => glx}/unpack.h (100%) rename {GL/glx => glx}/xfont.c (100%) diff --git a/GL/Makefile.am b/GL/Makefile.am deleted file mode 100644 index c3ac15564..000000000 --- a/GL/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -SUBDIRS = glx - -WINDOWS_EXTRAS = \ - windows/ChangeLog \ - windows/glwindows.h \ - windows/glwrap.c \ - windows/indirect.c - -EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS) diff --git a/Makefile.am b/Makefile.am index 71ba2c429..86b5c9c64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ MFB_DIR=mfb endif if GLX -GLX_DIR=GL +GLX_DIR=glx endif if DBE @@ -103,7 +103,7 @@ DIST_SUBDIRS = \ damageext \ XTrap \ composite \ - GL \ + glx \ exa \ config \ hw diff --git a/configure.ac b/configure.ac index 144a59458..05d4b78ef 100644 --- a/configure.ac +++ b/configure.ac @@ -827,7 +827,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0]) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - GLX_LIBS='$(top_builddir)/GL/glx/libglx.la' + GLX_LIBS='$(top_builddir)/glx/libglx.la' GLX_SYS_LIBS="$GLX_SYS_LIBS $DLOPEN_LIBS" else GLX=no @@ -1730,7 +1730,7 @@ fi if test "x$XQUARTZ" = xyes; then AC_DEFINE([XQUARTZ],[1],[Have Quartz]) - DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/GL/glx/libglx.la' + DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/glx/libglx.la' DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS" AC_SUBST([DARWIN_LIBS]) @@ -2093,8 +2093,7 @@ XORG_MANPAGE_SECTIONS AC_OUTPUT([ Makefile -GL/Makefile -GL/glx/Makefile +glx/Makefile include/Makefile afb/Makefile composite/Makefile diff --git a/GL/glx/Makefile.am b/glx/Makefile.am similarity index 100% rename from GL/glx/Makefile.am rename to glx/Makefile.am diff --git a/GL/glx/dispatch.h b/glx/dispatch.h similarity index 100% rename from GL/glx/dispatch.h rename to glx/dispatch.h diff --git a/GL/glx/extension_string.c b/glx/extension_string.c similarity index 100% rename from GL/glx/extension_string.c rename to glx/extension_string.c diff --git a/GL/glx/extension_string.h b/glx/extension_string.h similarity index 100% rename from GL/glx/extension_string.h rename to glx/extension_string.h diff --git a/GL/glx/g_disptab.h b/glx/g_disptab.h similarity index 100% rename from GL/glx/g_disptab.h rename to glx/g_disptab.h diff --git a/GL/glx/glapi.c b/glx/glapi.c similarity index 100% rename from GL/glx/glapi.c rename to glx/glapi.c diff --git a/GL/glx/glapi.h b/glx/glapi.h similarity index 100% rename from GL/glx/glapi.h rename to glx/glapi.h diff --git a/GL/glx/glapioffsets.h b/glx/glapioffsets.h similarity index 100% rename from GL/glx/glapioffsets.h rename to glx/glapioffsets.h diff --git a/GL/glx/glapitable.h b/glx/glapitable.h similarity index 100% rename from GL/glx/glapitable.h rename to glx/glapitable.h diff --git a/GL/glx/glapitemp.h b/glx/glapitemp.h similarity index 100% rename from GL/glx/glapitemp.h rename to glx/glapitemp.h diff --git a/GL/glx/glprocs.h b/glx/glprocs.h similarity index 100% rename from GL/glx/glprocs.h rename to glx/glprocs.h diff --git a/GL/glx/glthread.c b/glx/glthread.c similarity index 100% rename from GL/glx/glthread.c rename to glx/glthread.c diff --git a/GL/glx/glthread.h b/glx/glthread.h similarity index 100% rename from GL/glx/glthread.h rename to glx/glthread.h diff --git a/GL/glx/glxbyteorder.h b/glx/glxbyteorder.h similarity index 100% rename from GL/glx/glxbyteorder.h rename to glx/glxbyteorder.h diff --git a/GL/glx/glxcmds.c b/glx/glxcmds.c similarity index 100% rename from GL/glx/glxcmds.c rename to glx/glxcmds.c diff --git a/GL/glx/glxcmdsswap.c b/glx/glxcmdsswap.c similarity index 100% rename from GL/glx/glxcmdsswap.c rename to glx/glxcmdsswap.c diff --git a/GL/glx/glxcontext.h b/glx/glxcontext.h similarity index 100% rename from GL/glx/glxcontext.h rename to glx/glxcontext.h diff --git a/GL/glx/glxdrawable.h b/glx/glxdrawable.h similarity index 100% rename from GL/glx/glxdrawable.h rename to glx/glxdrawable.h diff --git a/GL/glx/glxdri.c b/glx/glxdri.c similarity index 100% rename from GL/glx/glxdri.c rename to glx/glxdri.c diff --git a/GL/glx/glxdri2.c b/glx/glxdri2.c similarity index 100% rename from GL/glx/glxdri2.c rename to glx/glxdri2.c diff --git a/GL/glx/glxdricommon.c b/glx/glxdricommon.c similarity index 100% rename from GL/glx/glxdricommon.c rename to glx/glxdricommon.c diff --git a/GL/glx/glxdricommon.h b/glx/glxdricommon.h similarity index 100% rename from GL/glx/glxdricommon.h rename to glx/glxdricommon.h diff --git a/GL/glx/glxdriswrast.c b/glx/glxdriswrast.c similarity index 100% rename from GL/glx/glxdriswrast.c rename to glx/glxdriswrast.c diff --git a/GL/glx/glxext.c b/glx/glxext.c similarity index 100% rename from GL/glx/glxext.c rename to glx/glxext.c diff --git a/GL/glx/glxext.h b/glx/glxext.h similarity index 100% rename from GL/glx/glxext.h rename to glx/glxext.h diff --git a/GL/glx/glxscreens.c b/glx/glxscreens.c similarity index 100% rename from GL/glx/glxscreens.c rename to glx/glxscreens.c diff --git a/GL/glx/glxscreens.h b/glx/glxscreens.h similarity index 100% rename from GL/glx/glxscreens.h rename to glx/glxscreens.h diff --git a/GL/glx/glxserver.h b/glx/glxserver.h similarity index 100% rename from GL/glx/glxserver.h rename to glx/glxserver.h diff --git a/GL/glx/glxutil.c b/glx/glxutil.c similarity index 100% rename from GL/glx/glxutil.c rename to glx/glxutil.c diff --git a/GL/glx/glxutil.h b/glx/glxutil.h similarity index 100% rename from GL/glx/glxutil.h rename to glx/glxutil.h diff --git a/GL/glx/indirect_dispatch.c b/glx/indirect_dispatch.c similarity index 100% rename from GL/glx/indirect_dispatch.c rename to glx/indirect_dispatch.c diff --git a/GL/glx/indirect_dispatch.h b/glx/indirect_dispatch.h similarity index 100% rename from GL/glx/indirect_dispatch.h rename to glx/indirect_dispatch.h diff --git a/GL/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c similarity index 100% rename from GL/glx/indirect_dispatch_swap.c rename to glx/indirect_dispatch_swap.c diff --git a/GL/glx/indirect_program.c b/glx/indirect_program.c similarity index 100% rename from GL/glx/indirect_program.c rename to glx/indirect_program.c diff --git a/GL/glx/indirect_reqsize.c b/glx/indirect_reqsize.c similarity index 100% rename from GL/glx/indirect_reqsize.c rename to glx/indirect_reqsize.c diff --git a/GL/glx/indirect_reqsize.h b/glx/indirect_reqsize.h similarity index 100% rename from GL/glx/indirect_reqsize.h rename to glx/indirect_reqsize.h diff --git a/GL/glx/indirect_size.h b/glx/indirect_size.h similarity index 100% rename from GL/glx/indirect_size.h rename to glx/indirect_size.h diff --git a/GL/glx/indirect_size_get.c b/glx/indirect_size_get.c similarity index 100% rename from GL/glx/indirect_size_get.c rename to glx/indirect_size_get.c diff --git a/GL/glx/indirect_size_get.h b/glx/indirect_size_get.h similarity index 100% rename from GL/glx/indirect_size_get.h rename to glx/indirect_size_get.h diff --git a/GL/glx/indirect_table.c b/glx/indirect_table.c similarity index 100% rename from GL/glx/indirect_table.c rename to glx/indirect_table.c diff --git a/GL/glx/indirect_table.h b/glx/indirect_table.h similarity index 100% rename from GL/glx/indirect_table.h rename to glx/indirect_table.h diff --git a/GL/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c similarity index 100% rename from GL/glx/indirect_texture_compression.c rename to glx/indirect_texture_compression.c diff --git a/GL/glx/indirect_util.c b/glx/indirect_util.c similarity index 100% rename from GL/glx/indirect_util.c rename to glx/indirect_util.c diff --git a/GL/glx/indirect_util.h b/glx/indirect_util.h similarity index 100% rename from GL/glx/indirect_util.h rename to glx/indirect_util.h diff --git a/GL/glx/render2.c b/glx/render2.c similarity index 100% rename from GL/glx/render2.c rename to glx/render2.c diff --git a/GL/glx/render2swap.c b/glx/render2swap.c similarity index 100% rename from GL/glx/render2swap.c rename to glx/render2swap.c diff --git a/GL/glx/renderpix.c b/glx/renderpix.c similarity index 100% rename from GL/glx/renderpix.c rename to glx/renderpix.c diff --git a/GL/glx/renderpixswap.c b/glx/renderpixswap.c similarity index 100% rename from GL/glx/renderpixswap.c rename to glx/renderpixswap.c diff --git a/GL/glx/rensize.c b/glx/rensize.c similarity index 100% rename from GL/glx/rensize.c rename to glx/rensize.c diff --git a/GL/glx/single2.c b/glx/single2.c similarity index 100% rename from GL/glx/single2.c rename to glx/single2.c diff --git a/GL/glx/single2swap.c b/glx/single2swap.c similarity index 100% rename from GL/glx/single2swap.c rename to glx/single2swap.c diff --git a/GL/glx/singlepix.c b/glx/singlepix.c similarity index 100% rename from GL/glx/singlepix.c rename to glx/singlepix.c diff --git a/GL/glx/singlepixswap.c b/glx/singlepixswap.c similarity index 100% rename from GL/glx/singlepixswap.c rename to glx/singlepixswap.c diff --git a/GL/glx/singlesize.c b/glx/singlesize.c similarity index 100% rename from GL/glx/singlesize.c rename to glx/singlesize.c diff --git a/GL/glx/singlesize.h b/glx/singlesize.h similarity index 100% rename from GL/glx/singlesize.h rename to glx/singlesize.h diff --git a/GL/glx/swap_interval.c b/glx/swap_interval.c similarity index 100% rename from GL/glx/swap_interval.c rename to glx/swap_interval.c diff --git a/GL/glx/unpack.h b/glx/unpack.h similarity index 100% rename from GL/glx/unpack.h rename to glx/unpack.h diff --git a/GL/glx/xfont.c b/glx/xfont.c similarity index 100% rename from GL/glx/xfont.c rename to glx/xfont.c