mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-07 17:29:36 +00:00
add macos workflow, fix filesystem_async max thread count
This commit is contained in:
@@ -88,14 +88,7 @@ namespace ImageLoader
|
||||
|
||||
Assert( IsFormatValidForConversion( imageFormat ) );
|
||||
|
||||
#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
|
||||
if ( IsPC() )
|
||||
{
|
||||
// running as a win32 tool, data is in expected order
|
||||
// for conversion code
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef _X360
|
||||
// running on 360 and converting, input data must be x86 order
|
||||
// swap to ensure conversion code gets valid data
|
||||
XGENDIANTYPE xEndian;
|
||||
@@ -137,7 +130,7 @@ namespace ImageLoader
|
||||
{
|
||||
Assert( IsFormatValidForConversion( imageFormat ) );
|
||||
|
||||
#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
|
||||
#ifdef _X360
|
||||
// It would have been nice to use the 360 D3DFORMAT bit encodings, but the codes
|
||||
// are different for win32, and this routine is used by a win32 library to
|
||||
// manipulate 360 data, so there can be no reliance on D3DFORMAT bits
|
||||
@@ -201,7 +194,7 @@ namespace ImageLoader
|
||||
{
|
||||
Assert( IsFormatValidForConversion( imageFormat ) );
|
||||
|
||||
#if !defined( DX_TO_GL_ABSTRACTION ) && !defined( NO_X360_XDK )
|
||||
#ifdef _X360
|
||||
XGENDIANTYPE xEndian;
|
||||
switch ( imageFormat )
|
||||
{
|
||||
@@ -256,5 +249,4 @@ namespace ImageLoader
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -288,13 +288,11 @@ int GetNumMipMapLevels( int width, int height, int depth )
|
||||
// Turn off warning about FOURCC formats below...
|
||||
#pragma warning (disable:4063)
|
||||
|
||||
#ifdef DX_TO_GL_ABSTRACTION
|
||||
#ifndef MAKEFOURCC
|
||||
#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
|
||||
((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
|
||||
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
|
||||
#endif //defined(MAKEFOURCC)
|
||||
#endif
|
||||
//-----------------------------------------------------------------------------
|
||||
// convert back and forth from D3D format to ImageFormat, regardless of
|
||||
// whether it's supported or not
|
||||
|
||||
Reference in New Issue
Block a user