Skip to content

Commit c046c71

Browse files
Z-DanteZ-Dante
committed
Merge remote-tracking branch 'upstream/main' into dev_0.9_compute
2 parents 6636227 + 3026ba2 commit c046c71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1953
-475
lines changed

‎.github/workflows/build.yml

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818

1919
steps:
2020
- uses: actions/[email protected]
21+
22+
- name: Setup dotnet
23+
uses: actions/setup-dotnet@v2
24+
with:
25+
dotnet-version: '6.0.202'
2126

2227
- name: Load Conan cache
2328
uses: actions/cache@v2

‎Effects/ACNet.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
128128
for (j = 1; j <= 2; ++j) {
129129
uint2 destPos = gxy + uint2(i - 1, j - 1);
130130

131-
if (i != 1 && j != 1) {
131+
if (i != 1 || j != 1) {
132132
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
133133
continue;
134134
}
@@ -4274,7 +4274,7 @@ void Pass9(uint2 blockStart, uint3 threadId) {
42744274
for (uint j = 0; j <= 1; ++j) {
42754275
uint2 destPos = gxy + uint2(i, j);
42764276

4277-
if (i != 0 && j != 0) {
4277+
if (i != 0 || j != 0) {
42784278
if (!CheckViewport(destPos)) {
42794279
continue;
42804280
}

‎Effects/AdaptiveSharpen.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8989
for (j = 0; j <= 1; ++j) {
9090
const uint2 destPos = gxy + uint2(i, j);
9191

92-
if (i != 0 && j != 0) {
92+
if (i != 0 || j != 0) {
9393
if (!CheckViewport(destPos)) {
9494
continue;
9595
}

‎Effects/Anime4K_3D_AA_Upscale_US.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
7373
for (j = 1; j <= 2; ++j) {
7474
uint2 destPos = gxy + uint2(i - 1, j - 1);
7575

76-
if (i != 1 && j != 1) {
76+
if (i != 1 || j != 1) {
7777
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
7878
continue;
7979
}
@@ -139,7 +139,7 @@ void Pass2(uint2 blockStart, uint3 threadId) {
139139
for (j = 1; j <= 2; ++j) {
140140
uint2 destPos = gxy + uint2(i - 1, j - 1);
141141

142-
if (i != 1 && j != 1) {
142+
if (i != 1 || j != 1) {
143143
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
144144
continue;
145145
}

‎Effects/Anime4K_3D_Upscale_US.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
7474
for (j = 1; j <= 2; ++j) {
7575
uint2 destPos = gxy + uint2(i - 1, j - 1);
7676

77-
if (i != 1 && j != 1) {
77+
if (i != 1 || j != 1) {
7878
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
7979
continue;
8080
}
@@ -140,7 +140,7 @@ void Pass2(uint2 blockStart, uint3 threadId) {
140140
for (j = 1; j <= 2; ++j) {
141141
uint2 destPos = gxy + uint2(i - 1, j - 1);
142142

143-
if (i != 1 && j != 1) {
143+
if (i != 1 || j != 1) {
144144
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
145145
continue;
146146
}

‎Effects/Anime4K_Denoise_Bilateral_Mean.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
9090
for (j = 0; j <= 1; ++j) {
9191
uint2 destPos = gxy + uint2(i, j);
9292

93-
if (i != 0 && j != 0) {
93+
if (i != 0 || j != 0) {
9494
if (!CheckViewport(gxy)) {
9595
continue;
9696
}

‎Effects/Anime4K_Denoise_Bilateral_Mode.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8181
for (j = 0; j <= 1; ++j) {
8282
const uint2 destPos = gxy + uint2(i, j);
8383

84-
if (i != 0 && j != 0) {
84+
if (i != 0 || j != 0) {
8585
if (!CheckViewport(gxy)) {
8686
continue;
8787
}

‎Effects/Anime4K_Restore_L.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8080
for (j = 1; j <= 2; ++j) {
8181
uint2 destPos = gxy + uint2(i - 1, j - 1);
8282

83-
if (i != 1 && j != 1) {
83+
if (i != 1 || j != 1) {
8484
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
8585
continue;
8686
}

‎Effects/Anime4K_Restore_M.hlsl

+6-6
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
9393
for (j = 1; j <= 2; ++j) {
9494
uint2 destPos = gxy + uint2(i - 1, j - 1);
9595

96-
if (i != 1 && j != 1) {
96+
if (i != 1 || j != 1) {
9797
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
9898
continue;
9999
}
@@ -159,7 +159,7 @@ void Pass2(uint2 blockStart, uint3 threadId) {
159159
for (j = 1; j <= 2; ++j) {
160160
uint2 destPos = gxy + uint2(i - 1, j - 1);
161161

162-
if (i != 1 && j != 1) {
162+
if (i != 1 || j != 1) {
163163
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
164164
continue;
165165
}
@@ -234,7 +234,7 @@ void Pass3(uint2 blockStart, uint3 threadId) {
234234
for (j = 1; j <= 2; ++j) {
235235
uint2 destPos = gxy + uint2(i - 1, j - 1);
236236

237-
if (i != 1 && j != 1) {
237+
if (i != 1 || j != 1) {
238238
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
239239
continue;
240240
}
@@ -309,7 +309,7 @@ void Pass4(uint2 blockStart, uint3 threadId) {
309309
for (j = 1; j <= 2; ++j) {
310310
uint2 destPos = gxy + uint2(i - 1, j - 1);
311311

312-
if (i != 1 && j != 1) {
312+
if (i != 1 || j != 1) {
313313
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
314314
continue;
315315
}
@@ -384,7 +384,7 @@ void Pass5(uint2 blockStart, uint3 threadId) {
384384
for (j = 1; j <= 2; ++j) {
385385
uint2 destPos = gxy + uint2(i - 1, j - 1);
386386

387-
if (i != 1 && j != 1) {
387+
if (i != 1 || j != 1) {
388388
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
389389
continue;
390390
}
@@ -459,7 +459,7 @@ void Pass6(uint2 blockStart, uint3 threadId) {
459459
for (j = 1; j <= 2; ++j) {
460460
uint2 destPos = gxy + uint2(i - 1, j - 1);
461461

462-
if (i != 1 && j != 1) {
462+
if (i != 1 || j != 1) {
463463
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
464464
continue;
465465
}

‎Effects/Anime4K_Restore_Soft_L.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8080
for (j = 1; j <= 2; ++j) {
8181
uint2 destPos = gxy + uint2(i - 1, j - 1);
8282

83-
if (i != 1 && j != 1) {
83+
if (i != 1 || j != 1) {
8484
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
8585
continue;
8686
}

‎Effects/Anime4K_Restore_Soft_M.hlsl

+6-6
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
9393
for (j = 1; j <= 2; ++j) {
9494
uint2 destPos = gxy + uint2(i - 1, j - 1);
9595

96-
if (i != 1 && j != 1) {
96+
if (i != 1 || j != 1) {
9797
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
9898
continue;
9999
}
@@ -159,7 +159,7 @@ void Pass2(uint2 blockStart, uint3 threadId) {
159159
for (j = 1; j <= 2; ++j) {
160160
uint2 destPos = gxy + uint2(i - 1, j - 1);
161161

162-
if (i != 1 && j != 1) {
162+
if (i != 1 || j != 1) {
163163
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
164164
continue;
165165
}
@@ -234,7 +234,7 @@ void Pass3(uint2 blockStart, uint3 threadId) {
234234
for (j = 1; j <= 2; ++j) {
235235
uint2 destPos = gxy + uint2(i - 1, j - 1);
236236

237-
if (i != 1 && j != 1) {
237+
if (i != 1 || j != 1) {
238238
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
239239
continue;
240240
}
@@ -309,7 +309,7 @@ void Pass4(uint2 blockStart, uint3 threadId) {
309309
for (j = 1; j <= 2; ++j) {
310310
uint2 destPos = gxy + uint2(i - 1, j - 1);
311311

312-
if (i != 1 && j != 1) {
312+
if (i != 1 || j != 1) {
313313
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
314314
continue;
315315
}
@@ -384,7 +384,7 @@ void Pass5(uint2 blockStart, uint3 threadId) {
384384
for (j = 1; j <= 2; ++j) {
385385
uint2 destPos = gxy + uint2(i - 1, j - 1);
386386

387-
if (i != 1 && j != 1) {
387+
if (i != 1 || j != 1) {
388388
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
389389
continue;
390390
}
@@ -459,7 +459,7 @@ void Pass6(uint2 blockStart, uint3 threadId) {
459459
for (j = 1; j <= 2; ++j) {
460460
uint2 destPos = gxy + uint2(i - 1, j - 1);
461461

462-
if (i != 1 && j != 1) {
462+
if (i != 1 || j != 1) {
463463
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
464464
continue;
465465
}

‎Effects/Anime4K_Restore_VL.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
9393
for (j = 1; j <= 2; ++j) {
9494
uint2 destPos = gxy + uint2(i - 1, j - 1);
9595

96-
if (i != 1 && j != 1) {
96+
if (i != 1 || j != 1) {
9797
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
9898
continue;
9999
}

‎Effects/Anime4K_Thin_HQ.hlsl

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void Pass2(uint2 blockStart, uint3 threadId) {
140140
for (uint j = 0; j <= 1; ++j) {
141141
const uint2 destPos = gxy + uint2(i, j);
142142

143-
if (i != 0 && j != 0) {
143+
if (i != 0 || j != 0) {
144144
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
145145
continue;
146146
}
@@ -197,7 +197,7 @@ void Pass3(uint2 blockStart, uint3 threadId) {
197197
for (uint j = 0; j <= 1; ++j) {
198198
const uint2 destPos = gxy + uint2(i, j);
199199

200-
if (i != 0 && j != 0) {
200+
if (i != 0 || j != 0) {
201201
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
202202
continue;
203203
}
@@ -293,7 +293,7 @@ void Pass5(uint2 blockStart, uint3 threadId) {
293293
for (uint j = 0; j <= 1; ++j) {
294294
const uint2 destPos = gxy + uint2(i, j);
295295

296-
if (i != 0 && j != 0) {
296+
if (i != 0 || j != 0) {
297297
if (!CheckViewport(destPos)) {
298298
continue;
299299
}

‎Effects/Anime4K_Upscale_Denoise_L.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8585
for (j = 1; j <= 2; ++j) {
8686
uint2 destPos = gxy + uint2(i - 1, j - 1);
8787

88-
if (i != 1 && j != 1) {
88+
if (i != 1 || j != 1) {
8989
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
9090
continue;
9191
}

‎Effects/Anime4K_Upscale_GAN_x2_S.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
109109
for (j = 1; j <= 2; ++j) {
110110
uint2 destPos = gxy + uint2(i - 1, j - 1);
111111

112-
if (i != 1 && j != 1) {
112+
if (i != 1 || j != 1) {
113113
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
114114
continue;
115115
}

‎Effects/Anime4K_Upscale_L.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
8484
for (j = 1; j <= 2; ++j) {
8585
uint2 destPos = gxy + uint2(i - 1, j - 1);
8686

87-
if (i != 1 && j != 1) {
87+
if (i != 1 || j != 1) {
8888
if (destPos.x >= inputSize.x || destPos.y >= inputSize.y) {
8989
continue;
9090
}

‎Effects/Effects.vcxproj

+15
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,21 @@
320320
<FileType>Document</FileType>
321321
</CopyFileToFolders>
322322
</ItemGroup>
323+
<ItemGroup>
324+
<CopyFileToFolders Include="MMPX.hlsl">
325+
<FileType>Document</FileType>
326+
</CopyFileToFolders>
327+
</ItemGroup>
328+
<ItemGroup>
329+
<CopyFileToFolders Include="NNEDI3_nns16_win8x4.hlsl">
330+
<FileType>Document</FileType>
331+
</CopyFileToFolders>
332+
</ItemGroup>
333+
<ItemGroup>
334+
<CopyFileToFolders Include="NNEDI3_nns64_win8x6.hlsl">
335+
<FileType>Document</FileType>
336+
</CopyFileToFolders>
337+
</ItemGroup>
323338
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
324339
<ImportGroup Label="ExtensionTargets">
325340
</ImportGroup>

‎Effects/Effects.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,8 @@
6767
<CopyFileToFolders Include="LCAS.hlsl" />
6868
<CopyFileToFolders Include="CatmullRom.hlsl" />
6969
<CopyFileToFolders Include="CAS_Scaling.hlsl" />
70+
<CopyFileToFolders Include="MMPX.hlsl" />
71+
<CopyFileToFolders Include="NNEDI3_nns16_win8x4.hlsl" />
72+
<CopyFileToFolders Include="NNEDI3_nns64_win8x6.hlsl" />
7073
</ItemGroup>
7174
</Project>

‎Effects/FSRCNNX.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ void Pass6(uint2 blockStart, uint3 threadId) {
607607
for (uint j = 0; j <= 1; ++j) {
608608
const uint2 destPos = gxy + uint2(i, j);
609609

610-
if (i != 0 && j != 0) {
610+
if (i != 0 || j != 0) {
611611
if (!CheckViewport(destPos)) {
612612
continue;
613613
}

‎Effects/FSRCNNX_LineArt.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ void Pass6(uint2 blockStart, uint3 threadId) {
606606
for (uint j = 0; j <= 1; ++j) {
607607
const uint2 destPos = gxy + uint2(i, j);
608608

609-
if (i != 0 && j != 0) {
609+
if (i != 0 || j != 0) {
610610
if (!CheckViewport(destPos)) {
611611
continue;
612612
}

‎Effects/FXAA_High.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
5757
for (j = 0; j <= 1; ++j) {
5858
uint2 destPos = gxy + uint2(i, j);
5959

60-
if (i != 1 && j != 1) {
60+
if (i != 0 || j != 0) {
6161
if (!CheckViewport(gxy)) {
6262
return;
6363
}

‎Effects/FXAA_Medium.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
5757
for (j = 0; j <= 1; ++j) {
5858
uint2 destPos = gxy + uint2(i, j);
5959

60-
if (i != 1 && j != 1) {
60+
if (i != 0 || j != 0) {
6161
if (!CheckViewport(gxy)) {
6262
return;
6363
}

‎Effects/FXAA_Ultra.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void Pass1(uint2 blockStart, uint3 threadId) {
5757
for (j = 0; j <= 1; ++j) {
5858
uint2 destPos = gxy + uint2(i, j);
5959

60-
if (i != 1 && j != 1) {
60+
if (i != 0 || j != 0) {
6161
if (!CheckViewport(gxy)) {
6262
return;
6363
}

‎Effects/FineSharp.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ void Pass5(uint2 blockStart, uint3 threadId) {
423423
for (j = 1; j <= 2; ++j) {
424424
uint2 destPos = gxy + uint2(i - 1, j - 1);
425425

426-
if (i != 1 && j != 1) {
426+
if (i != 1 || j != 1) {
427427
if (!CheckViewport(destPos)) {
428428
continue;
429429
}

0 commit comments

Comments
 (0)