Skip to content

Commit 28535a4

Browse files
bloc97bloc97
committed
Fix depth-to-space error in upscale shaders
1 parent e35062e commit 28535a4

10 files changed

+30
-30
lines changed

‎glsl/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_L.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,11 @@ vec4 hook() {
438438
}
439439
//!DESC Anime4K-v3.2-Upscale-Denoise-CNN-x2-(L)-Depth-to-Space
440440
//!HOOK MAIN
441+
//!BIND MAIN
441442
//!BIND conv2d_last_tf
442443
//!BIND conv2d_last_tf1
443444
//!BIND conv2d_last_tf2
444-
//!SAVE depth_to_space2_tf
445-
//!COMPONENTS 4
445+
//!SAVE MAIN
446446
//!WIDTH conv2d_last_tf.w 2 *
447447
//!HEIGHT conv2d_last_tf.h 2 *
448448
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -457,5 +457,5 @@ vec4 hook() {
457457
ivec2 i2 = ivec2(f2 * vec2(2.0));
458458
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
459459
float c3 = c2;
460-
return vec4(c0, c1, c2, c3);
460+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
461461
}

‎glsl/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_M.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ vec4 hook() {
283283
}
284284
//!DESC Anime4K-v3.2-Upscale-Denoise-CNN-x2-(M)-Depth-to-Space
285285
//!HOOK MAIN
286+
//!BIND MAIN
286287
//!BIND conv2d_last_tf
287-
//!SAVE depth_to_space2_tf
288-
//!COMPONENTS 4
288+
//!SAVE MAIN
289289
//!WIDTH conv2d_last_tf.w 2 *
290290
//!HEIGHT conv2d_last_tf.h 2 *
291291
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -296,5 +296,5 @@ vec4 hook() {
296296
float c1 = c0;
297297
float c2 = c1;
298298
float c3 = c2;
299-
return vec4(c0, c1, c2, c3);
299+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
300300
}

‎glsl/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_S.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ vec4 hook() {
141141
}
142142
//!DESC Anime4K-v3.2-Upscale-Denoise-CNN-x2-(S)-Depth-to-Space
143143
//!HOOK MAIN
144+
//!BIND MAIN
144145
//!BIND conv2d_last_tf
145-
//!SAVE depth_to_space2_tf
146-
//!COMPONENTS 4
146+
//!SAVE MAIN
147147
//!WIDTH conv2d_last_tf.w 2 *
148148
//!HEIGHT conv2d_last_tf.h 2 *
149149
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -154,5 +154,5 @@ vec4 hook() {
154154
float c1 = c0;
155155
float c2 = c1;
156156
float c3 = c2;
157-
return vec4(c0, c1, c2, c3);
157+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
158158
}

‎glsl/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_UL.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,11 +1679,11 @@ vec4 hook() {
16791679
}
16801680
//!DESC Anime4K-v3.2-Upscale-Denoise-CNN-x2-(UL)-Depth-to-Space
16811681
//!HOOK MAIN
1682+
//!BIND MAIN
16821683
//!BIND conv2d_last_tf
16831684
//!BIND conv2d_last_tf1
16841685
//!BIND conv2d_last_tf2
1685-
//!SAVE depth_to_space2_tf
1686-
//!COMPONENTS 4
1686+
//!SAVE MAIN
16871687
//!WIDTH conv2d_last_tf.w 2 *
16881688
//!HEIGHT conv2d_last_tf.h 2 *
16891689
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -1698,5 +1698,5 @@ vec4 hook() {
16981698
ivec2 i2 = ivec2(f2 * vec2(2.0));
16991699
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
17001700
float c3 = c2;
1701-
return vec4(c0, c1, c2, c3);
1701+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
17021702
}

‎glsl/Upscale+Denoise/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,11 +946,11 @@ vec4 hook() {
946946
}
947947
//!DESC Anime4K-v3.2-Upscale-Denoise-CNN-x2-(VL)-Depth-to-Space
948948
//!HOOK MAIN
949+
//!BIND MAIN
949950
//!BIND conv2d_last_tf
950951
//!BIND conv2d_last_tf1
951952
//!BIND conv2d_last_tf2
952-
//!SAVE depth_to_space2_tf
953-
//!COMPONENTS 4
953+
//!SAVE MAIN
954954
//!WIDTH conv2d_last_tf.w 2 *
955955
//!HEIGHT conv2d_last_tf.h 2 *
956956
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -965,5 +965,5 @@ vec4 hook() {
965965
ivec2 i2 = ivec2(f2 * vec2(2.0));
966966
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
967967
float c3 = c2;
968-
return vec4(c0, c1, c2, c3);
968+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
969969
}

