Fix: SetMaxCPU to alter cpuFlags per-env-instance value not a common singleton member. mentioned in #440

- env->GetCPUFlags works per environment, not per loaded DLL's flags
- make SetMaxCPU set distinct flag per ScriptEnvironment

Author: pinterf

avs_core/core/avisynth.cpp

@@ -1073,6 +1073,8 @@ class ScriptEnvironment {
 
   CacheMode cacheMode;
 
+  int cpuFlags;
+
   void InitMT();
 };
 
@@ -2438,10 +2440,12 @@ ScriptEnvironment::ScriptEnvironment()
   cacheMode(CACHE_DEFAULT)
 {
 #ifdef XP_TLS
-    if(dwTlsIndex == 0)
-      throw("ScriptEnvironment: TlsAlloc failed on DLL load");
+  if(dwTlsIndex == 0)
+    throw("ScriptEnvironment: TlsAlloc failed on DLL load");
 #endif
 
+  cpuFlags = ::GetCPUFlags();
+
   try {
 #ifdef AVS_WINDOWS
     // Make sure COM is initialised
@@ -2952,7 +2956,7 @@ void ScriptEnvironment::SetMaxCPU(const char* features)
     }
   }
 
-  ::SetMaxCPU(cpu_flags);
+  cpuFlags = cpu_flags;
 }
 
 ClipDataStore* ScriptEnvironment::ClipData(IClip *clip)
@@ -3199,7 +3203,7 @@ void ScriptEnvironment::CheckVersion(int version) {
     ThrowError("Plugin was designed for a later version of Avisynth (%d)", version);
 }
 
-int ScriptEnvironment::GetCPUFlags() { return ::GetCPUFlags(); }
+int ScriptEnvironment::GetCPUFlags() { return cpuFlags; }
 
 void ScriptEnvironment::AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) {
   this->AddFunction(name, params, apply, user_data, NULL);

avs_core/core/cpuid.cpp

@@ -185,6 +185,3 @@ int GetCPUFlags() {
   return _CPUFlags::getInstance().GetCPUFlags();
 }
 
-void SetMaxCPU(int new_flags) {
-  _CPUFlags::getInstance().SetCPUFlags(new_flags);
-}

avs_core/include/avs/cpuid.h

@@ -75,7 +75,6 @@ enum {
 
 #ifdef BUILDING_AVSCORE
 int GetCPUFlags();
-void SetMaxCPU(int new_flags);
 #endif
 
 #endif // AVSCORE_CPUID_H