TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' into EngineAssetify_Followups

Browse source
This commit is contained in:
AzaezelX 2021-07-28 13:51:44 -05:00
commit 3fad050028
12 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/lib/convexDecomp/NvThreadConfig.cpp
View file

@ -133,9 +133,15 @@ void tc_spinloop()
// Pause would do nothing on the Xbox. Threads are not scheduled.
#elif defined( _WIN64 )
YieldProcessor( );
#elif defined( __APPLE__ )||(__linux__)
#elif defined( __APPLE__ )
pthread_yield_np();
#else
#elif defined(__linux__)
#if defined(_POSIX_PRIORITY_SCHEDULING)
sched_yield();
#else
asm("pause");
#endif
#elif
__asm { pause };
#endif
}

1
Engine/source/gfx/gfxStringEnumTranslate.cpp
View file

@ -131,6 +131,7 @@ void GFXStringEnumTranslate::init()
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR16F );
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR16G16F );
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR10G10B10A2 );
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR11G11B10);
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR8G8B8_SRGB );
GFX_STRING_ASSIGN_MACRO( GFXStringTextureFormat, GFXFormatR8G8B8A8_LINEAR_FORCE );