Module: Mesa Branch: master Commit: 9ec7f083f3f3e40081a452ceba8b0e7cd073fb47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ec7f083f3f3e40081a452ceba8b0e7cd073fb47
Author: Brian Paul <[email protected]> Date: Wed Mar 4 15:56:16 2009 -0700 mesa: move sse.h and 3dnow.h #includes --- src/mesa/x86/common_x86_asm.h | 9 --------- src/mesa/x86/x86.h | 35 ----------------------------------- src/mesa/x86/x86_xform.c | 9 +++++++++ 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h index 2e88682..0d39e3d 100644 --- a/src/mesa/x86/common_x86_asm.h +++ b/src/mesa/x86/common_x86_asm.h @@ -42,15 +42,6 @@ */ #include "common_x86_features.h" -#ifdef USE_X86_ASM -#ifdef USE_3DNOW_ASM -#include "3dnow.h" -#endif -#ifdef USE_SSE_ASM -#include "sse.h" -#endif -#endif - extern int _mesa_x86_cpu_features; extern void _mesa_get_x86_features(void); diff --git a/src/mesa/x86/x86.h b/src/mesa/x86/x86.h deleted file mode 100644 index 9ca17f0..0000000 --- a/src/mesa/x86/x86.h +++ /dev/null @@ -1,35 +0,0 @@ - -/* - * Mesa 3-D graphics library - * Version: 3.5 - * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. - * - * 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 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 - * BRIAN PAUL 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. - */ - -/* - * Intel x86 assembly code by Josh Vanderhoof - */ - -#ifndef __X86_H__ -#define __X86_H__ - -/*extern void _mesa_init_x86_transform_asm( void );*/ - -#endif diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c index 833d2cc..7dec7a9 100644 --- a/src/mesa/x86/x86_xform.c +++ b/src/mesa/x86/x86_xform.c @@ -35,6 +35,15 @@ #include "x86_xform.h" #include "common_x86_asm.h" +#ifdef USE_X86_ASM +#ifdef USE_3DNOW_ASM +#include "3dnow.h" +#endif +#ifdef USE_SSE_ASM +#include "sse.h" +#endif +#endif + #ifdef DEBUG_MATH #include "math/m_debug.h" #endif _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
