From 22605caea8af801185b7f4a64e3bb078b8712732 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Wed, 26 Oct 2005 17:04:15 +0000 Subject: [PATCH] Remove few outdated r200 files. --- src/mesa/drivers/dri/r300/r200_sanity.h | 7 ----- src/mesa/drivers/dri/r300/r200_tcl.h | 50 ------------------------------- src/mesa/drivers/dri/r300/r200_tex.h | 51 -------------------------------- src/mesa/drivers/dri/r300/radeon_ioctl.c | 2 ++ src/mesa/drivers/dri/r300/radeon_lock.c | 2 ++ 5 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 src/mesa/drivers/dri/r300/r200_sanity.h delete mode 100644 src/mesa/drivers/dri/r300/r200_tcl.h delete mode 100644 src/mesa/drivers/dri/r300/r200_tex.h diff --git a/src/mesa/drivers/dri/r300/r200_sanity.h b/src/mesa/drivers/dri/r300/r200_sanity.h deleted file mode 100644 index 30852b4..0000000 --- a/src/mesa/drivers/dri/r300/r200_sanity.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef R200_SANITY_H -#define R200_SANITY_H - -extern int r200SanityCmdBuffer(r200ContextPtr rmesa, - int nbox, drm_clip_rect_t * boxes); - -#endif diff --git a/src/mesa/drivers/dri/r300/r200_tcl.h b/src/mesa/drivers/dri/r300/r200_tcl.h deleted file mode 100644 index 4528cf1..0000000 --- a/src/mesa/drivers/dri/r300/r200_tcl.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_tcl.h,v 1.2 2002/12/16 16:18:55 dawes Exp $ */ -/* -Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. - -The Weather Channel (TM) funded Tungsten Graphics to develop the -initial release of the Radeon 8500 driver under the XFree86 license. -This notice must be preserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Keith Whitwell - */ - -#ifndef __R200_TCL_H__ -#define __R200_TCL_H__ - -#ifdef GLX_DIRECT_RENDERING - -#include "r200_context.h" - -extern void r200TclPrimitive(GLcontext * ctx, GLenum prim, int hw_prim); -extern void r200EmitEltPrimitive(GLcontext * ctx, GLuint first, GLuint last, - GLuint flags); -extern void r200EmitPrimitive(GLcontext * ctx, GLuint first, GLuint last, - GLuint flags); - -#endif -#endif diff --git a/src/mesa/drivers/dri/r300/r200_tex.h b/src/mesa/drivers/dri/r300/r200_tex.h deleted file mode 100644 index bc0dbc3..0000000 --- a/src/mesa/drivers/dri/r300/r200_tex.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_tex.h,v 1.1 2002/10/30 12:51:53 alanh Exp $ */ -/* -Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. - -The Weather Channel (TM) funded Tungsten Graphics to develop the -initial release of the Radeon 8500 driver under the XFree86 license. -This notice must be preserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Keith Whitwell - */ - -#ifndef __R200_TEX_H__ -#define __R200_TEX_H__ - -#ifdef GLX_DIRECT_RENDERING - -extern void r200UpdateTextureState(GLcontext * ctx); - -extern int r200UploadTexImages(r200ContextPtr rmesa, r200TexObjPtr t, - GLuint face); - -extern void r200DestroyTexObj(r200ContextPtr rmesa, r200TexObjPtr t); - -extern void r200InitTextureFuncs(struct dd_function_table *functions); - -#endif -#endif /* __R200_TEX_H__ */ diff --git a/src/mesa/drivers/dri/r300/radeon_ioctl.c b/src/mesa/drivers/dri/r300/radeon_ioctl.c index fcde99d..4eee2e3 100644 --- a/src/mesa/drivers/dri/r300/radeon_ioctl.c +++ b/src/mesa/drivers/dri/r300/radeon_ioctl.c @@ -46,8 +46,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_ioctl.h" #include "r200_ioctl.h" #include "r300_ioctl.h" +#if R200_MERGED #include "r200_tcl.h" #include "r200_sanity.h" +#endif #include "r300_state.h" #include "radeon_reg.h" diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c index 7400fd7..430083e 100644 --- a/src/mesa/drivers/dri/r300/radeon_lock.c +++ b/src/mesa/drivers/dri/r300/radeon_lock.c @@ -35,7 +35,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r200_context.h" #include "radeon_lock.h" +#if R200_MERGED #include "r200_tex.h" +#endif #include "r200_state.h" #include "radeon_ioctl.h" #include "radeon_state.h" -- 2.7.4