diff options
| author | skidau <skidau@gmail.com> | 2011-03-19 01:55:57 +0000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2011-03-19 01:55:57 +0000 |
| commit | 50c5dbdb096ebc340c8c40cd3b70c2ba865e0790 (patch) | |
| tree | 415116650c1b2a86b31a58a6b1accf54789a6509 /Source/Core/VideoCommon/Src/TextureDecoder.cpp | |
| parent | 4079523346c4a48e06621a97d4227c31c124ad7d (diff) | |
Added a toggle switch for the OpenMP texture decoder in the graphics settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7375 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, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index d75efd9c7c..85872a8b0e 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -693,7 +693,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh { #ifdef _OPENMP //Dont use multithreading in small Textures - if(width > 127 && height > 127) + if ((width > 127 && height > 127) && g_ActiveConfig.bOMPDecoder) { //don't span to many threads they will kill the rest of the emu :) omp_set_num_threads((cpu_info.num_cores + 2) / 3); @@ -968,7 +968,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) + if ((width > 127 && height > 127) && g_ActiveConfig.bOMPDecoder) { //don't span to many threads they will kill the rest of the emu :) omp_set_num_threads((cpu_info.num_cores + 2) / 3); |
