From 1636328b0adefcebcc204d63980184a6d592efae Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 10 Jan 2009 11:57:13 -0700 Subject: [PATCH] xmesa: deprecate the "XMesa" interface Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no longer considered public. --- src/mesa/drivers/x11/fakeglx.c | 1 - src/mesa/drivers/x11/xm_api.c | 1 - src/mesa/drivers/x11/xm_buffer.c | 1 - {include/GL => src/mesa/drivers/x11}/xmesa.h | 0 src/mesa/drivers/x11/xmesaP.h | 2 +- {include/GL => src/mesa/drivers/x11}/xmesa_x.h | 0 {include/GL => src/mesa/drivers/x11}/xmesa_xf86.h | 0 7 files changed, 1 insertion(+), 4 deletions(-) rename {include/GL => src/mesa/drivers/x11}/xmesa.h (100%) rename {include/GL => src/mesa/drivers/x11}/xmesa_x.h (100%) rename {include/GL => src/mesa/drivers/x11}/xmesa_xf86.h (100%) diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index 827d39f9957..ea3585258d8 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -42,7 +42,6 @@ #include "glxheader.h" #include "glxapi.h" -#include "GL/xmesa.h" #include "main/context.h" #include "main/config.h" #include "main/macros.h" diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index c9009bad031..18aa8bcc096 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -63,7 +63,6 @@ #endif #include "glxheader.h" -#include "GL/xmesa.h" #include "xmesaP.h" #include "main/context.h" #include "main/extensions.h" diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c index f104d44d051..7ad67bc34da 100644 --- a/src/mesa/drivers/x11/xm_buffer.c +++ b/src/mesa/drivers/x11/xm_buffer.c @@ -30,7 +30,6 @@ #include "glxheader.h" -#include "GL/xmesa.h" #include "xmesaP.h" #include "main/imports.h" #include "main/framebuffer.h" diff --git a/include/GL/xmesa.h b/src/mesa/drivers/x11/xmesa.h similarity index 100% rename from include/GL/xmesa.h rename to src/mesa/drivers/x11/xmesa.h diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 98867ac7106..6a6c9ef6004 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -27,7 +27,7 @@ #define XMESAP_H -#include "GL/xmesa.h" +#include "xmesa.h" #include "main/mtypes.h" #if defined(FX) #include "GL/fxmesa.h" diff --git a/include/GL/xmesa_x.h b/src/mesa/drivers/x11/xmesa_x.h similarity index 100% rename from include/GL/xmesa_x.h rename to src/mesa/drivers/x11/xmesa_x.h diff --git a/include/GL/xmesa_xf86.h b/src/mesa/drivers/x11/xmesa_xf86.h similarity index 100% rename from include/GL/xmesa_xf86.h rename to src/mesa/drivers/x11/xmesa_xf86.h