Remove src/mesa/ppc

It didn't actually do anything except modify the GL_RENDERER string.

diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc
index 386d6a75e62280738fceb65b9ea25dfbd970e94f..fdf3c5c7a33d16d487c709bacdb658a3f6a3134e 100644 (file)
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -7,6 +7,3 @@ CONFIG_NAME = linux-dri-ppc
 
 OPT_FLAGS = -Os -mcpu=603
 PIC_FLAGS = -fPIC
-
-ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
-MESA_ASM_SOURCES = $(PPC_SOURCES)

diff --git a/configure.ac b/configure.ac
index 0f45df5b0a92367fc0456ea0710ca446850c0391..a68a90f3a8b32d3e2491680a5fce360e30409467 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -519,11 +519,6 @@ if test "x$enable_asm" = xyes; then
         GLAPI_ASM_SOURCES='$(X86-64_API)'
         AC_MSG_RESULT([yes, x86_64])
         ;;
-    ppc)
-        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"
-        MESA_ASM_SOURCES='$(PPC_SOURCES)'
-        AC_MSG_RESULT([yes, ppc])
-        ;;
     sparc)
         ASM_FLAGS="-DUSE_SPARC_ASM"
         MESA_ASM_SOURCES='$(SPARC_SOURCES)'

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 4754fbfc8c0711ccf6ecab90b9306f649b52f13d..e9b1f6aaf2f150511d3852a66ae2c524edb655c1 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -423,14 +423,6 @@ if env['gcc'] and env['platform'] != 'windows':
             'x86-64/x86-64.c',
             'x86-64/xform4.S',
         ]
