Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 10:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs on Texture Factory.

Browse Source 
Removed useless functions on Texture Factory.
Reordered load functions on Texture Factory.
Moved Draw calls to cTexture instead of Drawing inside the Texture Factory.
Added GetNumGPUs function on utils.
Renamed soil files.
Added optional compilation with LLVM.
Added TODOs, and defined the future of the developing of the library ( ordered by priority, starting the most important from the top ).
This commit is contained in:
spartanj
2010-07-08 02:37:47 -03:00
parent 2f0d7efa7e
commit c3ef149618
25 changed files with 702 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/utils/utils.cpp
View File

@@ -3,6 +3,7 @@
#if EE_PLATFORM == EE_PLATFORM_APPLE
#include <CoreFoundation/CoreFoundation.h>
#include <sys/sysctl.h>
#elif EE_PLATFORM == EE_PLATFORM_WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
@@ -10,6 +11,7 @@
#include <windows.h>
#elif EE_PLATFORM == EE_PLATFORM_LINUX
#include <libgen.h>
#include <unistd.h>
#endif
#if EE_PLATFORM == EE_PLATFORM_WIN32
@@ -275,15 +277,20 @@ Uint32 MakeHash( const std::string& str ) {
}
Uint32 MakeHash( const Int8* str ) {
Uint32 hash = 5381 + *str;
if ( NULL != str ) {
Uint32 hash = 5381 + *str;
while( *str ) {
hash = *str + ( hash << 6 ) + ( hash << 16 ) - hash;
str++;
while( *str ) {
hash = *str + ( hash << 6 ) + ( hash << 16 ) - hash;
str++;
}
hash += *( str - 1 );
return hash;
}
hash += *( str - 1 );
return hash;
return 0;
}
bool FileGet( const std::string& path, std::vector<Uint8>& data ) {
@@ -321,4 +328,38 @@ bool FileCopy( const std::string& src, const std::string& dst ) {
return false;
}
eeInt GetNumCPUs() {
eeInt nprocs = -1;
#if EE_PLATFORM == EE_PLATFORM_WIN32
SYSTEM_INFO info;
GetSystemInfo(&info);
nprocs = (eeInt) info.dwNumberOfProcessors;
#elif EE_PLATFORM == EE_PLATFORM_LINUX
nprocs = sysconf(_SC_NPROCESSORS_ONLN);
#elif EE_PLATFORM == EE_PLATFORM_APPLE
int mib[2];
size_t len;
int maxproc = 1;
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
len = sizeof(maxproc);
// sysctl != 0 == error
if ( sysctl(mib, 2, &maxproc, &len, NULL, NULL == -1) )
return 1;
nprocs = maxproc;
#else
#warning GetNumCPUs not implemented for this platform
#endif
if ( nprocs < 0 )
nprocs = 1;
return nprocs;
}
}}