From eba81a0a01f8a61151d8bf9f3d83bda85ca26e73 Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Sat, 14 Apr 2007 18:30:09 +0300 Subject: [PATCH] glx: move __glXMesaProvider from GLcore module to glx module. This treats the GLcore provider similar to DRI provider, using a subset of XMesa as the GLcore interface. --- GL/glx/Makefile.am | 3 ++- GL/{mesa/X/xf86glx.c => glx/glxglcore.c} | 0 GL/mesa/X/Makefile.am | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename GL/{mesa/X/xf86glx.c => glx/glxglcore.c} (100%) diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index cd1130d61..c4141bceb 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -46,12 +46,13 @@ libglx_la_SOURCES = \ glxdrawable.h \ glxext.c \ glxext.h \ - glxvisuals.c \ + glxglcore.c \ glxscreens.c \ glxscreens.h \ glxserver.h \ glxutil.c \ glxutil.h \ + glxvisuals.c \ indirect_dispatch.c \ indirect_dispatch.h \ indirect_dispatch_swap.c \ diff --git a/GL/mesa/X/xf86glx.c b/GL/glx/glxglcore.c similarity index 100% rename from GL/mesa/X/xf86glx.c rename to GL/glx/glxglcore.c diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index f8f16c39e..ace118170 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -22,8 +22,6 @@ AM_CFLAGS = \ -DXFree86Server \ @GLX_DEFINES@ -libX_la_SOURCES = xf86glx.c - nodist_libX_la_SOURCES = \ xm_api.c \ xm_buffer.c \