Updated headers to support Avisynth+ 3.6

mysteryx93 · Jun 17, 2020 · 2481cd0 · 2481cd0
1 parent bf1befb
commit 2481cd0
Show file tree

Hide file tree

Showing 15 changed files with 1,914 additions and 1,095 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+Version 1.6.6: June 17th 2020
+- Updated headers to support Avisynth+ 3.6
+
 Version 1.6.5: May 13th 2018
 - Fixed crash on NVidia cards when PlanarOut=true
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# AviSynth Shader v1.6.5
+# AviSynth Shader v1.6.6
 
 <a href="https://github.com/mysteryx93/AviSynthShader/releases">Download here >></a>
 

diff --git a/Src/AviSynthShader.vcxproj b/Src/AviSynthShader.vcxproj
@@ -23,29 +23,29 @@
     <RootNamespace>eedi3</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>Shader</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -205,6 +205,7 @@
     <ClInclude Include="MemoryPool.h" />
     <ClInclude Include="PixelFormatParser.h" />
     <ClInclude Include="PooledTexture.h" />
+    <ClInclude Include="posix.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Shader.h" />
     <ClInclude Include="D3D9RenderImpl.h" />

diff --git a/Src/AviSynthShader.vcxproj.filters b/Src/AviSynthShader.vcxproj.filters
@@ -56,6 +56,9 @@
     <ClInclude Include="D3D9Include.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="PixelFormatParser.h" />
+    <ClInclude Include="posix.h">
+      <Filter>avs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="avs">

diff --git a/Src/ConvertShader.cpp b/Src/ConvertShader.cpp
@@ -153,7 +153,7 @@ PVideoFrame __stdcall ConvertShader::GetFrame(int n, IScriptEnvironment* env) {
 
     void* b = useLut ? reinterpret_cast<void*>(lut.data()) : buff;
     if (isPlusMt) { // if avs+MT, allocate buffer at every GetFrame() via buffer pool.
-        b = static_cast<IScriptEnvironment2*>(env)->Allocate(floatBufferPitch, 32, AVS_POOLED_ALLOC);
+        env->Allocate(floatBufferPitch, 32, AVS_POOLED_ALLOC);
         if (!b) {
             env->ThrowError("%s Failed to allocate temporal buffer.", name.c_str());
         }
@@ -162,7 +162,7 @@ PVideoFrame __stdcall ConvertShader::GetFrame(int n, IScriptEnvironment* env) {
     mainProc(dstp, srcp, dst->GetPitch(), src->GetPitch(), procWidth, procHeight, b);
 
     if (isPlusMt) {
-        static_cast<IScriptEnvironment2*>(env)->Free(b);
+        env->Free(b);
     }
 
     return dst;

diff --git a/Src/ExecuteShader.cpp b/Src/ExecuteShader.cpp
@@ -32,8 +32,7 @@ ExecuteShader::ExecuteShader(PClip _child, PClip _clip1, PClip _clip2, PClip _cl
 
 	// Runs as MT_NICE_FILTER in AviSynth+ MT, otherwise MT_MULTI_INSTANCE
 	if (env->FunctionExists("SetFilterMTMode") && SUPPORT_MT_NICE_FILTER == true) {
-		auto env2 = static_cast<IScriptEnvironment2*>(env);
-		int ThreadCount = env2->GetProperty(AEP_THREADPOOL_THREADS);
+		int ThreadCount = env->GetEnvProperty(AEP_THREADPOOL_THREADS);
 		if (m_enginesCount > ThreadCount)
 			m_enginesCount = ThreadCount;
 	}