Added SuperRes SkipSoftening variant

mysteryx93 · May 2, 2016 · d13f85c · d13f85c
1 parent 5761767
commit d13f85c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Shaders/Shader.avsi b/Shaders/Shader.avsi
@@ -105,7 +105,10 @@ function SuperResPass(clip cmd, clip Input, clip Original, float Str, float Soft
 
 	cmd.Shader(ConvertYuv && MatrixIn=="601" ? "SuperResDownscaleAndDiff601.cso" : ConvertYuv ? "SuperResDownscaleAndDiff709.cso" : "SuperResDownscaleAndDiff.cso", Clip1=1, Clip2=2, Output=3)
 
-	Shader(Pass==Passes ? (MatrixOut=="601" ? "SuperResFinal601.cso" : ConvertYuv ? "SuperResFinal709.cso" : "SuperResFinal.cso") : "SuperRes.cso", Clip1=1, Clip2=3, Output=1, \
+	Shader(Pass==Passes ? \
+		(MatrixOut=="601" ? "SuperResFinal601.cso" : ConvertYuv ? "SuperResFinal709.cso" : "SuperResFinal.cso") : \
+		(Soft==0 ? "SuperResSkipSoftening.cso" : "SuperRes.cso"), \
+		Clip1=1, Clip2=3, Output=1, \
 		Param0=string(InputWidth) + "," + string(Input.Height) + "f", \
 		Param1=string(1./InputWidth, "%.32f") + "," + string(1./Input.Height, "%.32f") + "f", \
 		Param2=string(OriginalWidth) + "," + string(Original.Height) + "," + string(1./(OriginalWidth),"%.32f") + "," + string(1./Original.Height,"%.32f") + "f", \
@@ -182,7 +185,10 @@ function SuperResXbrPass(clip cmd, clip Input, float Str, float Soft, int Pass,
 
 	cmd.Shader(ConvertYuv && MatrixIn=="601" ? "SuperResDownscaleAndDiff601.cso" : ConvertYuv ? "SuperResDownscaleAndDiff709.cso" : "SuperResDownscaleAndDiff.cso", Clip1=1, Clip2=2, Output=3)
 
-	Shader(Pass==Passes ? (MatrixOut=="601" ? "SuperResFinal601.cso" : ConvertYuv ? "SuperResFinal709.cso" : "SuperResFinal.cso") : "SuperRes.cso", Clip1=1, Clip2=3, Output=1, \
+	Shader(Pass==Passes ? \
+		(MatrixOut=="601" ? "SuperResFinal601.cso" : ConvertYuv ? "SuperResFinal709.cso" : "SuperResFinal.cso") : \
+		(Soft==0 ? "SuperResSkipSoftening.cso" : "SuperRes.cso"), \
+		Clip1=1, Clip2=3, Output=1, \
 		Param0=string(InputWidth*2) + "," + string(Input.Height*2) + "f", \
 		Param1=string(1./(InputWidth*2), "%.32f") + "," + string(1./(Input.Height*2), "%.32f") + "f", \
 		Param2=string(InputWidth) + "," + string(Input.Height) + "," + string(1./InputWidth,"%.32f") + "," + string(1./Input.Height,"%.32f") + "f", \

diff --git a/Shaders/SuperRes/CompileHLSL.bat b/Shaders/SuperRes/CompileHLSL.bat
@@ -6,6 +6,8 @@
 
 "C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Utilities\bin\x86\fxc.exe" /T ps_3_0 /Fo "SuperRes.cso" "SuperRes\SuperRes.hlsl"
 
+"C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Utilities\bin\x86\fxc.exe" /T ps_3_0 /Fo "SuperResSkipSoftening.cso" "SuperRes\SuperRes.hlsl" /DSkipSoftening=1
+
 "C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Utilities\bin\x86\fxc.exe" /T ps_3_0 /Fo "SuperResFinal.cso" "SuperRes\SuperRes.hlsl" /DFinalPass=1
 
 "C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Utilities\bin\x86\fxc.exe" /T ps_3_0 /Fo "SuperResFinal709.cso" "SuperRes\SuperRes709.hlsl" /DFinalPass=1

diff --git a/Shaders/SuperResSkipSoftening.cso b/Shaders/SuperResSkipSoftening.cso
diff --git a/Shaders/TestSuperRes.avs b/Shaders/TestSuperRes.avs
@@ -4,7 +4,7 @@ LoadPlugin(PluginPath+"nnedi3.dll")
 LoadPlugin("Shader.dll")
 Import("Shader.avsi")
 
-#SetMTMode(3,8)
+SetMTMode(3,8)
 AviSource("F:\AVSMeter\Preview.avi", audio=false, pixel_type="YV12")
-#SetMTMode(2)
+SetMTMode(2)
 SuperRes(2, .43, 0, """nnedi3_rpow2(2, cshift="Spline16Resize", Threads=2)""", MatrixIn="601")