[Mesa-dev] [PATCH v2 13/19] swr: [rasterizer common] add OSX to unix portability sections

[Rowley, Timothy O]

> On May 17, 2016, at 6:10 PM, Ian Romanick <idr at freedesktop.org> wrote:
> 
> On 05/17/2016 03:36 PM, Tim Rowley wrote:
>> ---
>> src/gallium/drivers/swr/rasterizer/common/os.h              | 9 ++++++++-
>> src/gallium/drivers/swr/rasterizer/common/rdtsc_buckets.cpp | 2 +-
>> 2 files changed, 9 insertions(+), 2 deletions(-)
>> 
>> diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
>> index 8b15670..b97b005 100644
>> --- a/src/gallium/drivers/swr/rasterizer/common/os.h
>> +++ b/src/gallium/drivers/swr/rasterizer/common/os.h
>> @@ -69,7 +69,7 @@ static inline void AlignedFree(void* p)
>> #define _mm_popcount_sizeT _mm_popcnt_u32
>> #endif
>> 
>> -#elif defined(FORCE_LINUX) || defined(__linux__) || defined(__gnu_linux__)
>> +#elif defined(__APPLE__) || defined(FORCE_LINUX) || defined(__linux__) || defined(__gnu_linux__)
>> 
>> #define SWR_API
>> 
>> @@ -81,6 +81,7 @@ static inline void AlignedFree(void* p)
>> #include <unistd.h>
>> #include <sys/stat.h>
>> #include <stdio.h>
>> +#include <limits.h>
>> 
>> typedef void            VOID;
>> typedef void*           LPVOID;
>> @@ -96,6 +97,8 @@ typedef unsigned int    DWORD;
>> #undef TRUE
>> #define TRUE 1
>> 
>> +#define MAX_PATH PATH_MAX
>> +
>> #define OSALIGN(RWORD, WIDTH) RWORD __attribute__((aligned(WIDTH)))
>> #define THREAD __thread
>> #ifndef INLINE
>> @@ -187,6 +190,10 @@ void AlignedFree(void* p)
>>     free(p);
>> }
>> 
>> +#define _countof(a) (sizeof(a)/sizeof(*(a)))
> 
> There'a already an ARRAY_SIZE() macro that does this.

The swr/rasterizer directory is intended to be usable standalone, so it has some duplication of common utilities.

>> +
>> +#define sprintf_s sprintf
>> +#define strcpy_s(dst,size,src) strncpy(dst,src,size)
>> #define GetCurrentProcessId getpid
>> #define GetCurrentThreadId gettid
>> 
>> diff --git a/src/gallium/drivers/swr/rasterizer/common/rdtsc_buckets.cpp b/src/gallium/drivers/swr/rasterizer/common/rdtsc_buckets.cpp
>> index df09f6c..8df5deb 100644
>> --- a/src/gallium/drivers/swr/rasterizer/common/rdtsc_buckets.cpp
>> +++ b/src/gallium/drivers/swr/rasterizer/common/rdtsc_buckets.cpp
>> @@ -32,7 +32,7 @@
>> 
>> #if defined(_WIN32)
>> #define PATH_SEPARATOR "\\"
>> -#elif defined(__unix__)
>> +#elif defined(__unix__) || defined(__APPLE__)
>> #define PATH_SEPARATOR "/"
>> #else
>> #error "Unsupported platform"