‎glsl/Upscale/Anime4K_Upscale_CNN_x2_L.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,11 @@ vec4 hook() {
438438
}
439439
//!DESC Anime4K-v3.2-Upscale-CNN-x2-(L)-Depth-to-Space
440440
//!HOOK MAIN
441+
//!BIND MAIN
441442
//!BIND conv2d_last_tf
442443
//!BIND conv2d_last_tf1
443444
//!BIND conv2d_last_tf2
444-
//!SAVE depth_to_space2_tf
445-
//!COMPONENTS 4
445+
//!SAVE MAIN
446446
//!WIDTH conv2d_last_tf.w 2 *
447447
//!HEIGHT conv2d_last_tf.h 2 *
448448
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -457,5 +457,5 @@ vec4 hook() {
457457
ivec2 i2 = ivec2(f2 * vec2(2.0));
458458
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
459459
float c3 = c2;
460-
return vec4(c0, c1, c2, c3);
460+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
461461
}

‎glsl/Upscale/Anime4K_Upscale_CNN_x2_M.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,9 @@ vec4 hook() {
283283
}
284284
//!DESC Anime4K-v3.2-Upscale-CNN-x2-(M)-Depth-to-Space
285285
//!HOOK MAIN
286+
//!BIND MAIN
286287
//!BIND conv2d_last_tf
287-
//!SAVE depth_to_space2_tf
288-
//!COMPONENTS 4
288+
//!SAVE MAIN
289289
//!WIDTH conv2d_last_tf.w 2 *
290290
//!HEIGHT conv2d_last_tf.h 2 *
291291
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -296,5 +296,5 @@ vec4 hook() {
296296
float c1 = c0;
297297
float c2 = c1;
298298
float c3 = c2;
299-
return vec4(c0, c1, c2, c3);
299+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
300300
}

‎glsl/Upscale/Anime4K_Upscale_CNN_x2_S.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ vec4 hook() {
141141
}
142142
//!DESC Anime4K-v3.2-Upscale-CNN-x2-(S)-Depth-to-Space
143143
//!HOOK MAIN
144+
//!BIND MAIN
144145
//!BIND conv2d_last_tf
145-
//!SAVE depth_to_space2_tf
146-
//!COMPONENTS 4
146+
//!SAVE MAIN
147147
//!WIDTH conv2d_last_tf.w 2 *
148148
//!HEIGHT conv2d_last_tf.h 2 *
149149
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -154,5 +154,5 @@ vec4 hook() {
154154
float c1 = c0;
155155
float c2 = c1;
156156
float c3 = c2;
157-
return vec4(c0, c1, c2, c3);
157+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
158158
}

‎glsl/Upscale/Anime4K_Upscale_CNN_x2_UL.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,11 +1679,11 @@ vec4 hook() {
16791679
}
16801680
//!DESC Anime4K-v3.2-Upscale-CNN-x2-(UL)-Depth-to-Space
16811681
//!HOOK MAIN
1682+
//!BIND MAIN
16821683
//!BIND conv2d_last_tf
16831684
//!BIND conv2d_last_tf1
16841685
//!BIND conv2d_last_tf2
1685-
//!SAVE depth_to_space2_tf
1686-
//!COMPONENTS 4
1686+
//!SAVE MAIN
16871687
//!WIDTH conv2d_last_tf.w 2 *
16881688
//!HEIGHT conv2d_last_tf.h 2 *
16891689
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -1698,5 +1698,5 @@ vec4 hook() {
16981698
ivec2 i2 = ivec2(f2 * vec2(2.0));
16991699
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
17001700
float c3 = c2;
1701-
return vec4(c0, c1, c2, c3);
1701+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
17021702
}

‎glsl/Upscale/Anime4K_Upscale_CNN_x2_VL.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,11 +946,11 @@ vec4 hook() {
946946
}
947947
//!DESC Anime4K-v3.2-Upscale-CNN-x2-(VL)-Depth-to-Space
948948
//!HOOK MAIN
949+
//!BIND MAIN
949950
//!BIND conv2d_last_tf
950951
//!BIND conv2d_last_tf1
951952
//!BIND conv2d_last_tf2
952-
//!SAVE depth_to_space2_tf
953-
//!COMPONENTS 4
953+
//!SAVE MAIN
954954
//!WIDTH conv2d_last_tf.w 2 *
955955
//!HEIGHT conv2d_last_tf.h 2 *
956956
//!WHEN OUTPUT.w MAIN.w / 1.200 > OUTPUT.h MAIN.h / 1.200 > *
@@ -965,5 +965,5 @@ vec4 hook() {
965965
ivec2 i2 = ivec2(f2 * vec2(2.0));
966966
float c2 = conv2d_last_tf2_tex((vec2(0.5) - f2) * conv2d_last_tf2_pt + conv2d_last_tf2_pos)[i2.y * 2 + i2.x];
967967
float c3 = c2;
968-
return vec4(c0, c1, c2, c3);
968+
return vec4(c0, c1, c2, c3) + MAIN_tex(MAIN_pos);
969969
}

0 commit comments

Comments
 (0)