Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1573] trunk/OpenMPT
|
From: <man...@us...> - 2013-03-15 22:30:23
|
Revision: 1573
http://sourceforge.net/p/modplug/code/1573
Author: manxorist
Date: 2013-03-15 22:30:14 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
[Var] ENABLE_AMD and ENABLE_AMDNOW had been used interchangeably, replace them both with ENABLE_3DNOW to better reflect what the feature macro really does.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/Mmx_mix.cpp
trunk/OpenMPT/soundlib/Snd_eq.cpp
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-03-15 22:09:13 UTC (rev 1572)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-03-15 22:30:14 UTC (rev 1573)
@@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
- PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW,ENABLE_MMX"
+ PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_3DNOW,ENABLE_SSE,ENABLE_MMX"
StringPooling="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
@@ -157,7 +157,7 @@
Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
- PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,ENABLE_MMX,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW"
+ PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,ENABLE_MMX,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_3DNOW,ENABLE_SSE"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="0"
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-15 22:09:13 UTC (rev 1572)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-15 22:30:14 UTC (rev 1573)
@@ -64,7 +64,7 @@
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;ENABLE_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_3DNOW;ENABLE_SSE;ENABLE_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ENABLE_MMX;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ENABLE_MMX;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_3DNOW;ENABLE_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2013-03-15 22:09:13 UTC (rev 1572)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2013-03-15 22:30:14 UTC (rev 1573)
@@ -503,7 +503,7 @@
#endif
-#ifdef ENABLE_AMD
+#ifdef ENABLE_3DNOW
extern void AMD_StereoMixToFloat(const int *pSrc, float *pOut1, float *pOut2, UINT nCount, const float _i2fc);
extern void AMD_FloatToStereoMix(const float *pIn1, const float *pIn2, int *pOut, UINT nCount, const float _f2ic);
extern void AMD_MonoMixToFloat(const int *pSrc, float *pOut, UINT nCount, const float _i2fc);
@@ -1825,7 +1825,7 @@
}
if (gdwSysInfo & SYSMIX_3DNOW)
{
-#ifdef ENABLE_AMD
+#ifdef ENABLE_3DNOW
AMD_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_pConfig->getIntToFloat());
#endif
return;
@@ -1845,7 +1845,7 @@
{
if (gdwSysInfo & SYSMIX_3DNOW)
{
-#ifdef ENABLE_AMDNOW
+#ifdef ENABLE_3DNOW
AMD_FloatToStereoMix(pIn1, pIn2, pOut, nCount, m_pConfig->getFloatToInt());
#endif
return;
@@ -1869,7 +1869,7 @@
}
if (gdwSysInfo & SYSMIX_3DNOW)
{
-#ifdef ENABLE_AMDNOW
+#ifdef ENABLE_3DNOW
AMD_MonoMixToFloat(pSrc, pOut, nCount, m_pConfig->getIntToFloat());
#endif
return;
@@ -1887,7 +1887,7 @@
{
if (gdwSysInfo & SYSMIX_3DNOW)
{
-#ifdef ENABLE_AMDNOW
+#ifdef ENABLE_3DNOW
AMD_FloatToMonoMix(pIn, pOut, nCount, m_pConfig->getFloatToInt());
#endif
return;
Modified: trunk/OpenMPT/soundlib/Mmx_mix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Mmx_mix.cpp 2013-03-15 22:09:13 UTC (rev 1572)
+++ trunk/OpenMPT/soundlib/Mmx_mix.cpp 2013-03-15 22:30:14 UTC (rev 1573)
@@ -7,7 +7,7 @@
* This file contains critical code. The basic X86 functions are
* defined at the bottom of the file. #define's are used to isolate
* the different flavours of functionality:
- * ENABLE_MMX, ENABLE_AMDNOW, ENABLE_SSE flags must be set to
+ * ENABLE_MMX, ENABLE_3DNOW, ENABLE_SSE flags must be set to
* to compile the optimized sections of the code. In both cases the
* X86_xxxxxx functions will compile.
*
@@ -172,7 +172,7 @@
////////////////////////////////////////////////////////////////////////////////////
// 3DNow! optimizations
-#ifdef ENABLE_AMDNOW
+#ifdef ENABLE_3DNOW
// Convert integer mix to floating-point
void AMD_StereoMixToFloat(const int *pSrc, float *pOut1, float *pOut2, UINT nCount, const float _i2fc)
Modified: trunk/OpenMPT/soundlib/Snd_eq.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_eq.cpp 2013-03-15 22:09:13 UTC (rev 1572)
+++ trunk/OpenMPT/soundlib/Snd_eq.cpp 2013-03-15 22:30:14 UTC (rev 1573)
@@ -27,7 +27,7 @@
#ifdef ENABLE_SSE
extern void SSE_MonoMixToFloat(const int *pSrc, float *pOut, UINT nCount, const float _i2fc);
#endif
-#ifdef ENABLE_AMD
+#ifdef ENABLE_3DNOW
extern void AMD_MonoMixToFloat(const int *pSrc, float *pOut, UINT nCount, const float _i2fc);
extern void AMD_FloatToMonoMix(const float *pIn, int *pOut, UINT nCount, const float _f2ic);
#endif
@@ -139,7 +139,7 @@
void AMD_StereoEQ(EQBANDSTRUCT *pbl, EQBANDSTRUCT *pbr, REAL *pbuffer, UINT nCount)
//---------------------------------------------------------------------------------
{
-#ifdef ENABLE_AMD
+#ifdef ENABLE_3DNOW
float tmp[16];
_asm {
@@ -377,9 +377,9 @@
} else
#endif // ENABLE_SSE
-#endif // ENABLE_AMD
+#endif // ENABLE_3DNOW
-#ifdef ENABLE_AMD
+#ifdef ENABLE_3DNOW
// We still perform the MMX check because the user can enable/disable this
@@ -397,7 +397,7 @@
AMD_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount*2, m_pConfig->getFloatToInt());
} else
-#endif // ENABLE_AMD
+#endif // ENABLE_3DNOW
{
X86_StereoMixToFloat(pbuffer, MixFloatBuffer, MixFloatBuffer+MIXBUFFERSIZE, nCount, m_pConfig->getIntToFloat());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
