diff --git a/Engine/source/console/debugOutputConsumer.h b/Engine/source/console/debugOutputConsumer.h index 335f30170..2bfd81cd2 100644 --- a/Engine/source/console/debugOutputConsumer.h +++ b/Engine/source/console/debugOutputConsumer.h @@ -25,9 +25,7 @@ #include "platform/platform.h" -//#define TORQUE_LOCBUILD - -#if !defined(TORQUE_DEBUG) && !defined(TORQUE_LOCBUILD) +#if !defined(TORQUE_DEBUG) #define DISABLE_DEBUG_SPEW #endif diff --git a/Engine/source/platform/platform.h b/Engine/source/platform/platform.h index 9bcfadd43..2fe7a16b5 100644 --- a/Engine/source/platform/platform.h +++ b/Engine/source/platform/platform.h @@ -122,7 +122,6 @@ enum ProcessorProperties CPU_PROP_MP = (1<<11), ///< This is a multi-processor system. CPU_PROP_LE = (1<<12), ///< This processor is LITTLE ENDIAN. CPU_PROP_64bit = (1<<13), ///< This processor is 64-bit capable - CPU_PROP_ALTIVEC = (1<<14), ///< Supports AltiVec instruction set extension (PPC only). }; /// Processor info manager. diff --git a/Engine/source/platform/types.codewarrior.h b/Engine/source/platform/types.codewarrior.h index db0d60400..137e14b22 100644 --- a/Engine/source/platform/types.codewarrior.h +++ b/Engine/source/platform/types.codewarrior.h @@ -89,12 +89,6 @@ typedef unsigned long long U64; ///< Compiler independent Unsigned 64-bit in # elif __ide_target("Torque-W32-Release") # undef TORQUE_SUPPORTS_NASM # endif - -#elif defined(__POWERPC__) -# define TORQUE_CPU_STRING "PowerPC" -# define TORQUE_CPU_PPC -# define TORQUE_BIG_ENDIAN - #else # error "CW: Unsupported Target CPU" #endif diff --git a/Engine/source/platform/typesPPC.h b/Engine/source/platform/typesPPC.h deleted file mode 100644 index 2ec1d1cfd..000000000 --- a/Engine/source/platform/typesPPC.h +++ /dev/null @@ -1,99 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// 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 THE -// AUTHORS OR COPYRIGHT HOLDERS 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. -//----------------------------------------------------------------------------- - -#ifndef _TYPES_PPC_H_ -#define _TYPES_PPC_H_ - -// We have to check this. Since every file will eventually wind up including -// this header, but not every header includes a windows or system header... -// -#ifndef NULL -#define NULL 0 -#endif - -// Let's just have this in a nice central location. Again, since every file -// will wind up including this file, we can affect compilation most effectively -// from this location. -// -#define PLATFORM_BIG_ENDIAN - -#define FN_CDECL - - -//------------------------------------------------------------------------------ -//-------------------------------------- Basic Types... - -typedef signed char S8; -typedef unsigned char U8; - -typedef signed short S16; -typedef unsigned short U16; - -typedef signed int S32; -typedef unsigned int U32; - -typedef signed long long S64; -typedef unsigned long long U64; - -typedef float F32; -typedef double F64; - -// size_t is needed to overload new -// size_t tends to be OS and compiler specific and may need to -// be if/def'ed in the future -typedef unsigned long dsize_t; - -typedef const char* StringTableEntry; - -// 64-bit structure for storing the date/time for a file -// The date and time, specified in seconds since the unix epoch. -// NOTE: currently, this is only 32-bits in value, so the upper 32 are all zeroes. -typedef U64 FileTime; - - -//------------------------------------------------------------------------------ -//-------------------------------------- Type constants... -#define __EQUAL_CONST_F F32(0.000001) - -static const F32 Float_One = F32(1.0); -static const F32 Float_Half = F32(0.5); -static const F32 Float_Zero = F32(0.0); -static const F32 Float_Pi = F32(3.14159265358979323846); -static const F32 Float_2Pi = F32(2.0 * 3.14159265358979323846); - -static const S8 S8_MIN = S8(-128); -static const S8 S8_MAX = S8(127); -static const U8 U8_MAX = U8(255); - -static const S16 S16_MIN = S16(-32768); -static const S16 S16_MAX = S16(32767); -static const U16 U16_MAX = U16(65535); - -static const S32 S32_MIN = S32(-2147483647 - 1); -static const S32 S32_MAX = S32(2147483647); -static const U32 U32_MAX = U32(0xffffffff); - -static const F32 F32_MAX = F32(3.402823466e+38F); -static const F32 F32_MIN = F32(1.175494351e-38F); - - -#endif //_TYPES_PPC_H_ diff --git a/Engine/source/ts/arch/tsMeshIntrinsics.arch.h b/Engine/source/ts/arch/tsMeshIntrinsics.arch.h index 210e4029f..04bb9d795 100644 --- a/Engine/source/ts/arch/tsMeshIntrinsics.arch.h +++ b/Engine/source/ts/arch/tsMeshIntrinsics.arch.h @@ -27,10 +27,6 @@ # // x86 CPU family implementations extern void zero_vert_normal_bulk_SSE(const dsize_t count, U8 * __restrict const outPtr, const dsize_t outStride); # -#elif defined(TORQUE_CPU_PPC) -# // PPC CPU family implementations -extern void zero_vert_normal_bulk_gccvec(const dsize_t count, U8 * __restrict const outPtr, const dsize_t outStride); -# #else # // Other CPU types go here... #endif diff --git a/Engine/source/ts/tsMeshIntrinsics.cpp b/Engine/source/ts/tsMeshIntrinsics.cpp index 696decd57..8c778338b 100644 --- a/Engine/source/ts/tsMeshIntrinsics.cpp +++ b/Engine/source/ts/tsMeshIntrinsics.cpp @@ -66,12 +66,6 @@ MODULE_BEGIN( TSMeshIntrinsics ) zero_vert_normal_bulk = zero_vert_normal_bulk_SSE; #endif } - else if(Platform::SystemInfo.processor.properties & CPU_PROP_ALTIVEC) - { - #if defined(TORQUE_CPU_PPC) - zero_vert_normal_bulk = zero_vert_normal_bulk_gccvec; - #endif - } } MODULE_END;