diff --git a/Engine/source/T3D/gameBase/gameConnection.cpp b/Engine/source/T3D/gameBase/gameConnection.cpp index 96a1bd51a..ccc31ff71 100644 --- a/Engine/source/T3D/gameBase/gameConnection.cpp +++ b/Engine/source/T3D/gameBase/gameConnection.cpp @@ -465,7 +465,7 @@ bool GameConnection::readConnectRequest(BitStream *stream, const char **errorStr connectArgv[i + 3] = mConnectArgv[i]; } connectArgv[0] = "onConnectRequest"; - connectArgv[1] = NULL; + connectArgv[1] = 0; char buffer[256]; Net::addressToString(getNetAddress(), buffer); connectArgv[2] = buffer; diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index fb0232051..72b067b1a 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -1647,7 +1647,7 @@ StringStackConsoleWrapper::~StringStackConsoleWrapper() { for (int i=0; i #include #include +#include #ifndef _TORQUE_TYPES_H_ #include "platform/types.h" @@ -229,9 +230,9 @@ int dItoa(int n, char s[]); // standard I/O functions [defined in platformString.cpp] extern void dPrintf(const char *format, ...); -extern S32 dVprintf(const char *format, void *arglist); +extern S32 dVprintf(const char *format, va_list arglist); extern S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...); -extern S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist); +extern S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, va_list arglist); extern S32 dSscanf(const char *buffer, const char *format, ...); #endif diff --git a/Engine/source/core/util/str.cpp b/Engine/source/core/util/str.cpp index d8d787fb0..62a819812 100644 --- a/Engine/source/core/util/str.cpp +++ b/Engine/source/core/util/str.cpp @@ -1434,19 +1434,19 @@ String::StrFormat::~StrFormat() dFree( _dynamicBuffer ); } -S32 String::StrFormat::format( const char *format, void *args ) +S32 String::StrFormat::format( const char *format, va_list args ) { _len=0; return formatAppend(format,args); } -S32 String::StrFormat::formatAppend( const char *format, void *args ) +S32 String::StrFormat::formatAppend( const char *format, va_list args ) { // Format into the fixed buffer first. S32 startLen = _len; if (_dynamicBuffer == NULL) { - _len += vsnprintf(_fixedBuffer + _len, sizeof(_fixedBuffer) - _len, format, *(va_list*)args); + _len += vsnprintf(_fixedBuffer + _len, sizeof(_fixedBuffer) - _len, format, args); if (_len >= 0 && _len < sizeof(_fixedBuffer)) return _len; @@ -1535,9 +1535,9 @@ String String::ToString(const char *str, ...) return ret; } -String String::VToString(const char* str, void* args) +String String::VToString(const char* str, va_list args) { - StrFormat format(str,&args); + StrFormat format(str,args); // Copy it into a string U32 len = format.length(); diff --git a/Engine/source/core/util/str.h b/Engine/source/core/util/str.h index 6b1c443f5..009484451 100644 --- a/Engine/source/core/util/str.h +++ b/Engine/source/core/util/str.h @@ -176,7 +176,7 @@ public: /// @{ static String ToString(const char *format, ...); - static String VToString(const char* format, void* args); + static String VToString(const char* format, va_list args); static String ToString( bool v ); static inline String ToString( U32 v ) { return ToString( "%u", v ); } @@ -245,7 +245,7 @@ public: _fixedBuffer[0] = '\0'; } - StrFormat(const char *formatStr, void *args) + StrFormat(const char *formatStr, va_list args) : _dynamicBuffer( NULL ), _dynamicSize( 0 ), _len( 0 ) @@ -255,8 +255,8 @@ public: ~StrFormat(); - S32 format( const char *format, void *args ); - S32 formatAppend( const char *format, void *args ); + S32 format( const char *format, va_list args ); + S32 formatAppend( const char *format, va_list args ); S32 append(const char * str, S32 len); S32 append(const char * str); @@ -357,7 +357,7 @@ class StringBuilder { va_list args; va_start(args, fmt); - return mFormat.formatAppend(fmt, &args); + return mFormat.formatAppend(fmt, args); } }; diff --git a/Engine/source/platform/platformAssert.h b/Engine/source/platform/platformAssert.h index c75a8dbc8..c26f255c0 100644 --- a/Engine/source/platform/platformAssert.h +++ b/Engine/source/platform/platformAssert.h @@ -78,6 +78,14 @@ public: { if ((x)==0) \ ::PlatformAssert::processAssert(::PlatformAssert::Warning, __FILE__, __LINE__, y); } + /*! + Helper macro called when AssertFatal failed. + Used for help static code analyzers. + */ + #ifndef ON_FAIL_ASSERTFATAL + #define ON_FAIL_ASSERTFATAL + #endif + /*! Assert that the statement x is true, otherwise halt. diff --git a/Engine/source/platform/platformCPUCount.cpp b/Engine/source/platform/platformCPUCount.cpp index 026cdbabf..c79924a66 100644 --- a/Engine/source/platform/platformCPUCount.cpp +++ b/Engine/source/platform/platformCPUCount.cpp @@ -21,6 +21,12 @@ // must ensure BIOS settings is not configured to restrict CPUID functionalities. //------------------------------------------------------------------------------------------------- +#if defined(TORQUE_OS_LINUX) || defined(LINUX) + +// TODO GCC code don't compile on Release with optimizations, mover code to platform layer + +#else + #include "platform/platform.h" #include "platform/platformCPUCount.h" @@ -666,3 +672,5 @@ next: #endif #endif + +#endif \ No newline at end of file diff --git a/Engine/source/platform/platformIntrinsics.gcc.h b/Engine/source/platform/platformIntrinsics.gcc.h index 3571d1df4..4b092d067 100644 --- a/Engine/source/platform/platformIntrinsics.gcc.h +++ b/Engine/source/platform/platformIntrinsics.gcc.h @@ -68,7 +68,7 @@ inline bool dCompareAndSwap( volatile U32& ref, U32 oldVal, U32 newVal ) #if defined(TORQUE_OS_PS3) return ( cellAtomicCompareAndSwap32( (std::uint32_t *)&ref, newVal, oldVal ) == oldVal ); #elif !defined(TORQUE_OS_MAC) - return ( __sync_val_compare_and_swap( ( volatile long* ) &ref, oldVal, newVal ) == oldVal ); + return ( __sync_val_compare_and_swap( &ref, oldVal, newVal ) == oldVal ); #else return OSAtomicCompareAndSwap32(oldVal, newVal, (int32_t *) &ref); #endif @@ -79,7 +79,7 @@ inline bool dCompareAndSwap( volatile U64& ref, U64 oldVal, U64 newVal ) #if defined(TORQUE_OS_PS3) return ( cellAtomicCompareAndSwap32( (std::uint32_t *)&ref, newVal, oldVal ) == oldVal ); #elif !defined(TORQUE_OS_MAC) - return ( __sync_val_compare_and_swap( ( volatile long long* ) &ref, oldVal, newVal ) == oldVal ); + return ( __sync_val_compare_and_swap( &ref, oldVal, newVal ) == oldVal ); #else return OSAtomicCompareAndSwap64(oldVal, newVal, (int64_t *) &ref); #endif diff --git a/Engine/source/platform/types.gcc.h b/Engine/source/platform/types.gcc.h index 1d49feacc..78df98d88 100644 --- a/Engine/source/platform/types.gcc.h +++ b/Engine/source/platform/types.gcc.h @@ -30,8 +30,13 @@ //-------------------------------------- // Types +#if TORQUE_X86 typedef signed long long S64; typedef unsigned long long U64; +#else +typedef signed long S64; +typedef unsigned long U64; +#endif //-------------------------------------- @@ -73,11 +78,11 @@ typedef unsigned long long U64; # define TORQUE_OS_PS3 # include "platform/types.posix.h" -#elif defined(linux) +#elif defined(linux) || defined(LINUX) # define TORQUE_OS_STRING "Linux" # define TORQUE_OS_LINUX -# define TORQUE_SUPPORTS_NASM -# define TORQUE_SUPPORTS_GCC_INLINE_X86_ASM +//# define TORQUE_SUPPORTS_NASM +//# define TORQUE_SUPPORTS_GCC_INLINE_X86_ASM # include "platform/types.posix.h" #elif defined(__OpenBSD__) @@ -115,6 +120,11 @@ typedef unsigned long long U64; # define TORQUE_CPU_X86 # define TORQUE_LITTLE_ENDIAN +#elif defined(__x86_64__) +# define TORQUE_CPU_STRING "Intel x64" +# define TORQUE_CPU_X64 +# define TORQUE_LITTLE_ENDIAN + #elif defined(__ppc__) # define TORQUE_CPU_STRING "PowerPC" # define TORQUE_CPU_PPC diff --git a/Engine/source/platform/types.posix.h b/Engine/source/platform/types.posix.h index faa708af7..37bfc41d7 100644 --- a/Engine/source/platform/types.posix.h +++ b/Engine/source/platform/types.posix.h @@ -29,7 +29,8 @@ // 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 int dsize_t; +#include +typedef size_t dsize_t; /** Platform dependent file date-time structure. The defination of this structure diff --git a/Engine/source/platformX86UNIX/x86UNIXCPUInfo.cpp b/Engine/source/platformX86UNIX/x86UNIXCPUInfo.cpp index 0fa7ca337..aed14e02a 100644 --- a/Engine/source/platformX86UNIX/x86UNIXCPUInfo.cpp +++ b/Engine/source/platformX86UNIX/x86UNIXCPUInfo.cpp @@ -27,130 +27,21 @@ #include "core/strings/stringFunctions.h" #include +#include "platform/platformCPUCount.h" +#include + Platform::SystemInfo_struct Platform::SystemInfo; -extern void PlatformBlitInit(); -extern void SetProcessorInfo(Platform::SystemInfo_struct::Processor& pInfo, - char* vendor, U32 processor, U32 properties, U32 properties2); // platform/platformCPU.cc +void Processor::init() {} -// asm cpu detection routine from platform code -extern "C" +// TODO LINUX CPUInfo::CPUCount better support +namespace CPUInfo { -void detectX86CPUInfo(char *vendor, U32 *processor, U32 *properties); -} + EConfig CPUCount(U32& TotAvailLogical, U32& TotAvailCore, U32& PhysicalNum) + { + PhysicalNum = TotAvailCore = 0; + TotAvailLogical = (int)sysconf(_SC_NPROCESSORS_ONLN); -/* used in the asm */ -static U32 time[2]; -static char vendor[13] = {0,}; -static U32 properties = 0; -static U32 processor = 0; -U32 clockticks = 0; -U32 timeHi = 0; -U32 timeLo = 0; - -void Processor::init() -{ - // Reference: - // www.cyrix.com - // www.amd.com - // www.intel.com - // http://developer.intel.com/design/PentiumII/manuals/24512701.pdf - Platform::SystemInfo.processor.type = CPU_X86Compatible; - Platform::SystemInfo.processor.name = StringTable->insert("Unknown x86 Compatible"); - Platform::SystemInfo.processor.mhz = 0; - Platform::SystemInfo.processor.properties = CPU_PROP_C; - - clockticks = properties = processor = time[0] = 0; - dStrcpy(vendor, ""); - - detectX86CPUInfo(vendor, &processor, &properties); - SetProcessorInfo(Platform::SystemInfo.processor, - vendor, processor, properties, 0); - - //-------------------------------------- - // if RDTSC support calculate the aproximate Mhz of the CPU - if (Platform::SystemInfo.processor.properties & CPU_PROP_RDTSC && - Platform::SystemInfo.processor.properties & CPU_PROP_FPU) - { - const U32 MS_INTERVAL = 750; - -#if defined(TORQUE_COMPILER_GCC) && ((__GNUC__ >= 3) && (__GNUC_MINOR__ >=4)) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ >=0)) - asm("rdtsc" : "=a" (timeLo), "=d" (timeHi)); -#else - __asm__( - "pushl %eax\n" - "pushl %edx\n" - "rdtsc\n" - "movl %eax, (time)\n" - "movl %edx, (time+4)\n" - "popl %edx\n" - "popl %eax\n" - ); -#endif - U32 ms = Platform::getRealMilliseconds(); - while ( Platform::getRealMilliseconds() < ms+MS_INTERVAL ) - { /* empty */ } - ms = Platform::getRealMilliseconds()-ms; -#if defined(TORQUE_COMPILER_GCC) && ((__GNUC__ >= 3) && (__GNUC_MINOR__ >= 4)) || ((__GNUC__ >= 4) && (__GNUC_MINOR__ >=0)) - asm( - "pushl %eax\n" - "pushl %edx\n" - "rdtsc\n" - "sub (timeHi), %edx\n" - "sbb (timeLo), %eax\n" - "mov %eax, (clockticks)\n" - "popl %edx\n" - "popl %eax\n" - ); -#else - asm( - "pushl %eax\n" - "pushl %edx\n" - "rdtsc\n" - "sub (time+4), %edx\n" - "sbb (time), %eax\n" - "mov %eax, (clockticks)\n" - "popl %edx\n" - "popl %eax\n" - ); -#endif - U32 mhz = static_cast(F32(clockticks) / F32(ms) / 1000.0f); - - // catch-22 the timing method used above to calc Mhz is generally - // wrong by a few percent so we want to round to the nearest clock - // multiple but we also want to be careful to not touch overclocked - // results - - // measure how close the Raw Mhz number is to the center of each clock - // bucket - U32 bucket25 = mhz % 25; - U32 bucket33 = mhz % 33; - U32 bucket50 = mhz % 50; - - if (bucket50 < 8 || bucket50 > 42) - Platform::SystemInfo.processor.mhz = - U32((mhz+(50.0f/2.0f))/50.0f) * 50; - else if (bucket25 < 5 || bucket25 > 20) - Platform::SystemInfo.processor.mhz = - U32((mhz+(25.0f/2.0f))/25.0f) * 25; - else if (bucket33 < 5 || bucket33 > 28) - Platform::SystemInfo.processor.mhz = - U32((mhz+(33.0f/2.0f))/33.0f) * 33; - else - Platform::SystemInfo.processor.mhz = U32(mhz); - } - - Con::printf("Processor Init:"); - Con::printf(" %s, %d Mhz", Platform::SystemInfo.processor.name, Platform::SystemInfo.processor.mhz); - if (Platform::SystemInfo.processor.properties & CPU_PROP_FPU) - Con::printf(" FPU detected"); - if (Platform::SystemInfo.processor.properties & CPU_PROP_MMX) - Con::printf(" MMX detected"); - if (Platform::SystemInfo.processor.properties & CPU_PROP_3DNOW) - Con::printf(" 3DNow detected"); - if (Platform::SystemInfo.processor.properties & CPU_PROP_SSE) - Con::printf(" SSE detected"); - Con::printf(" "); - - PlatformBlitInit(); -} + return CONFIG_SingleCoreHTDisabled; + } +}; // namespace CPUInfo diff --git a/Engine/source/sfx/openal/LoadOAL.h b/Engine/source/sfx/openal/LoadOAL.h index a2a11b829..0a58e074b 100644 --- a/Engine/source/sfx/openal/LoadOAL.h +++ b/Engine/source/sfx/openal/LoadOAL.h @@ -30,6 +30,9 @@ #if defined(TORQUE_OS_MAC) # include # include +#elif defined(TORQUE_OS_LINUX) +# include +# include #else # include # include diff --git a/Engine/source/sfx/openal/aldlist.cpp b/Engine/source/sfx/openal/aldlist.cpp index 13ee1409c..ce3fdb9eb 100644 --- a/Engine/source/sfx/openal/aldlist.cpp +++ b/Engine/source/sfx/openal/aldlist.cpp @@ -27,6 +27,8 @@ #include "aldlist.h" #if defined(TORQUE_OS_MAC) #include +#elif defined(TORQUE_OS_LINUX) +#include #else #include #endif diff --git a/Engine/source/sfx/openal/sfxALDevice.cpp b/Engine/source/sfx/openal/sfxALDevice.cpp index f2e00356c..de065fa06 100644 --- a/Engine/source/sfx/openal/sfxALDevice.cpp +++ b/Engine/source/sfx/openal/sfxALDevice.cpp @@ -60,7 +60,7 @@ SFXALDevice::SFXALDevice( SFXProvider *provider, AssertFatal( mDevice != NULL && mContext != NULL, "Failed to create OpenAL device and/or context!" ); // Start the update thread. - +#ifndef TORQUE_OS_LINUX if( !Con::getBoolVariable( "$_forceAllMainThread" ) ) { SFXInternal::gUpdateThread = new AsyncPeriodicUpdateThread @@ -68,6 +68,7 @@ SFXALDevice::SFXALDevice( SFXProvider *provider, Con::getIntVariable( "$pref::SFX::updateInterval", SFXInternal::DEFAULT_UPDATE_INTERVAL ) ); SFXInternal::gUpdateThread->start(); } +#endif } //----------------------------------------------------------------------------- diff --git a/Engine/source/sfx/openal/sfxALProvider.cpp b/Engine/source/sfx/openal/sfxALProvider.cpp index bd4f8cfdd..dc6714b5a 100644 --- a/Engine/source/sfx/openal/sfxALProvider.cpp +++ b/Engine/source/sfx/openal/sfxALProvider.cpp @@ -24,6 +24,7 @@ #include "sfx/sfxProvider.h" #include "sfx/openal/sfxALDevice.h" #include "sfx/openal/aldlist.h" +#include "sfx/openal/LoadOAL.h" #include "core/strings/stringFunctions.h" #include "console/console.h" diff --git a/Engine/source/windowManager/platformCursorController.cpp b/Engine/source/windowManager/platformCursorController.cpp index aba10a62c..8dbf03f92 100644 --- a/Engine/source/windowManager/platformCursorController.cpp +++ b/Engine/source/windowManager/platformCursorController.cpp @@ -28,8 +28,8 @@ void PlatformCursorController::pushCursor( S32 cursorID ) // Place the new cursor shape onto the stack mCursors.increment(); - CursorShape &shape = mCursors.last(); - shape.mCursorType = CursorShape::TYPE_RESOURCE; + Cursor_Shape &shape = mCursors.last(); + shape.mCursorType = Cursor_Shape::TYPE_RESOURCE; shape.mCursorID = cursorID; // Now Change the Cursor Shape. @@ -42,8 +42,8 @@ void PlatformCursorController::pushCursor( const UTF8 *fileName ) mCursors.increment(); // Store the Details. - CursorShape &shape = mCursors.last(); - shape.mCursorType = CursorShape::TYPE_FILE; + Cursor_Shape &shape = mCursors.last(); + shape.mCursorType = Cursor_Shape::TYPE_FILE; shape.mCursorFile = String::ToString( "%s", fileName ); // Now Change the Cursor Shape. @@ -71,11 +71,11 @@ void PlatformCursorController::refreshCursor() setCursorShape( mCursors.last(), false ); } -void PlatformCursorController::setCursorShape( const CursorShape &shape, bool reload ) +void PlatformCursorController::setCursorShape( const Cursor_Shape &shape, bool reload ) { switch( shape.mCursorType ) { - case CursorShape::TYPE_RESOURCE : + case Cursor_Shape::TYPE_RESOURCE : { // Set Resource. @@ -83,7 +83,7 @@ void PlatformCursorController::setCursorShape( const CursorShape &shape, bool re } break; - case CursorShape::TYPE_FILE : + case Cursor_Shape::TYPE_FILE : { // Set File. @@ -91,4 +91,4 @@ void PlatformCursorController::setCursorShape( const CursorShape &shape, bool re } break; } -} \ No newline at end of file +} diff --git a/Engine/source/windowManager/platformCursorController.h b/Engine/source/windowManager/platformCursorController.h index 339ed94d6..686f4d390 100644 --- a/Engine/source/windowManager/platformCursorController.h +++ b/Engine/source/windowManager/platformCursorController.h @@ -33,7 +33,7 @@ class PlatformCursorController { protected: - struct CursorShape + struct Cursor_Shape { enum Type { @@ -46,7 +46,7 @@ protected: String mCursorFile; // Points to a custom cursor file }; - Vector mCursors; + Vector mCursors; /// The PlatformWindow that owns this Cursor Controller PlatformWindow *mOwner; @@ -85,7 +85,7 @@ public: virtual void setCursorVisible( bool visible ) = 0; virtual bool isCursorVisible() = 0; - virtual void setCursorShape( const CursorShape &shape, bool reload ); + virtual void setCursorShape( const Cursor_Shape &shape, bool reload ); virtual void setCursorShape( U32 cursorID ) = 0; virtual void setCursorShape( const UTF8 *filename, bool reload ) = 0; @@ -99,4 +99,4 @@ public: virtual S32 getDoubleClickHeight() = 0; }; -#endif \ No newline at end of file +#endif diff --git a/Templates/Empty/game/shaders/common/postFx/gl/chromaticLens.glsl b/Templates/Empty/game/shaders/common/postFx/gl/chromaticLens.glsl index 0c02c3742..fdb85ba00 100644 --- a/Templates/Empty/game/shaders/common/postFx/gl/chromaticLens.glsl +++ b/Templates/Empty/game/shaders/common/postFx/gl/chromaticLens.glsl @@ -23,7 +23,7 @@ // Based on 'Cubic Lens Distortion HLSL Shader' by François Tarlier // www.francois-tarlier.com/blog/index.php/2009/11/cubic-lens-distortion-shader -#include "./postFx.glsl" +#include "./postFX.glsl" #include "../../gl/torque.glsl" #include "../../gl/hlslCompat.glsl" @@ -59,4 +59,4 @@ void main() } OUT_col = vec4( outColor.rgb, 1 ); -} \ No newline at end of file +} diff --git a/Templates/Empty/game/shaders/common/postFx/gl/flashP.glsl b/Templates/Empty/game/shaders/common/postFx/gl/flashP.glsl index a287a135f..fc5072e6d 100644 --- a/Templates/Empty/game/shaders/common/postFx/gl/flashP.glsl +++ b/Templates/Empty/game/shaders/common/postFx/gl/flashP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "./postFx.glsl" +#include "./postFX.glsl" #include "../../gl/torque.glsl" #include "../../gl/hlslCompat.glsl" diff --git a/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl b/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl index 01c7658aa..a7917b328 100644 --- a/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl +++ b/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl @@ -22,7 +22,7 @@ #include "../../../gl/hlslCompat.glsl" #include "shadergen:/autogenConditioners.h" -#include "../../gl/postFx.glsl" +#include "../../gl/postFX.glsl" uniform sampler2D backBuffer; // The original backbuffer. uniform sampler2D prepassTex; // The pre-pass depth and normals. diff --git a/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl b/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl index 4e06edb4b..6d78f4eae 100644 --- a/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl +++ b/Templates/Empty/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- #include "../../../gl/hlslCompat.glsl" -#include "../../gl/postFx.glsl" +#include "../../gl/postFX.glsl" uniform sampler2D frameSampler; uniform sampler2D backBuffer; diff --git a/Templates/Full/game/shaders/common/postFx/gl/chromaticLens.glsl b/Templates/Full/game/shaders/common/postFx/gl/chromaticLens.glsl index 0c02c3742..fdb85ba00 100644 --- a/Templates/Full/game/shaders/common/postFx/gl/chromaticLens.glsl +++ b/Templates/Full/game/shaders/common/postFx/gl/chromaticLens.glsl @@ -23,7 +23,7 @@ // Based on 'Cubic Lens Distortion HLSL Shader' by François Tarlier // www.francois-tarlier.com/blog/index.php/2009/11/cubic-lens-distortion-shader -#include "./postFx.glsl" +#include "./postFX.glsl" #include "../../gl/torque.glsl" #include "../../gl/hlslCompat.glsl" @@ -59,4 +59,4 @@ void main() } OUT_col = vec4( outColor.rgb, 1 ); -} \ No newline at end of file +} diff --git a/Templates/Full/game/shaders/common/postFx/gl/flashP.glsl b/Templates/Full/game/shaders/common/postFx/gl/flashP.glsl index a287a135f..fc5072e6d 100644 --- a/Templates/Full/game/shaders/common/postFx/gl/flashP.glsl +++ b/Templates/Full/game/shaders/common/postFx/gl/flashP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "./postFx.glsl" +#include "./postFX.glsl" #include "../../gl/torque.glsl" #include "../../gl/hlslCompat.glsl" diff --git a/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl b/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl index 01c7658aa..a7917b328 100644 --- a/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl +++ b/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayOccludeP.glsl @@ -22,7 +22,7 @@ #include "../../../gl/hlslCompat.glsl" #include "shadergen:/autogenConditioners.h" -#include "../../gl/postFx.glsl" +#include "../../gl/postFX.glsl" uniform sampler2D backBuffer; // The original backbuffer. uniform sampler2D prepassTex; // The pre-pass depth and normals. diff --git a/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl b/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl index 4e06edb4b..6d78f4eae 100644 --- a/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl +++ b/Templates/Full/game/shaders/common/postFx/lightRay/gl/lightRayP.glsl @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- #include "../../../gl/hlslCompat.glsl" -#include "../../gl/postFx.glsl" +#include "../../gl/postFX.glsl" uniform sampler2D frameSampler; uniform sampler2D backBuffer;