-    elif env['machine'] == 'ppc':
-        env.Append(CPPDEFINES = [
-            'USE_PPC_ASM',
-            'USE_VMX_ASM',
-        ])
-        mesa_sources += [
-            'ppc/common_ppc.c',
-        ]
     elif env['machine'] == 'sparc':
         mesa_sources += [
             'sparc/sparc.c',

diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index 6363512961af843e537cc02c7e7b29e121f47d76..0d7971bcc47e5698b3196798fbf56b442b97947f 100644 (file)
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -83,24 +83,6 @@ _mesa_get_cpu_string(void)
 
    strcat(buffer, "SPARC");
 
-#elif defined(USE_PPC_ASM)
-
-   if (_mesa_ppc_cpu_features) {
-      strcat(buffer, (cpu_has_64) ? "PowerPC 64" : "PowerPC");
-   }
-
-# ifdef USE_VMX_ASM
-
-   if (cpu_has_vmx) {
-      strcat(buffer, "/Altivec");
-   }
-
-# endif
-
-   if (! cpu_has_fpu) {
-      strcat(buffer, "/No FPU");
-   }
-
 #endif
 
    assert(strlen(buffer) < MAX_STRING);

diff --git a/src/mesa/main/cpuinfo.h b/src/mesa/main/cpuinfo.h
index c41a90b075acd7ad262142751e78db6a7023e208..bf846ef40d6a430b5b57b1eb8702433507f89416 100644 (file)
--- a/src/mesa/main/cpuinfo.h
+++ b/src/mesa/main/cpuinfo.h
@@ -31,10 +31,6 @@
 #include "x86/common_x86_asm.h"
 #endif
 
-#if defined(USE_PPC_ASM)
-#include "ppc/common_ppc_features.h"
-#endif
-
 
 extern void
 _mesa_get_cpu_features(void);

diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 369f2c6e9571bed8193b2948d3010336e3444a1a..61ad3c7533a8e50e8878ec1ca5a87a51e4bd4721 100644 (file)
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -58,10 +58,6 @@
 #include "sparc/sparc.h"
 #endif
 
-#ifdef USE_PPC_ASM
-#include "ppc/common_ppc_features.h"
-#endif
-
 clip_func _mesa_clip_tab[5];
 clip_func _mesa_clip_np_tab[5];
 dotprod_func _mesa_dotprod_tab[5];
@@ -120,8 +116,6 @@ _math_init_transformation( void )
    _mesa_init_all_x86_transform_asm();
 #elif defined( USE_SPARC_ASM )
    _mesa_init_all_sparc_transform_asm();
-#elif defined( USE_PPC_ASM )
-   _mesa_init_all_ppc_transform_asm();
 #elif defined( USE_X86_64_ASM )
    _mesa_init_all_x86_64_transform_asm();
 #endif

diff --git a/src/mesa/ppc/common_ppc.c b/src/mesa/ppc/common_ppc.c
deleted file mode 100644 (file)
index c7cec96..0000000
--- a/src/mesa/ppc/common_ppc.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2004
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM AND/OR THEIR 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.
- */
-
-/**
- * \file common_ppc.c
- * Check CPU capabilities & initialize optimized funtions for this particular
- * processor.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#ifdef USE_PPC_ASM
-#include <elf.h>
-#endif
-
-#include "common_ppc_features.h"
-
-
-unsigned long _mesa_ppc_cpu_features = 0;
-
-/**
- * Detect CPU features and install optimized transform and lighting routines.
- * Currently, CPU features are only detected.  The optimized routines have
- * yet to be written.
- * 
- * \bug
- * This routine is highly specific to Linux kernel 2.6.  I'm still waiting
- * to hear back from the glibc folk on how to do this "right".
- */
-
-void _mesa_init_all_ppc_transform_asm( void )
-{
-#ifdef USE_PPC_ASM
-   const pid_t  my_pid = getpid();
-   char file_name[32];
-   FILE * f;
-#ifdef __powerpc64__
-   Elf64_auxv_t  v;
-#else
-   Elf32_auxv_t  v;
-#endif
-
-   sprintf( file_name, "/proc/%u/auxv", (unsigned) my_pid );
-   f = fopen( file_name, "rb" );
-   if ( f != NULL ) {
-      while( 1 ) {
-        ssize_t elem = fread( & v, sizeof( v ), 1, f );
-
-        if ( elem < 1 ) {
-           break;
-        }
-
-        if ( v.a_type == AT_HWCAP ) {
-           _mesa_ppc_cpu_features = v.a_un.a_val;
-           break;
-        }
-      }
-
-      fclose( f );
-   }
-   
-# ifndef USE_VMX_ASM
-   _mesa_ppc_cpu_features &= ~PPC_FEATURE_HAS_ALTIVEC;
-# endif
-#endif
-}

diff --git a/src/mesa/ppc/common_ppc_features.h b/src/mesa/ppc/common_ppc_features.h
deleted file mode 100644 (file)
index 9cde422..0000000
--- a/src/mesa/ppc/common_ppc_features.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2004
- * 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
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, 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 NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM AND/OR THEIR 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.
- */
-
-/**
- * \file common_ppc_features.h
- * Interface for determining which CPU features were detected.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#ifndef COMMON_PPC_FEATURES_H
-#define COMMON_PPC_FEATURES_H
-
-#ifdef USE_PPC_ASM
-#include <asm/cputable.h>
-
-extern unsigned long _mesa_ppc_cpu_features;
-
-
-/* The PPC_FEATURE_* values come from asm/cputable.h.  Should we define
- * versions of them here if that file does not exist?  This will only
- * matter once these code paths are supported on non-Linux platforms.
- */
-
-#define cpu_has_64  ((_mesa_ppc_cpu_features & PPC_FEATURE_64) != 0)
-#define cpu_has_vmx ((_mesa_ppc_cpu_features & PPC_FEATURE_HAS_ALTIVEC) != 0)
-#define cpu_has_fpu ((_mesa_ppc_cpu_features & PPC_FEATURE_HAS_FPU) != 0)
-
-#endif /* USE_PPC_ASM */
-
-extern void _mesa_init_all_ppc_transform_asm( void );
-
-#endif /* COMMON_PPC_FEATURES_H */

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 165a6c85ec33e461fd5bfdca2bad060a035a8233..b57a10e4d1c6ec4ba0074c2a7055b7c4cffd84d7 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -277,7 +277,6 @@ ASM_C_SOURCES =     \
        x86/sse.c \
        x86/rtasm/x86sse.c \
        sparc/sparc.c \
-       ppc/common_ppc.c \
        x86-64/x86-64.c
 
 X86_SOURCES =                  \
@@ -336,7 +335,6 @@ MESA_GALLIUM_SOURCES = \
        $(VBO_SOURCES)          \
        $(STATETRACKER_SOURCES) \
        $(PROGRAM_SOURCES)      \
-       ppc/common_ppc.c        \
        x86/common_x86.c
 
 MESA_GALLIUM_CXX_SOURCES = \