diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-05 13:23:37 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-05 13:23:37 +0000 |
| commit | f20731b1c3995762c37f33b27dacf8b82fcb93c0 (patch) | |
| tree | eab9a8b55f925688c5aeb42012b313b5a5b73b1c /Source/Core/VideoCommon/Src/TextureDecoder.cpp | |
| parent | 7eade75476b01b0d66e3af1321f06274a6155369 (diff) | |
Fix OS X build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7298 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index d08f37dfff..0a062236ad 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -685,6 +685,7 @@ PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt) //need to add DXT support too PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt) { +#ifdef _OPENMP //Dont use multithreading in small Textures if(width > 127 && height > 127) { @@ -695,6 +696,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh { omp_set_num_threads(1); } +#endif int Wsteps4 = (width + 3) / 4; int Wsteps8 = (width + 7) / 8; switch (texformat) @@ -959,6 +961,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt) { +#ifdef _OPENMP if(width > 127 && height > 127) { //don't span to many threads they will kill the rest of the emu :) @@ -968,6 +971,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he { omp_set_num_threads(1); } +#endif int Wsteps4 = (width + 3) / 4; int Wsteps8 = (width + 7) / 8; switch (texformat) |