Removed the OpenMP option from the DolphinWX project. It was causing a slowdown when the EFB to texture option was activated. This means that the OpenMP texture decoder option will not be hidden for non-OpenMP builds.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7378 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Dolphin.vcxproj

@@ -160,7 +160,8 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>true</OpenMPSupport>
+      <OpenMPSupport>
+      </OpenMPSupport>
     </ClCompile>
     <Link />
     <PostBuildEvent>
@@ -189,7 +190,8 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>true</OpenMPSupport>
+      <OpenMPSupport>
+      </OpenMPSupport>
     </ClCompile>
     <Link />
     <PostBuildEvent>

Source/Core/DolphinWX/Src/VideoConfigDiag.cpp

@@ -427,9 +427,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	szr_misc->Add(opencl = new SettingCheckBox(page_advanced, _("Enable OpenCL"), opencl_tooltip, vconfig.bEnableOpenCL), 0, wxLEFT|wxBOTTOM, 5);
 	szr_misc->Add(dlcache = new SettingCheckBox(page_advanced, _("Enable Display List Caching"), dlc_tooltip, vconfig.bDlistCachingEnable), 0, wxBOTTOM, 5);
 	szr_misc->Add(hotkeys = new SettingCheckBox(page_advanced, _("Enable Hotkeys"), hotkeys_tooltip, vconfig.bOSDHotKey), 0, wxLEFT|wxBOTTOM, 5);
-#ifdef _OPENMP
 	szr_misc->Add(ompdecoder = new SettingCheckBox(page_advanced, _("OpenMP Texture Decoder"), omp_tooltip, vconfig.bOMPDecoder), 0, wxBOTTOM, 5);
-#endif
 
 	// postproc shader
 	if (vconfig.backend_info.PPShaders.size())
@@ -630,9 +628,7 @@ void VideoConfigDiag::SetUIValuesFromConfig()
 	crop->SetValue(vconfig.bCrop);
 	opencl->SetValue(vconfig.bEnableOpenCL);
 	dlcache->SetValue(vconfig.bDlistCachingEnable);
-#ifdef _OPENMP
 	ompdecoder->SetValue(vconfig.bOMPDecoder);
-#endif
 	hotkeys->SetValue(vconfig.bOSDHotKey);
 
 	if (choice_ppshader)

Source/Core/DolphinWX/Src/VideoConfigDiag.h

@@ -161,9 +161,7 @@ protected:
 	SettingCheckBox* opencl;
 	SettingCheckBox* dlcache;
 	SettingCheckBox* hotkeys;
-#ifdef _OPENMP
 	SettingCheckBox* ompdecoder;
-#endif
 	wxChoice* choice_ppshader;
 
 	// TODO: Add options for

Source/Core/VideoCommon/Src/VideoConfig.h

@@ -80,9 +80,10 @@ struct VideoConfig
 	bool bUseRealXFB;
 	bool bUseNativeMips;
 
-	// OpenCL
+	// OpenCL/OpenMP
 	bool bEnableOpenCL;
-	
+	bool bOMPDecoder;
+
 	// Enhancements
 	int iMultisampleMode;
 	int iEFBScale;
@@ -121,9 +122,7 @@ struct VideoConfig
 	// Hacks
 	bool bEFBAccessEnable;
 	bool bDlistCachingEnable;
-#ifdef _OPENMP
-	bool bOMPDecoder;
-#endif
+
 	bool bEFBCopyEnable;
 	bool bEFBCopyCacheEnable;
 	bool bEFBEmulateFormatChanges;