From 259ff81f4b8d63800bdaa752e3f05df3e3df3761 Mon Sep 17 00:00:00 2001 From: fishcu Date: Sun, 13 Aug 2023 01:09:28 +0200 Subject: [PATCH] Repo reorg: edge smoothing, interpolation, and pixel art scaling (#469) * Move initial batch of shaders and presets to smoothing subdirectory * Rename smoothing to edge enhancement * Move cubic and windowed into interpolation * Fix some presets * Fix rest of presets * Rename edge-enhancement to edge-smoothing * Move pixel art scalers into separate directory separate from 'interpolation' * Flatten interpolation/cubic into interpolation/ --- anti-aliasing/advanced-aa.slangp | 4 +- anti-aliasing/reverse-aa.slangp | 2 +- border/shaders/average_fill/compose.slang | 2 +- border/shaders/blur_fill/compose.slang | 2 +- crt/crt-yo6-KV-M1420B-sharp.slangp | 2 +- crt/crt-yo6-KV-M1420B.slangp | 2 +- .../mame_hlsl/shaders/old/mame_hlsl.slangp | 2 +- denoisers/crt-fast-bilateral-super-xbr.slangp | 8 +- .../fast-bilateral-super-2xbr-3d-3p.slangp | 8 +- denoisers/fast-bilateral-super-xbr-4p.slangp | 10 +- denoisers/fast-bilateral-super-xbr-6p.slangp | 14 +- ...-bilateral-super-xbr-natural-vision.slangp | 8 +- denoisers/fast-bilateral-super-xbr.slangp | 8 +- {ddt => edge-smoothing/ddt}/cut.slangp | 0 .../ddt}/ddt-extended.slangp | 0 .../ddt}/ddt-jinc-linear.slangp | 0 {ddt => edge-smoothing/ddt}/ddt-jinc.slangp | 0 .../ddt}/ddt-xbr-lv1.slangp | 0 {ddt => edge-smoothing/ddt}/ddt.slangp | 0 {ddt => edge-smoothing/ddt}/shaders/cut.slang | 0 .../ddt}/shaders/ddt-extended.slang | 0 .../ddt}/shaders/ddt-jinc.slang | 0 .../ddt}/shaders/ddt-waterpaint.slang | 0 .../ddt}/shaders/ddt-xbr-lv1.slang | 0 {ddt => edge-smoothing/ddt}/shaders/ddt.slang | 0 .../eagle}/2xsai-fix-pixel-shift.slangp | 0 {eagle => edge-smoothing/eagle}/2xsai.slangp | 36 +- .../eagle}/shaders/2xsai.slang | 326 +++++++++--------- .../eagle}/shaders/super-2xsai.slang | 322 ++++++++--------- .../eagle}/shaders/supereagle.slang | 0 .../eagle}/super-2xsai-fix-pixel-shift.slangp | 0 .../eagle}/super-2xsai.slangp | 34 +- .../eagle}/supereagle.slangp | 0 {fsr => edge-smoothing/fsr}/fsr-easu.slangp | 0 {fsr => edge-smoothing/fsr}/fsr.slangp | 0 {fsr => edge-smoothing/fsr}/shaders/ffx_a.h | 0 .../fsr}/shaders/ffx_fsr1.h | 0 .../fsr}/shaders/fsr-pass0.slang | 0 .../fsr}/shaders/fsr-pass1.slang | 0 {fsr => edge-smoothing/fsr}/smaa+fsr.slangp | 12 +- .../hqx}/hq2x-halphon.slangp | 4 +- {hqx => edge-smoothing/hqx}/hq2x.slangp | 6 +- {hqx => edge-smoothing/hqx}/hq3x.slangp | 6 +- {hqx => edge-smoothing/hqx}/hq4x.slangp | 6 +- .../hqx}/resources/hq2x.png | Bin .../hqx}/resources/hq3x.png | Bin .../hqx}/resources/hq4x.png | Bin .../hqx}/shaders/hq2x-halphon.slang | 0 .../hqx}/shaders/hq2x.slang | 0 .../hqx}/shaders/hq3x.slang | 0 .../hqx}/shaders/hq4x.slang | 0 .../hqx}/shaders/pass1.slang | 0 {hqx => edge-smoothing/hqx}/shaders/pass2.inc | 0 .../nedi}/fast-bilateral-nedi.slangp | 2 +- {nedi => edge-smoothing/nedi}/nedi.slangp | 0 .../nedi}/presets/bilateral-variant.slangp | 16 +- .../nedi}/presets/bilateral-variant2.slangp | 4 +- .../nedi}/presets/bilateral-variant3.slangp | 8 +- .../nedi}/presets/bilateral-variant4.slangp | 10 +- .../nedi}/presets/bilateral-variant5.slangp | 12 +- .../nedi}/presets/bilateral-variant6.slangp | 6 +- .../nedi}/presets/bilateral-variant7.slangp | 6 +- .../nedi}/presets/test.test | 0 .../nedi}/shaders/nedi-jinc.slang | 0 .../nedi}/shaders/nedi-pass0.slang | 0 .../nedi}/shaders/nedi-pass1.slang | 0 .../nedi}/shaders/nedi-pass2.slang | 0 {nnedi3 => edge-smoothing/nnedi3}/LICENSE | 0 {nnedi3 => edge-smoothing/nnedi3}/README.md | 0 .../nnedi3}/nnedi3-nns16-2x-luma.slangp | 2 +- .../nnedi3}/nnedi3-nns16-2x-rgb.slangp | 2 +- .../nnedi3}/nnedi3-nns16-4x-luma.slangp | 2 +- .../nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp | 2 +- .../nnedi3}/nnedi3-nns32-4x-rgb.slangp | 2 +- ...edi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp | 2 +- .../nnedi3-nns64-2x-nns32-4x-rgb.slangp | 2 +- .../nnedi3}/shaders/jinc2-cshift-luma.slang | 0 .../nnedi3}/shaders/jinc2-cshift-rgb.slang | 0 .../shaders/jinc2-on-passoutput0.slang | 0 .../shaders/jinc2-on-passoutput3.slang | 0 .../nnedi3-nns128-win8x4-pass1-luma.slang | 0 .../nnedi3-nns128-win8x4-pass1-rgb.slang | 0 .../nnedi3-nns128-win8x4-pass2-luma.slang | 0 .../nnedi3-nns128-win8x4-pass2-rgb.slang | 0 .../nnedi3-nns16-win8x4-pass1-luma.slang | 0 .../nnedi3-nns16-win8x4-pass1-rgb.slang | 0 .../nnedi3-nns16-win8x4-pass2-luma.slang | 0 .../nnedi3-nns16-win8x4-pass2-rgb.slang | 0 .../nnedi3-nns256-win8x4-pass1-luma.slang | 0 .../nnedi3-nns256-win8x4-pass1-rgb.slang | 0 .../nnedi3-nns256-win8x4-pass2-luma.slang | 0 .../nnedi3-nns256-win8x4-pass2-rgb.slang | 0 .../nnedi3-nns32-win8x4-pass1-luma.slang | 0 .../nnedi3-nns32-win8x4-pass1-rgb.slang | 0 .../nnedi3-nns32-win8x4-pass2-luma.slang | 0 .../nnedi3-nns32-win8x4-pass2-rgb.slang | 0 .../nnedi3-nns64-win8x4-pass1-luma.slang | 0 .../nnedi3-nns64-win8x4-pass1-rgb.slang | 0 .../nnedi3-nns64-win8x4-pass2-luma.slang | 0 .../nnedi3-nns64-win8x4-pass2-rgb.slang | 0 .../nnedi3}/shaders/rgb-to-yuv.slang | 0 .../nnedi3}/shaders/yuv-to-rgb-2x.slang | 0 .../nnedi3}/shaders/yuv-to-rgb-4x.slang | 0 .../omniscale}/omniscale-legacy.slangp | 0 .../omniscale}/omniscale.slangp | 0 .../omniscale}/shaders/omniscale-legacy.slang | 0 .../omniscale}/shaders/omniscale.slang | 0 .../sabr}/sabr-hybrid-deposterize.slangp | 0 {sabr => edge-smoothing/sabr}/sabr.slangp | 0 .../shaders/sabr-hybrid-deposterize.slang | 0 .../sabr}/shaders/sabr-hybrid.slang | 0 .../sabr}/shaders/sabr-v3.0.slang | 0 .../scalefx}/scalefx+rAA.slangp | 8 +- .../scalefx}/scalefx-9x.slangp | 2 +- .../scalefx}/scalefx-hybrid.slangp | 2 +- .../scalefx}/scalefx.slangp | 2 +- .../scalefx}/shaders/old/scalefx-9x.slangp | 2 +- .../scalefx}/shaders/old/scalefx-pass0.slang | 0 .../scalefx}/shaders/old/scalefx-pass1.slang | 0 .../scalefx}/shaders/old/scalefx-pass2.slang | 0 .../scalefx}/shaders/old/scalefx-pass3.slang | 0 .../scalefx}/shaders/old/scalefx-pass7.slang | 0 .../scalefx}/shaders/old/scalefx.slangp | 2 +- .../scalefx}/shaders/scalefx-pass0.slang | 0 .../scalefx}/shaders/scalefx-pass1.slang | 0 .../scalefx}/shaders/scalefx-pass2.slang | 0 .../scalefx}/shaders/scalefx-pass3.slang | 0 .../shaders/scalefx-pass4-hybrid.slang | 0 .../scalefx}/shaders/scalefx-pass4.slang | 0 .../scalehq}/2xScaleHQ.slangp | 4 +- .../scalehq}/4xScaleHQ.slangp | 4 +- .../scalehq}/shaders/2xScaleHQ.slang | 0 .../scalehq}/shaders/4xScaleHQ.slang | 0 .../scalenx}/epx.slangp | 2 +- .../scalenx}/mmpx.slangp | 2 +- .../scalenx}/scale2x.slangp | 2 +- .../scalenx}/scale2xSFX.slangp | 2 +- .../scalenx}/scale2xplus.slangp | 2 +- .../scalenx}/scale3x.slangp | 2 +- .../scalenx}/shaders/epx.slang | 0 .../scalenx}/shaders/mmpx.slang | 0 .../scalenx}/shaders/scale2x.slang | 0 .../scalenx}/shaders/scale2xSFX.slang | 0 .../scalenx}/shaders/scale2xplus.slang | 0 .../scalenx}/shaders/scale3x.slang | 0 .../scalenx}/shaders/scale3xSFX.slang | 0 {xbr => edge-smoothing/xbr}/README.md | 0 .../other presets/2xBR-lv1-multipass.slangp | 4 +- .../xbr}/other presets/4xbr-hybrid-crt.slangp | 0 .../2xBR-multipass/2xbr-lv1-c-pass0.slang | 0 .../2xBR-multipass/2xbr-lv1-c-pass1.slang | 0 .../shaders/4xbr-hybrid-crt.slang | 0 .../super-xbr/custom-jinc2-sharper.slang | 0 .../super-xbr/super-2xbr-3d-pass0.slang | 0 .../super-xbr/super-2xbr-3d-pass1.slang | 0 .../super-xbr/super-2xbr-3d-pass2.slang | 0 .../super-xbr/super-4xbr-3d-pass0.slang | 0 .../super-xbr/super-4xbr-3d-pass1.slang | 0 .../super-xbr/super-4xbr-3d-pass1f.slang | 0 .../super-xbr/super-4xbr-3d-pass2.slang | 0 .../super-xbr/super-4xbr-3d-pass3.slang | 0 .../super-xbr/super-4xbr-3d-pass3f.slang | 0 .../super-xbr/super-8xbr-3d-pass0.slang | 0 .../super-xbr/super-8xbr-3d-pass1.slang | 0 .../super-xbr/super-8xbr-3d-pass2.slang | 0 .../super-xbr/super-8xbr-3d-pass3.slang | 0 .../super-xbr/super-8xbr-3d-pass4.slang | 0 .../super-xbr/super-8xbr-3d-pass5.slang | 0 .../xbr-hybrid/2xbr-hybrid-v5-gamma.slang | 0 .../other presets/super-2xbr-3d-2p.slangp | 2 +- .../super-2xbr-3d-3p-smoother.slangp | 2 +- .../other presets/super-4xbr-3d-4p.slangp | 2 +- .../super-4xbr-3d-6p-smoother.slangp | 2 +- .../other presets/super-8xbr-3d-6p.slangp | 2 +- .../xbr}/other presets/xbr-hybrid.slangp | 0 .../other presets/xbr-lv1-standalone.slangp | 0 .../xbr}/other presets/xbr-lv2-hd.slangp | 0 .../other presets/xbr-lv2-multipass.slangp | 0 .../other presets/xbr-lv2-standalone.slangp | 0 .../other presets/xbr-lv3-9x-multipass.slangp | 0 .../xbr-lv3-9x-standalone.slangp | 0 .../other presets/xbr-lv3-multipass.slangp | 0 .../other presets/xbr-lv3-standalone.slangp | 0 .../other presets/xbr-mlv4-multipass.slangp | 0 .../super-xbr/custom-jinc2-sharper.slang | 0 .../super-xbr/super-xbr-fast-pass0.slang | 0 .../super-xbr/super-xbr-fast-pass1.slang | 0 .../super-xbr/super-xbr-fast-pass2.slang | 0 .../shaders/super-xbr/super-xbr-pass0.slang | 0 .../shaders/super-xbr/super-xbr-pass1.slang | 0 .../shaders/super-xbr/super-xbr-pass1b.slang | 0 .../shaders/super-xbr/super-xbr-pass2.slang | 0 .../xbr}/shaders/support/b-spline-x.slang | 0 .../xbr}/shaders/support/b-spline-y.slang | 0 .../xbr/shaders/support}/bicubic-x.slang | 0 .../xbr/shaders/support}/bicubic-y.slang | 0 .../xbr}/shaders/support/delinearize.slang | 0 .../xbr}/shaders/support/linearize.slang | 0 .../xbr/shaders/support}/spline16-x.slang | 0 .../xbr/shaders/support}/spline16-y.slang | 0 .../xbr}/shaders/support/stock.slang | 0 .../xbr}/shaders/xbr-lv1-standalone.slang | 0 .../xbr}/shaders/xbr-lv2-hd.slang | 0 .../xbr-lv2-multipass/xbr-lv2-pass0.slang | 0 .../xbr-lv2-multipass/xbr-lv2-pass1.slang | 0 .../xbr}/shaders/xbr-lv2-standalone.slang | 0 .../xbr-lv3-multipass/xbr-lv3-pass0.slang | 0 .../xbr-lv3-multipass/xbr-lv3-pass1.slang | 0 .../xbr-lv3-multipass/xbr-lv3-pass1b.slang | 0 .../xbr}/shaders/xbr-lv3-standalone.slang | 0 .../xbr-mlv4-multipass/xbr-mlv4-pass1.slang | 0 .../xbr-mlv4-multipass/xbr-mlv4-pass2.slang | 0 .../xbr-mlv4-multipass/xbr-mlv4-pass3.slang | 0 .../xbr-mlv4-multipass/xbr-mlv4-pass4.slang | 0 .../xbr}/super-xbr-fast.slangp | 0 {xbr => edge-smoothing/xbr}/super-xbr.slangp | 0 .../xbr}/xbr-lv2-sharp.slangp | 0 {xbr => edge-smoothing/xbr}/xbr-lv2.slangp | 0 .../xbr}/xbr-lv3-sharp.slangp | 0 {xbr => edge-smoothing/xbr}/xbr-lv3.slangp | 0 .../xbrz}/2xbrz-linear.slangp | 4 +- .../xbrz}/4xbrz-linear.slangp | 2 +- .../xbrz}/5xbrz-linear.slangp | 2 +- .../xbrz}/6xbrz-linear.slangp | 2 +- .../xbrz}/shaders/2xbrz.slang | 0 .../xbrz}/shaders/4xbrz.slang | 0 .../xbrz}/shaders/5xbrz.slang | 0 .../xbrz}/shaders/6xbrz.slang | 0 .../xbrz-freescale-pass0.slang | 0 .../xbrz-freescale-pass1.slang | 0 .../xbrz}/shaders/xbrz-freescale.slang | 0 .../xbrz}/xbrz-freescale-multipass.slangp | 2 +- .../xbrz}/xbrz-freescale.slangp | 0 .../xsal}/2xsal-level2-crt.slangp | 30 +- {xsal => edge-smoothing/xsal}/2xsal.slangp | 34 +- .../xsal}/4xsal-level2-crt.slangp | 40 +-- .../xsal}/4xsal-level2-hq.slangp | 30 +- .../xsal}/4xsal-level2.slangp | 30 +- .../xsal}/shaders/2xsal-level2-hq.slang | 234 ++++++------- .../xsal}/shaders/2xsal-level2-pass2.slang | 158 ++++----- .../xsal}/shaders/2xsal-level2.slang | 194 +++++------ .../xsal}/shaders/2xsal.slang | 158 ++++----- {xsoft => edge-smoothing/xsoft}/4xsoft.slangp | 6 +- .../xsoft}/4xsoftSdB.slangp | 6 +- .../xsoft}/shaders/4xsoft.slang | 0 .../xsoft}/shaders/4xsoftSdB.slang | 0 handheld/bandlimit-pixel-gba-color.slangp | 2 +- handheld/ds-hybrid-sabr.slangp | 2 +- handheld/ds-hybrid-scalefx.slangp | 10 +- {cubic => interpolation}/b-spline-fast.slangp | 0 {cubic => interpolation}/bicubic-fast.slangp | 0 {cubic => interpolation}/bicubic.slangp | 10 +- .../catmull-rom-fast.slangp | 0 {cubic => interpolation}/catmull-rom.slangp | 0 .../cubic-README.md | 0 .../cubic-gamma-correct.slangp | 0 {cubic => interpolation}/cubic.slangp | 0 .../jinc2-sharp.slangp | 0 .../jinc2-sharper.slangp | 0 {windowed => interpolation}/jinc2.slangp | 0 {windowed => interpolation}/lanczos16.slangp | 0 .../lanczos3-fast.slangp | 0 .../shaders/b-spline-x.slang | 0 .../shaders/b-spline-y.slang | 0 .../shaders}/bicubic-x.slang | 0 .../shaders}/bicubic-y.slang | 0 .../shaders/bicubic.slang | 0 .../shaders/catmull-rom-x.slang | 0 .../shaders/catmull-rom-y.slang | 0 .../shaders/catmull-rom.slang | 0 .../shaders/cubic-gamma-correct.slang | 0 {cubic => interpolation}/shaders/cubic.slang | 0 .../shaders/jinc2.slang | 0 .../shaders/lanczos16.slang | 0 .../shaders/lanczos3-x.slang | 0 .../shaders/lanczos3-y.slang | 0 .../shaders/linearize.slang | 0 .../shaders}/spline16-x.slang | 0 .../shaders}/spline16-y.slang | 0 .../shaders/spline36-x.slang | 0 .../shaders/spline36-y.slang | 0 {cubic => interpolation}/spline16-fast.slangp | 0 {cubic => interpolation}/spline36-fast.slangp | 0 {interpolation => misc}/half_res.slangp | 0 .../aann.slangp | 0 .../bandlimit-pixel.slangp | 0 .../bilinear-adjustable.slangp | 0 .../controlled_sharpness.slangp | 0 .../grid-blend-hybrid.slangp | 10 +- .../pixel_aa.slangp | 0 .../pixellate.slangp | 0 .../shaders/ControlledSharpness.slang | 0 .../shaders/SmuberStep.slang | 0 .../shaders/aann.slang | 0 .../shaders/bandlimit-pixel.slang | 0 .../shaders/bilinear-adjustable.slang | 0 .../shaders/grid-blend-hybrid.slang | 0 .../shaders/pixel_aa/pixel_aa.slang | 0 .../shaders/pixel_aa/shared.slang | 0 .../shaders/pixellate.slang | 0 .../shaders/sharp-bilinear-scanlines.slang | 0 .../shaders/sharp-bilinear-simple.slang | 0 .../shaders/sharp-bilinear.slang | 0 .../shaders/smootheststep.slang | 0 .../shaders/uniform-nearest.slang | 0 .../sharp-bilinear-2x-prescale.slangp | 0 .../sharp-bilinear-scanlines.slangp | 0 .../sharp-bilinear-simple.slangp | 0 .../sharp-bilinear.slangp | 0 .../smootheststep.slangp | 0 .../smuberstep.slangp | 0 .../uniform-nearest.slangp | 0 ...fast-bilateral+super-4xbr+scanlines.slangp | 12 +- presets/nedi-powervr-sharpen.slangp | 8 +- ...color-decoder+colorimetry+pixellate.slangp | 2 +- presets/nes-color-decoder+pixellate.slangp | 2 +- presets/scalefx+rAA+aa-fast.slangp | 10 +- presets/scalefx+rAA+aa.slangp | 12 +- presets/scalefx-aa-fast.slangp | 10 +- presets/scalefx-aa.slangp | 12 +- ...calefx9-aa-blur-hazy-ntsc-sh1nra358.slangp | 16 +- ...fx9-aa-blur-hazy-vibrance-sh1nra358.slangp | 16 +- .../tvout-jinc-sharpen+interlacing.slangp | 2 +- presets/tvout/tvout-jinc-sharpen.slangp | 2 +- ...soft+scalefx-level2aa+sharpsmoother.slangp | 12 +- presets/xsoft+scalefx-level2aa.slangp | 10 +- scanlines/ossc_slot.slangp | 4 +- sharpen/super-xbr-super-res.slangp | 10 +- 328 files changed, 1030 insertions(+), 1030 deletions(-) rename {ddt => edge-smoothing/ddt}/cut.slangp (100%) rename {ddt => edge-smoothing/ddt}/ddt-extended.slangp (100%) rename {ddt => edge-smoothing/ddt}/ddt-jinc-linear.slangp (100%) rename {ddt => edge-smoothing/ddt}/ddt-jinc.slangp (100%) rename {ddt => edge-smoothing/ddt}/ddt-xbr-lv1.slangp (100%) rename {ddt => edge-smoothing/ddt}/ddt.slangp (100%) rename {ddt => edge-smoothing/ddt}/shaders/cut.slang (100%) rename {ddt => edge-smoothing/ddt}/shaders/ddt-extended.slang (100%) rename {ddt => edge-smoothing/ddt}/shaders/ddt-jinc.slang (100%) rename {ddt => edge-smoothing/ddt}/shaders/ddt-waterpaint.slang (100%) rename {ddt => edge-smoothing/ddt}/shaders/ddt-xbr-lv1.slang (100%) rename {ddt => edge-smoothing/ddt}/shaders/ddt.slang (100%) rename {eagle => edge-smoothing/eagle}/2xsai-fix-pixel-shift.slangp (100%) rename {eagle => edge-smoothing/eagle}/2xsai.slangp (69%) rename {eagle => edge-smoothing/eagle}/shaders/2xsai.slang (96%) rename {eagle => edge-smoothing/eagle}/shaders/super-2xsai.slang (96%) rename {eagle => edge-smoothing/eagle}/shaders/supereagle.slang (100%) rename {eagle => edge-smoothing/eagle}/super-2xsai-fix-pixel-shift.slangp (100%) rename {eagle => edge-smoothing/eagle}/super-2xsai.slangp (70%) rename {eagle => edge-smoothing/eagle}/supereagle.slangp (100%) rename {fsr => edge-smoothing/fsr}/fsr-easu.slangp (100%) rename {fsr => edge-smoothing/fsr}/fsr.slangp (100%) rename {fsr => edge-smoothing/fsr}/shaders/ffx_a.h (100%) rename {fsr => edge-smoothing/fsr}/shaders/ffx_fsr1.h (100%) rename {fsr => edge-smoothing/fsr}/shaders/fsr-pass0.slang (100%) rename {fsr => edge-smoothing/fsr}/shaders/fsr-pass1.slang (100%) rename {fsr => edge-smoothing/fsr}/smaa+fsr.slangp (75%) rename {hqx => edge-smoothing/hqx}/hq2x-halphon.slangp (69%) rename {hqx => edge-smoothing/hqx}/hq2x.slangp (73%) rename {hqx => edge-smoothing/hqx}/hq3x.slangp (73%) rename {hqx => edge-smoothing/hqx}/hq4x.slangp (73%) rename {hqx => edge-smoothing/hqx}/resources/hq2x.png (100%) rename {hqx => edge-smoothing/hqx}/resources/hq3x.png (100%) rename {hqx => edge-smoothing/hqx}/resources/hq4x.png (100%) rename {hqx => edge-smoothing/hqx}/shaders/hq2x-halphon.slang (100%) rename {hqx => edge-smoothing/hqx}/shaders/hq2x.slang (100%) rename {hqx => edge-smoothing/hqx}/shaders/hq3x.slang (100%) rename {hqx => edge-smoothing/hqx}/shaders/hq4x.slang (100%) rename {hqx => edge-smoothing/hqx}/shaders/pass1.slang (100%) rename {hqx => edge-smoothing/hqx}/shaders/pass2.inc (100%) rename {nedi => edge-smoothing/nedi}/fast-bilateral-nedi.slangp (93%) rename {nedi => edge-smoothing/nedi}/nedi.slangp (100%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant.slangp (81%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant2.slangp (92%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant3.slangp (89%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant4.slangp (88%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant5.slangp (86%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant6.slangp (91%) rename {nedi => edge-smoothing/nedi}/presets/bilateral-variant7.slangp (91%) rename {nedi => edge-smoothing/nedi}/presets/test.test (100%) rename {nedi => edge-smoothing/nedi}/shaders/nedi-jinc.slang (100%) rename {nedi => edge-smoothing/nedi}/shaders/nedi-pass0.slang (100%) rename {nedi => edge-smoothing/nedi}/shaders/nedi-pass1.slang (100%) rename {nedi => edge-smoothing/nedi}/shaders/nedi-pass2.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/LICENSE (100%) rename {nnedi3 => edge-smoothing/nnedi3}/README.md (100%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns16-2x-luma.slangp (94%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns16-2x-rgb.slangp (89%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns16-4x-luma.slangp (96%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp (96%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns32-4x-rgb.slangp (94%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp (95%) rename {nnedi3 => edge-smoothing/nnedi3}/nnedi3-nns64-2x-nns32-4x-rgb.slangp (94%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/jinc2-cshift-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/jinc2-cshift-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/jinc2-on-passoutput0.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/jinc2-on-passoutput3.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns128-win8x4-pass1-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns128-win8x4-pass1-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns128-win8x4-pass2-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns128-win8x4-pass2-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns16-win8x4-pass1-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns16-win8x4-pass1-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns16-win8x4-pass2-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns16-win8x4-pass2-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns256-win8x4-pass1-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns256-win8x4-pass1-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns256-win8x4-pass2-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns256-win8x4-pass2-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns32-win8x4-pass1-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns32-win8x4-pass1-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns32-win8x4-pass2-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns32-win8x4-pass2-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns64-win8x4-pass1-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns64-win8x4-pass1-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns64-win8x4-pass2-luma.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/nnedi3-nns64-win8x4-pass2-rgb.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/rgb-to-yuv.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/yuv-to-rgb-2x.slang (100%) rename {nnedi3 => edge-smoothing/nnedi3}/shaders/yuv-to-rgb-4x.slang (100%) rename {omniscale => edge-smoothing/omniscale}/omniscale-legacy.slangp (100%) rename {omniscale => edge-smoothing/omniscale}/omniscale.slangp (100%) rename {omniscale => edge-smoothing/omniscale}/shaders/omniscale-legacy.slang (100%) rename {omniscale => edge-smoothing/omniscale}/shaders/omniscale.slang (100%) rename {sabr => edge-smoothing/sabr}/sabr-hybrid-deposterize.slangp (100%) rename {sabr => edge-smoothing/sabr}/sabr.slangp (100%) rename {sabr => edge-smoothing/sabr}/shaders/sabr-hybrid-deposterize.slang (100%) rename {sabr => edge-smoothing/sabr}/shaders/sabr-hybrid.slang (100%) rename {sabr => edge-smoothing/sabr}/shaders/sabr-v3.0.slang (100%) rename {scalefx => edge-smoothing/scalefx}/scalefx+rAA.slangp (75%) rename {scalefx => edge-smoothing/scalefx}/scalefx-9x.slangp (97%) rename {scalefx => edge-smoothing/scalefx}/scalefx-hybrid.slangp (95%) rename {scalefx => edge-smoothing/scalefx}/scalefx.slangp (95%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-9x.slangp (96%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-pass0.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-pass1.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-pass2.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-pass3.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx-pass7.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/old/scalefx.slangp (92%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass0.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass1.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass2.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass3.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass4-hybrid.slang (100%) rename {scalefx => edge-smoothing/scalefx}/shaders/scalefx-pass4.slang (100%) rename {scalehq => edge-smoothing/scalehq}/2xScaleHQ.slangp (70%) rename {scalehq => edge-smoothing/scalehq}/4xScaleHQ.slangp (70%) rename {scalehq => edge-smoothing/scalehq}/shaders/2xScaleHQ.slang (100%) rename {scalehq => edge-smoothing/scalehq}/shaders/4xScaleHQ.slang (100%) rename {scalenx => edge-smoothing/scalenx}/epx.slangp (73%) rename {scalenx => edge-smoothing/scalenx}/mmpx.slangp (73%) rename {scalenx => edge-smoothing/scalenx}/scale2x.slangp (76%) rename {scalenx => edge-smoothing/scalenx}/scale2xSFX.slangp (76%) rename {scalenx => edge-smoothing/scalenx}/scale2xplus.slangp (76%) rename {scalenx => edge-smoothing/scalenx}/scale3x.slangp (76%) rename {scalenx => edge-smoothing/scalenx}/shaders/epx.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/mmpx.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/scale2x.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/scale2xSFX.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/scale2xplus.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/scale3x.slang (100%) rename {scalenx => edge-smoothing/scalenx}/shaders/scale3xSFX.slang (100%) rename {xbr => edge-smoothing/xbr}/README.md (100%) rename {xbr => edge-smoothing/xbr}/other presets/2xBR-lv1-multipass.slangp (78%) rename {xbr => edge-smoothing/xbr}/other presets/4xbr-hybrid-crt.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/4xbr-hybrid-crt.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/custom-jinc2-sharper.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass1f.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass2.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass3.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-4xbr-3d-pass3f.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass2.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass3.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass4.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/super-xbr/super-8xbr-3d-pass5.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang (100%) rename {xbr => edge-smoothing/xbr}/other presets/super-2xbr-3d-2p.slangp (94%) rename {xbr => edge-smoothing/xbr}/other presets/super-2xbr-3d-3p-smoother.slangp (95%) rename {xbr => edge-smoothing/xbr}/other presets/super-4xbr-3d-4p.slangp (96%) rename {xbr => edge-smoothing/xbr}/other presets/super-4xbr-3d-6p-smoother.slangp (97%) rename {xbr => edge-smoothing/xbr}/other presets/super-8xbr-3d-6p.slangp (97%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-hybrid.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv1-standalone.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv2-hd.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv2-multipass.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv2-standalone.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv3-9x-multipass.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv3-9x-standalone.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv3-multipass.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-lv3-standalone.slangp (100%) rename {xbr => edge-smoothing/xbr}/other presets/xbr-mlv4-multipass.slangp (100%) rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/custom-jinc2-sharper.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-fast-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-fast-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-fast-pass2.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-pass0.slang (100%) mode change 100755 => 100644 rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-pass1.slang (100%) mode change 100755 => 100644 rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-pass1b.slang (100%) mode change 100755 => 100644 rename {xbr => edge-smoothing/xbr}/shaders/super-xbr/super-xbr-pass2.slang (100%) mode change 100755 => 100644 rename {xbr => edge-smoothing/xbr}/shaders/support/b-spline-x.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/support/b-spline-y.slang (100%) rename {cubic/shaders => edge-smoothing/xbr/shaders/support}/bicubic-x.slang (100%) rename {cubic/shaders => edge-smoothing/xbr/shaders/support}/bicubic-y.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/support/delinearize.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/support/linearize.slang (100%) rename {cubic/shaders => edge-smoothing/xbr/shaders/support}/spline16-x.slang (100%) rename {cubic/shaders => edge-smoothing/xbr/shaders/support}/spline16-y.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/support/stock.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv1-standalone.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv2-hd.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv2-standalone.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-lv3-standalone.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang (100%) rename {xbr => edge-smoothing/xbr}/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang (100%) rename {xbr => edge-smoothing/xbr}/super-xbr-fast.slangp (100%) rename {xbr => edge-smoothing/xbr}/super-xbr.slangp (100%) rename {xbr => edge-smoothing/xbr}/xbr-lv2-sharp.slangp (100%) rename {xbr => edge-smoothing/xbr}/xbr-lv2.slangp (100%) rename {xbr => edge-smoothing/xbr}/xbr-lv3-sharp.slangp (100%) rename {xbr => edge-smoothing/xbr}/xbr-lv3.slangp (100%) rename {xbrz => edge-smoothing/xbrz}/2xbrz-linear.slangp (68%) rename {xbrz => edge-smoothing/xbrz}/4xbrz-linear.slangp (83%) rename {xbrz => edge-smoothing/xbrz}/5xbrz-linear.slangp (83%) rename {xbrz => edge-smoothing/xbrz}/6xbrz-linear.slangp (83%) rename {xbrz => edge-smoothing/xbrz}/shaders/2xbrz.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/4xbrz.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/5xbrz.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/6xbrz.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang (100%) rename {xbrz => edge-smoothing/xbrz}/shaders/xbrz-freescale.slang (100%) rename {xbrz => edge-smoothing/xbrz}/xbrz-freescale-multipass.slangp (91%) rename {xbrz => edge-smoothing/xbrz}/xbrz-freescale.slangp (100%) rename {xsal => edge-smoothing/xsal}/2xsal-level2-crt.slangp (81%) rename {xsal => edge-smoothing/xsal}/2xsal.slangp (69%) rename {xsal => edge-smoothing/xsal}/4xsal-level2-crt.slangp (85%) rename {xsal => edge-smoothing/xsal}/4xsal-level2-hq.slangp (86%) rename {xsal => edge-smoothing/xsal}/4xsal-level2.slangp (86%) rename {xsal => edge-smoothing/xsal}/shaders/2xsal-level2-hq.slang (97%) rename {xsal => edge-smoothing/xsal}/shaders/2xsal-level2-pass2.slang (96%) rename {xsal => edge-smoothing/xsal}/shaders/2xsal-level2.slang (97%) rename {xsal => edge-smoothing/xsal}/shaders/2xsal.slang (96%) rename {xsoft => edge-smoothing/xsoft}/4xsoft.slangp (70%) rename {xsoft => edge-smoothing/xsoft}/4xsoftSdB.slangp (70%) rename {xsoft => edge-smoothing/xsoft}/shaders/4xsoft.slang (100%) rename {xsoft => edge-smoothing/xsoft}/shaders/4xsoftSdB.slang (100%) rename {cubic => interpolation}/b-spline-fast.slangp (100%) mode change 100755 => 100644 rename {cubic => interpolation}/bicubic-fast.slangp (100%) rename {cubic => interpolation}/bicubic.slangp (94%) rename {cubic => interpolation}/catmull-rom-fast.slangp (100%) mode change 100755 => 100644 rename {cubic => interpolation}/catmull-rom.slangp (100%) rename cubic/README.md => interpolation/cubic-README.md (100%) rename {cubic => interpolation}/cubic-gamma-correct.slangp (100%) rename {cubic => interpolation}/cubic.slangp (100%) rename {windowed => interpolation}/jinc2-sharp.slangp (100%) rename {windowed => interpolation}/jinc2-sharper.slangp (100%) rename {windowed => interpolation}/jinc2.slangp (100%) rename {windowed => interpolation}/lanczos16.slangp (100%) rename {windowed => interpolation}/lanczos3-fast.slangp (100%) rename {cubic => interpolation}/shaders/b-spline-x.slang (100%) rename {cubic => interpolation}/shaders/b-spline-y.slang (100%) rename {xbr/shaders/support => interpolation/shaders}/bicubic-x.slang (100%) rename {xbr/shaders/support => interpolation/shaders}/bicubic-y.slang (100%) rename {cubic => interpolation}/shaders/bicubic.slang (100%) rename {cubic => interpolation}/shaders/catmull-rom-x.slang (100%) rename {cubic => interpolation}/shaders/catmull-rom-y.slang (100%) rename {cubic => interpolation}/shaders/catmull-rom.slang (100%) rename {cubic => interpolation}/shaders/cubic-gamma-correct.slang (100%) rename {cubic => interpolation}/shaders/cubic.slang (100%) rename {windowed => interpolation}/shaders/jinc2.slang (100%) rename {windowed => interpolation}/shaders/lanczos16.slang (100%) rename {windowed => interpolation}/shaders/lanczos3-x.slang (100%) rename {windowed => interpolation}/shaders/lanczos3-y.slang (100%) rename {cubic => interpolation}/shaders/linearize.slang (100%) rename {xbr/shaders/support => interpolation/shaders}/spline16-x.slang (100%) rename {xbr/shaders/support => interpolation/shaders}/spline16-y.slang (100%) rename {cubic => interpolation}/shaders/spline36-x.slang (100%) rename {cubic => interpolation}/shaders/spline36-y.slang (100%) rename {cubic => interpolation}/spline16-fast.slangp (100%) rename {cubic => interpolation}/spline36-fast.slangp (100%) rename {interpolation => misc}/half_res.slangp (100%) rename {interpolation => pixel-art-scaling}/aann.slangp (100%) rename {interpolation => pixel-art-scaling}/bandlimit-pixel.slangp (100%) rename {interpolation => pixel-art-scaling}/bilinear-adjustable.slangp (100%) rename {interpolation => pixel-art-scaling}/controlled_sharpness.slangp (100%) rename {interpolation => pixel-art-scaling}/grid-blend-hybrid.slangp (95%) rename {interpolation => pixel-art-scaling}/pixel_aa.slangp (100%) rename {interpolation => pixel-art-scaling}/pixellate.slangp (100%) rename {interpolation => pixel-art-scaling}/shaders/ControlledSharpness.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/SmuberStep.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/aann.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/bandlimit-pixel.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/bilinear-adjustable.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/grid-blend-hybrid.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/pixel_aa/pixel_aa.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/pixel_aa/shared.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/pixellate.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/sharp-bilinear-scanlines.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/sharp-bilinear-simple.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/sharp-bilinear.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/smootheststep.slang (100%) rename {interpolation => pixel-art-scaling}/shaders/uniform-nearest.slang (100%) rename {interpolation => pixel-art-scaling}/sharp-bilinear-2x-prescale.slangp (100%) rename {interpolation => pixel-art-scaling}/sharp-bilinear-scanlines.slangp (100%) rename {interpolation => pixel-art-scaling}/sharp-bilinear-simple.slangp (100%) rename {interpolation => pixel-art-scaling}/sharp-bilinear.slangp (100%) rename {interpolation => pixel-art-scaling}/smootheststep.slangp (100%) rename {interpolation => pixel-art-scaling}/smuberstep.slangp (100%) rename {interpolation => pixel-art-scaling}/uniform-nearest.slangp (100%) diff --git a/anti-aliasing/advanced-aa.slangp b/anti-aliasing/advanced-aa.slangp index 476b97df..557c9b6f 100644 --- a/anti-aliasing/advanced-aa.slangp +++ b/anti-aliasing/advanced-aa.slangp @@ -6,12 +6,12 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/shaders/bicubic-x.slang +shader1 = ../interpolation/shaders/bicubic-x.slang filter_linear1 = false scale_type_x1 = viewport scale_type_y1 = source scale1 = 1.0 -shader2 = ../cubic/shaders/bicubic-y.slang +shader2 = ../interpolation/shaders/bicubic-y.slang filter_linear2 = false scale_type2 = viewport diff --git a/anti-aliasing/reverse-aa.slangp b/anti-aliasing/reverse-aa.slangp index a3716d30..2b6781e6 100644 --- a/anti-aliasing/reverse-aa.slangp +++ b/anti-aliasing/reverse-aa.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/border/shaders/average_fill/compose.slang b/border/shaders/average_fill/compose.slang index f5f98922..6060cdbd 100644 --- a/border/shaders/average_fill/compose.slang +++ b/border/shaders/average_fill/compose.slang @@ -37,7 +37,7 @@ // clang-format off #include "parameters.slang" -#include "../../../interpolation/shaders/pixel_aa/shared.slang" +#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.slang" // clang-format on layout(push_constant) uniform Push { diff --git a/border/shaders/blur_fill/compose.slang b/border/shaders/blur_fill/compose.slang index d80a27e7..75d9a122 100644 --- a/border/shaders/blur_fill/compose.slang +++ b/border/shaders/blur_fill/compose.slang @@ -39,7 +39,7 @@ // clang-format off #include "parameters.slang" #include "../../../blurs/shaders/dual_filter/parameters.slang" -#include "../../../interpolation/shaders/pixel_aa/shared.slang" +#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.slang" // clang-format on layout(push_constant) uniform Push { diff --git a/crt/crt-yo6-KV-M1420B-sharp.slangp b/crt/crt-yo6-KV-M1420B-sharp.slangp index 630e99cc..94aafdc6 100644 --- a/crt/crt-yo6-KV-M1420B-sharp.slangp +++ b/crt/crt-yo6-KV-M1420B-sharp.slangp @@ -14,7 +14,7 @@ scale_type1 = "absolute" scale_x1 = 1684 scale_y1 = 1329 -shader2 = "../windowed/shaders/jinc2.slang" +shader2 = "../interpolation/shaders/jinc2.slang" filter_linear2 = false scale_type2 = viewport diff --git a/crt/crt-yo6-KV-M1420B.slangp b/crt/crt-yo6-KV-M1420B.slangp index 48d096b1..16676b56 100644 --- a/crt/crt-yo6-KV-M1420B.slangp +++ b/crt/crt-yo6-KV-M1420B.slangp @@ -14,7 +14,7 @@ scale_type1 = "absolute" scale_x1 = 1684 scale_y1 = 1329 -shader2 = "../windowed/shaders/jinc2.slang" +shader2 = "../interpolation/shaders/jinc2.slang" filter_linear2 = false scale_type2 = viewport diff --git a/crt/shaders/mame_hlsl/shaders/old/mame_hlsl.slangp b/crt/shaders/mame_hlsl/shaders/old/mame_hlsl.slangp index c7e703c7..9bd8074e 100644 --- a/crt/shaders/mame_hlsl/shaders/old/mame_hlsl.slangp +++ b/crt/shaders/mame_hlsl/shaders/old/mame_hlsl.slangp @@ -13,7 +13,7 @@ scale_type1 = source scale1 = 1.0 filter_linear1 = true -shader2 = ../../../../../interpolation/shaders/sharp-bilinear.slang +shader2 = ../../../../../pixel-art-scaling/shaders/sharp-bilinear.slang alias2 = PrescalePass scale_type2 = source filter_linear2 = true diff --git a/denoisers/crt-fast-bilateral-super-xbr.slangp b/denoisers/crt-fast-bilateral-super-xbr.slangp index 171caa1e..69fd3676 100644 --- a/denoisers/crt-fast-bilateral-super-xbr.slangp +++ b/denoisers/crt-fast-bilateral-super-xbr.slangp @@ -7,28 +7,28 @@ scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" alias0 = XbrSource -shader1 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader1 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" scale_x2 = "2.000000" scale_type_y2 = "source" scale_y2 = "2.000000" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../windowed/shaders/jinc2.slang" +shader4 = "../interpolation/shaders/jinc2.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" float_framebuffer4 = "false" diff --git a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp b/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp index 8f375e3d..08c5dfa2 100644 --- a/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp +++ b/denoisers/fast-bilateral-super-2xbr-3d-3p.slangp @@ -8,28 +8,28 @@ scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang" +shader2 = "../edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang" +shader3 = "../edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang" +shader4 = "../edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" scale_type_x4 = "source" scale_x4 = "1.000000" scale_type_y4 = "source" scale_y4 = "1.000000" -shader5 = "../windowed/shaders/jinc2.slang" +shader5 = "../interpolation/shaders/jinc2.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" diff --git a/denoisers/fast-bilateral-super-xbr-4p.slangp b/denoisers/fast-bilateral-super-xbr-4p.slangp index 52e563b9..b283cd9e 100644 --- a/denoisers/fast-bilateral-super-xbr-4p.slangp +++ b/denoisers/fast-bilateral-super-xbr-4p.slangp @@ -6,14 +6,14 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader1 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" @@ -21,7 +21,7 @@ scale_x2 = "2.000000" scale_type_y2 = "source" scale_y2 = "2.000000" alias2 = "PassPrev2" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" @@ -29,7 +29,7 @@ scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../xbr/shaders/super-xbr/super-xbr-pass1b.slang" +shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" scale_type_x4 = "source" @@ -37,7 +37,7 @@ scale_x4 = "2.000000" scale_type_y4 = "source" scale_y4 = "2.000000" -shader5 = "../windowed/shaders/jinc2.slang" +shader5 = "../interpolation/shaders/jinc2.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" scale_type5 = viewport diff --git a/denoisers/fast-bilateral-super-xbr-6p.slangp b/denoisers/fast-bilateral-super-xbr-6p.slangp index 6d26409b..1d0300ee 100644 --- a/denoisers/fast-bilateral-super-xbr-6p.slangp +++ b/denoisers/fast-bilateral-super-xbr-6p.slangp @@ -6,14 +6,14 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader1 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" @@ -21,7 +21,7 @@ scale_x2 = "2.000000" scale_type_y2 = "source" scale_y2 = "2.000000" alias2 = "PassPrev2" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" @@ -29,21 +29,21 @@ scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" scale_type_x4 = "source" scale_x4 = "1.000000" scale_type_y4 = "source" scale_y4 = "1.000000" -shader5 = "../xbr/shaders/super-xbr/super-xbr-pass1b.slang" +shader5 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" scale_type_x5 = "source" scale_x5 = "2.000000" scale_type_y5 = "source" scale_y5 = "2.000000" -shader6 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader6 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear6 = "false" wrap_mode6 = "clamp_to_edge" scale_type_x6 = "source" @@ -52,7 +52,7 @@ scale_type_y6 = "source" scale_y6 = "1.000000" -shader7 = "../windowed/shaders/jinc2.slang" +shader7 = "../interpolation/shaders/jinc2.slang" filter_linear7 = "false" wrap_mode7 = "clamp_to_edge" scale_type7 = viewport diff --git a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp index 5143fb24..253ddc12 100644 --- a/denoisers/fast-bilateral-super-xbr-natural-vision.slangp +++ b/denoisers/fast-bilateral-super-xbr-natural-vision.slangp @@ -13,28 +13,28 @@ scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "1.000000" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" scale_x3 = "2.000000" scale_type_y3 = "source" scale_y3 = "2.000000" -shader4 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" scale_type_x4 = "source" scale_x4 = "1.000000" scale_type_y4 = "source" scale_y4 = "1.000000" -shader5 = "../windowed/shaders/jinc2.slang" +shader5 = "../interpolation/shaders/jinc2.slang" filter_linear5 = "false" wrap_mode5 = "clamp_to_edge" scale_type5 = viewport diff --git a/denoisers/fast-bilateral-super-xbr.slangp b/denoisers/fast-bilateral-super-xbr.slangp index d5177ebb..394f1d41 100644 --- a/denoisers/fast-bilateral-super-xbr.slangp +++ b/denoisers/fast-bilateral-super-xbr.slangp @@ -6,28 +6,28 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader1 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" scale_type_x1 = "source" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" scale_type_x2 = "source" scale_x2 = "2.000000" scale_type_y2 = "source" scale_y2 = "2.000000" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_edge" scale_type_x3 = "source" scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../windowed/shaders/jinc2.slang" +shader4 = "../interpolation/shaders/jinc2.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_edge" scale_type4 = viewport diff --git a/ddt/cut.slangp b/edge-smoothing/ddt/cut.slangp similarity index 100% rename from ddt/cut.slangp rename to edge-smoothing/ddt/cut.slangp diff --git a/ddt/ddt-extended.slangp b/edge-smoothing/ddt/ddt-extended.slangp similarity index 100% rename from ddt/ddt-extended.slangp rename to edge-smoothing/ddt/ddt-extended.slangp diff --git a/ddt/ddt-jinc-linear.slangp b/edge-smoothing/ddt/ddt-jinc-linear.slangp similarity index 100% rename from ddt/ddt-jinc-linear.slangp rename to edge-smoothing/ddt/ddt-jinc-linear.slangp diff --git a/ddt/ddt-jinc.slangp b/edge-smoothing/ddt/ddt-jinc.slangp similarity index 100% rename from ddt/ddt-jinc.slangp rename to edge-smoothing/ddt/ddt-jinc.slangp diff --git a/ddt/ddt-xbr-lv1.slangp b/edge-smoothing/ddt/ddt-xbr-lv1.slangp similarity index 100% rename from ddt/ddt-xbr-lv1.slangp rename to edge-smoothing/ddt/ddt-xbr-lv1.slangp diff --git a/ddt/ddt.slangp b/edge-smoothing/ddt/ddt.slangp similarity index 100% rename from ddt/ddt.slangp rename to edge-smoothing/ddt/ddt.slangp diff --git a/ddt/shaders/cut.slang b/edge-smoothing/ddt/shaders/cut.slang similarity index 100% rename from ddt/shaders/cut.slang rename to edge-smoothing/ddt/shaders/cut.slang diff --git a/ddt/shaders/ddt-extended.slang b/edge-smoothing/ddt/shaders/ddt-extended.slang similarity index 100% rename from ddt/shaders/ddt-extended.slang rename to edge-smoothing/ddt/shaders/ddt-extended.slang diff --git a/ddt/shaders/ddt-jinc.slang b/edge-smoothing/ddt/shaders/ddt-jinc.slang similarity index 100% rename from ddt/shaders/ddt-jinc.slang rename to edge-smoothing/ddt/shaders/ddt-jinc.slang diff --git a/ddt/shaders/ddt-waterpaint.slang b/edge-smoothing/ddt/shaders/ddt-waterpaint.slang similarity index 100% rename from ddt/shaders/ddt-waterpaint.slang rename to edge-smoothing/ddt/shaders/ddt-waterpaint.slang diff --git a/ddt/shaders/ddt-xbr-lv1.slang b/edge-smoothing/ddt/shaders/ddt-xbr-lv1.slang similarity index 100% rename from ddt/shaders/ddt-xbr-lv1.slang rename to edge-smoothing/ddt/shaders/ddt-xbr-lv1.slang diff --git a/ddt/shaders/ddt.slang b/edge-smoothing/ddt/shaders/ddt.slang similarity index 100% rename from ddt/shaders/ddt.slang rename to edge-smoothing/ddt/shaders/ddt.slang diff --git a/eagle/2xsai-fix-pixel-shift.slangp b/edge-smoothing/eagle/2xsai-fix-pixel-shift.slangp similarity index 100% rename from eagle/2xsai-fix-pixel-shift.slangp rename to edge-smoothing/eagle/2xsai-fix-pixel-shift.slangp diff --git a/eagle/2xsai.slangp b/edge-smoothing/eagle/2xsai.slangp similarity index 69% rename from eagle/2xsai.slangp rename to edge-smoothing/eagle/2xsai.slangp index 6178b6ce..37cb9cad 100644 --- a/eagle/2xsai.slangp +++ b/edge-smoothing/eagle/2xsai.slangp @@ -1,18 +1,18 @@ -shaders = 3 - -shader0 = shaders/2xsai.slang -filter_linear0 = false -scale_type0 = source -scale_x0 = 2.0 -scale_y0 = 2.0 - -shader1 = ../cubic/shaders/bicubic-x.slang -filter_linear1 = false -scale_type_x1 = viewport -scale_type_y1 = source -scale1 = 1.0 - -shader2 = ../cubic/shaders/bicubic-y.slang -filter_linear2 = false -scale_type2 = viewport - +shaders = 3 + +shader0 = shaders/2xsai.slang +filter_linear0 = false +scale_type0 = source +scale_x0 = 2.0 +scale_y0 = 2.0 + +shader1 = ../../interpolation/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../../interpolation/shaders/bicubic-y.slang +filter_linear2 = false +scale_type2 = viewport + diff --git a/eagle/shaders/2xsai.slang b/edge-smoothing/eagle/shaders/2xsai.slang similarity index 96% rename from eagle/shaders/2xsai.slang rename to edge-smoothing/eagle/shaders/2xsai.slang index 18638b7a..78d1a4e2 100644 --- a/eagle/shaders/2xsai.slang +++ b/edge-smoothing/eagle/shaders/2xsai.slang @@ -1,163 +1,163 @@ -#version 450 - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - - -const vec3 dt = vec3(65536.0,256.0,1.0); - - -float GET_RESULT(float A, float B, float C, float D) -{ - return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); -} - - -float reduce(vec3 color) -{ - return dot(color,dt); -} - - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* Default Vertex shader */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord * 1.0001; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - - -void main() -{ - vec2 OGL2Size = params.SourceSize.xy; - vec2 OGL2InvSize = params.SourceSize.zw; - - // Calculating texel coordinates - - vec2 OGL2Pos = vTexCoord.xy*OGL2Size.xy; - vec2 fp = fract(OGL2Pos); - vec2 g1 = vec2( OGL2InvSize.x,OGL2InvSize.y); - vec2 g2 = vec2(-OGL2InvSize.x,OGL2InvSize.y); - - - if ((fp.x >= 0.50) && (fp.y < 0.50)) g2*=-1.0; - - vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize; - - vec2 pC8 = pC4 + g1; - vec2 pC0 = pC4 - g1; - - vec2 p04 = pC4 - 0.5*g1; - vec2 pC3 = p04 + 0.5*g2; - vec2 pC1 = pC3 - g2; - vec2 pC5 = pC1 + g1; - vec2 pC7 = pC3 + g1; - - - // Reading the texels - - vec3 C0 = texture(Source,pC0 ).xyz; - vec3 C1 = texture(Source,pC1 ).xyz; - vec3 C2 = texture(Source,pC4-g2).xyz; - vec3 C3 = texture(Source,pC3 ).xyz; - vec3 C4 = texture(Source,pC4 ).xyz; - vec3 C5 = texture(Source,pC5 ).xyz; - vec3 D4 = texture(Source,pC8-g2).xyz; - vec3 C6 = texture(Source,pC4+g2).xyz; - vec3 C7 = texture(Source,pC7 ).xyz; - vec3 C8 = texture(Source,pC8 ).xyz; - vec3 D5 = texture(Source,pC5+g1).xyz; - vec3 D0 = texture(Source,pC7+g2).xyz; - vec3 D1 = texture(Source,pC8+g2).xyz; - vec3 D2 = texture(Source,pC7+g1).xyz; - vec3 p10,p11; - - float c0 = reduce(C0);float c1 = reduce(C1); - float c2 = reduce(C2);float c3 = reduce(C3); - float c4 = reduce(C4);float c5 = reduce(C5); - float c6 = reduce(C6);float c7 = reduce(C7); - float c8 = reduce(C8);float d0 = reduce(D0); - float d1 = reduce(D1);float d2 = reduce(D2); - float d4 = reduce(D4);float d5 = reduce(D5); - - - /* 2xSaI code */ - /* Copied from the Dosbox source code */ - /* Copyright (C) 2002-2007 The DOSBox Team */ - /* License: GNU-GPL */ - /* Adapted by guest(r) on 20.4 and 9.5. 2007 */ - - if (c4 == c8) { - if (c5 != c7) { - if (((c4 == c3)&&(c7 == d2))||((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0))) { - p10 = C4; - } else { - p10 = 0.5*(C4+C7); - } - p11 = C4; - } else { - if (c4 == c5) { - p10 = C4; - p11 = C4; - } else { - float r; - r = GET_RESULT(c4,c5,c3,c1); - r -= GET_RESULT(c5,c4,d4,c2); - r -= GET_RESULT(c5,c4,c6,d1); - r += GET_RESULT(c4,c5,d5,d2); - if (r > 0.0) p11 = C4; - else if (r < 0.0) p11 = C5; - else p11 = 0.25*(C4+C5+C7+C8); - p10 = 0.5*(C4+C7); - } - } - } else - if (c5 == c7) { - if (((c7 == c6)&&(c4 == c2))||((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0))) { - p10 = C7; - } else { - p10 = 0.5*(C4+C7); - } - p11 = C5; - } else { - p11 = 0.25*(C4+C5+C7+C8); - - if ((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0)) { - p10 = C4; - } else if ((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0)) { - p10 = C7; - } else { - p10 = 0.5*(C4+C7); - } - } - - // Distributing the final products - - vec3 color; - - if (fp.x >= 0.5 && fp.y >= 0.5) color = p11; else - if (fp.x < 0.5 && fp.y < 0.5) color = C4; else color = p10; - - - FragColor = vec4(color, 1.0); -} +#version 450 + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + + +const vec3 dt = vec3(65536.0,256.0,1.0); + + +float GET_RESULT(float A, float B, float C, float D) +{ + return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); +} + + +float reduce(vec3 color) +{ + return dot(color,dt); +} + + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* Default Vertex shader */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord * 1.0001; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + + +void main() +{ + vec2 OGL2Size = params.SourceSize.xy; + vec2 OGL2InvSize = params.SourceSize.zw; + + // Calculating texel coordinates + + vec2 OGL2Pos = vTexCoord.xy*OGL2Size.xy; + vec2 fp = fract(OGL2Pos); + vec2 g1 = vec2( OGL2InvSize.x,OGL2InvSize.y); + vec2 g2 = vec2(-OGL2InvSize.x,OGL2InvSize.y); + + + if ((fp.x >= 0.50) && (fp.y < 0.50)) g2*=-1.0; + + vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize; + + vec2 pC8 = pC4 + g1; + vec2 pC0 = pC4 - g1; + + vec2 p04 = pC4 - 0.5*g1; + vec2 pC3 = p04 + 0.5*g2; + vec2 pC1 = pC3 - g2; + vec2 pC5 = pC1 + g1; + vec2 pC7 = pC3 + g1; + + + // Reading the texels + + vec3 C0 = texture(Source,pC0 ).xyz; + vec3 C1 = texture(Source,pC1 ).xyz; + vec3 C2 = texture(Source,pC4-g2).xyz; + vec3 C3 = texture(Source,pC3 ).xyz; + vec3 C4 = texture(Source,pC4 ).xyz; + vec3 C5 = texture(Source,pC5 ).xyz; + vec3 D4 = texture(Source,pC8-g2).xyz; + vec3 C6 = texture(Source,pC4+g2).xyz; + vec3 C7 = texture(Source,pC7 ).xyz; + vec3 C8 = texture(Source,pC8 ).xyz; + vec3 D5 = texture(Source,pC5+g1).xyz; + vec3 D0 = texture(Source,pC7+g2).xyz; + vec3 D1 = texture(Source,pC8+g2).xyz; + vec3 D2 = texture(Source,pC7+g1).xyz; + vec3 p10,p11; + + float c0 = reduce(C0);float c1 = reduce(C1); + float c2 = reduce(C2);float c3 = reduce(C3); + float c4 = reduce(C4);float c5 = reduce(C5); + float c6 = reduce(C6);float c7 = reduce(C7); + float c8 = reduce(C8);float d0 = reduce(D0); + float d1 = reduce(D1);float d2 = reduce(D2); + float d4 = reduce(D4);float d5 = reduce(D5); + + + /* 2xSaI code */ + /* Copied from the Dosbox source code */ + /* Copyright (C) 2002-2007 The DOSBox Team */ + /* License: GNU-GPL */ + /* Adapted by guest(r) on 20.4 and 9.5. 2007 */ + + if (c4 == c8) { + if (c5 != c7) { + if (((c4 == c3)&&(c7 == d2))||((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0))) { + p10 = C4; + } else { + p10 = 0.5*(C4+C7); + } + p11 = C4; + } else { + if (c4 == c5) { + p10 = C4; + p11 = C4; + } else { + float r; + r = GET_RESULT(c4,c5,c3,c1); + r -= GET_RESULT(c5,c4,d4,c2); + r -= GET_RESULT(c5,c4,c6,d1); + r += GET_RESULT(c4,c5,d5,d2); + if (r > 0.0) p11 = C4; + else if (r < 0.0) p11 = C5; + else p11 = 0.25*(C4+C5+C7+C8); + p10 = 0.5*(C4+C7); + } + } + } else + if (c5 == c7) { + if (((c7 == c6)&&(c4 == c2))||((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0))) { + p10 = C7; + } else { + p10 = 0.5*(C4+C7); + } + p11 = C5; + } else { + p11 = 0.25*(C4+C5+C7+C8); + + if ((c4 == c5)&&(c4 == c6)&&(c3 != c7)&&(c7 == d0)) { + p10 = C4; + } else if ((c7 == c3)&&(c7 == c8)&&(c4 != c6)&&(c4 == c0)) { + p10 = C7; + } else { + p10 = 0.5*(C4+C7); + } + } + + // Distributing the final products + + vec3 color; + + if (fp.x >= 0.5 && fp.y >= 0.5) color = p11; else + if (fp.x < 0.5 && fp.y < 0.5) color = C4; else color = p10; + + + FragColor = vec4(color, 1.0); +} diff --git a/eagle/shaders/super-2xsai.slang b/edge-smoothing/eagle/shaders/super-2xsai.slang similarity index 96% rename from eagle/shaders/super-2xsai.slang rename to edge-smoothing/eagle/shaders/super-2xsai.slang index c668ccc3..90b00d6b 100644 --- a/eagle/shaders/super-2xsai.slang +++ b/edge-smoothing/eagle/shaders/super-2xsai.slang @@ -1,161 +1,161 @@ -#version 450 - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - - -const vec3 dt = vec3(65536.0,256.0,1.0); - - -float GET_RESULT(float A, float B, float C, float D) -{ - return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); -} - - -float reduce(vec3 color) -{ - return dot(color,dt); -} - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* Default Vertex shader */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - - -void main() -{ - vec2 OGL2Size = params.SourceSize.xy; - vec2 OGL2InvSize = params.SourceSize.zw; - - // Calculating texel coordinates - - vec2 OGL2Pos = vTexCoord*OGL2Size.xy; - vec2 fp = fract(OGL2Pos); - vec2 dx = vec2(OGL2InvSize.x,0.0); - vec2 dy = vec2(0.0,OGL2InvSize.y); - vec2 g1 = vec2( OGL2InvSize.x,OGL2InvSize.y); - vec2 g2 = vec2(-OGL2InvSize.x,OGL2InvSize.y); - - vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize; - vec2 pC8 = pC4 + g1; - - // Reading the texels - - vec3 C0 = texture(Source,pC4-g1).xyz; - vec3 C1 = texture(Source,pC4-dy).xyz; - vec3 C2 = texture(Source,pC4-g2).xyz; - vec3 D3 = texture(Source,pC4-g2+dx).xyz; - vec3 C3 = texture(Source,pC4-dx).xyz; - vec3 C4 = texture(Source,pC4).xyz; - vec3 C5 = texture(Source,pC4+dx).xyz; - vec3 D4 = texture(Source,pC8-g2).xyz; - vec3 C6 = texture(Source,pC4+g2).xyz; - vec3 C7 = texture(Source,pC4+dy).xyz; - vec3 C8 = texture(Source,pC8).xyz; - vec3 D5 = texture(Source,pC8+dx).xyz; - vec3 D0 = texture(Source,pC4+g2+dy).xyz; - vec3 D1 = texture(Source,pC8+g2).xyz; - vec3 D2 = texture(Source,pC8+dy).xyz; - vec3 D6 = texture(Source,pC8+g1).xyz; - - vec3 p00,p10,p01,p11; - - float c0 = reduce(C0);float c1 = reduce(C1); - float c2 = reduce(C2);float c3 = reduce(C3); - float c4 = reduce(C4);float c5 = reduce(C5); - float c6 = reduce(C6);float c7 = reduce(C7); - float c8 = reduce(C8);float d0 = reduce(D0); - float d1 = reduce(D1);float d2 = reduce(D2); - float d3 = reduce(D3);float d4 = reduce(D4); - float d5 = reduce(D5);float d6 = reduce(D6); - - /* Super2xSaI code */ - /* Copied from the Dosbox source code */ - /* Copyright (C) 2002-2007 The DOSBox Team */ - /* License: GNU-GPL */ - /* Adapted by guest(r) on 16.4.2007 */ - - - if (c7 == c5 && c4 != c8) { - p11 = p01 = C7; - } else if (c4 == c8 && c7 != c5) { - p11 = p01 = C4; - } else if (c4 == c8 && c7 == c5) { - float r; - r = GET_RESULT(c5,c4,c6,d1); - r+= GET_RESULT(c5,c4,c3,c1); - r+= GET_RESULT(c5,c4,d2,d5); - r+= GET_RESULT(c5,c4,c2,d4); - - if (r > 0.0) - p11 = p01 = C5; - else if (r < 0.0) - p11 = p01 = C4; - else { - p11 = p01 = 0.5*(C4+C5); - } - } else { - if (c5 == c8 && c8 == d1 && c7 != d2 && c8 != d0) - p11 = 0.25*(3.0*C8+C7); - else if (c4 == c7 && c7 == d2 && d1 != c8 && c7 != d6) - p11 = 0.25*(3.0*C7+C8); - else - p11 = 0.5*(C7+C8); - - if (c5 == c8 && c5 == c1 && c4 != c2 && c5 != c0) - p01 = 0.25*(3.0*C5+C4); - else if (c4 == c7 && c4 == c2 && c1 != c5 && c4 != d3) - p01 = 0.25*(3.0*C4+C5); - else - p01 = 0.5*(C4+C5); - } - - if (c4 == c8 && c7 != c5 && c3 == c4 && c4 != d2) - p10 = 0.5*(C7+C4); - else if (c4 == c6 && c5 == c4 && c3 != c7 && c4 != d0) - p10 = 0.5*(C7+C4); - else - p10 = C7; - - if (c7 == c5 && c4 != c8 && c6 == c7 && c7 != c2) - p00 = 0.5*(C7+C4); - else if (c3 == c7 && c8 == c7 && c6 != c4 && c7 != c0) - p00 = 0.5*(C7+C4); - else - p00 = C4; - - // Distributing the final products - - vec3 color = 0.0.xxx; - - if (fp.x < 0.50) - { if (fp.y < 0.50) color = p00; else color = p10;} - else - { if (fp.y < 0.50) color = p01; else color = p11;} - - FragColor = vec4(color, 1.0); -} +#version 450 + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + + +const vec3 dt = vec3(65536.0,256.0,1.0); + + +float GET_RESULT(float A, float B, float C, float D) +{ + return (sign(abs(A-C)+abs(A-D)) - sign(abs(B-C)+abs(B-D))); +} + + +float reduce(vec3 color) +{ + return dot(color,dt); +} + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* Default Vertex shader */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + + +void main() +{ + vec2 OGL2Size = params.SourceSize.xy; + vec2 OGL2InvSize = params.SourceSize.zw; + + // Calculating texel coordinates + + vec2 OGL2Pos = vTexCoord*OGL2Size.xy; + vec2 fp = fract(OGL2Pos); + vec2 dx = vec2(OGL2InvSize.x,0.0); + vec2 dy = vec2(0.0,OGL2InvSize.y); + vec2 g1 = vec2( OGL2InvSize.x,OGL2InvSize.y); + vec2 g2 = vec2(-OGL2InvSize.x,OGL2InvSize.y); + + vec2 pC4 = floor(OGL2Pos)/OGL2Size.xy + 0.5*OGL2InvSize; + vec2 pC8 = pC4 + g1; + + // Reading the texels + + vec3 C0 = texture(Source,pC4-g1).xyz; + vec3 C1 = texture(Source,pC4-dy).xyz; + vec3 C2 = texture(Source,pC4-g2).xyz; + vec3 D3 = texture(Source,pC4-g2+dx).xyz; + vec3 C3 = texture(Source,pC4-dx).xyz; + vec3 C4 = texture(Source,pC4).xyz; + vec3 C5 = texture(Source,pC4+dx).xyz; + vec3 D4 = texture(Source,pC8-g2).xyz; + vec3 C6 = texture(Source,pC4+g2).xyz; + vec3 C7 = texture(Source,pC4+dy).xyz; + vec3 C8 = texture(Source,pC8).xyz; + vec3 D5 = texture(Source,pC8+dx).xyz; + vec3 D0 = texture(Source,pC4+g2+dy).xyz; + vec3 D1 = texture(Source,pC8+g2).xyz; + vec3 D2 = texture(Source,pC8+dy).xyz; + vec3 D6 = texture(Source,pC8+g1).xyz; + + vec3 p00,p10,p01,p11; + + float c0 = reduce(C0);float c1 = reduce(C1); + float c2 = reduce(C2);float c3 = reduce(C3); + float c4 = reduce(C4);float c5 = reduce(C5); + float c6 = reduce(C6);float c7 = reduce(C7); + float c8 = reduce(C8);float d0 = reduce(D0); + float d1 = reduce(D1);float d2 = reduce(D2); + float d3 = reduce(D3);float d4 = reduce(D4); + float d5 = reduce(D5);float d6 = reduce(D6); + + /* Super2xSaI code */ + /* Copied from the Dosbox source code */ + /* Copyright (C) 2002-2007 The DOSBox Team */ + /* License: GNU-GPL */ + /* Adapted by guest(r) on 16.4.2007 */ + + + if (c7 == c5 && c4 != c8) { + p11 = p01 = C7; + } else if (c4 == c8 && c7 != c5) { + p11 = p01 = C4; + } else if (c4 == c8 && c7 == c5) { + float r; + r = GET_RESULT(c5,c4,c6,d1); + r+= GET_RESULT(c5,c4,c3,c1); + r+= GET_RESULT(c5,c4,d2,d5); + r+= GET_RESULT(c5,c4,c2,d4); + + if (r > 0.0) + p11 = p01 = C5; + else if (r < 0.0) + p11 = p01 = C4; + else { + p11 = p01 = 0.5*(C4+C5); + } + } else { + if (c5 == c8 && c8 == d1 && c7 != d2 && c8 != d0) + p11 = 0.25*(3.0*C8+C7); + else if (c4 == c7 && c7 == d2 && d1 != c8 && c7 != d6) + p11 = 0.25*(3.0*C7+C8); + else + p11 = 0.5*(C7+C8); + + if (c5 == c8 && c5 == c1 && c4 != c2 && c5 != c0) + p01 = 0.25*(3.0*C5+C4); + else if (c4 == c7 && c4 == c2 && c1 != c5 && c4 != d3) + p01 = 0.25*(3.0*C4+C5); + else + p01 = 0.5*(C4+C5); + } + + if (c4 == c8 && c7 != c5 && c3 == c4 && c4 != d2) + p10 = 0.5*(C7+C4); + else if (c4 == c6 && c5 == c4 && c3 != c7 && c4 != d0) + p10 = 0.5*(C7+C4); + else + p10 = C7; + + if (c7 == c5 && c4 != c8 && c6 == c7 && c7 != c2) + p00 = 0.5*(C7+C4); + else if (c3 == c7 && c8 == c7 && c6 != c4 && c7 != c0) + p00 = 0.5*(C7+C4); + else + p00 = C4; + + // Distributing the final products + + vec3 color = 0.0.xxx; + + if (fp.x < 0.50) + { if (fp.y < 0.50) color = p00; else color = p10;} + else + { if (fp.y < 0.50) color = p01; else color = p11;} + + FragColor = vec4(color, 1.0); +} diff --git a/eagle/shaders/supereagle.slang b/edge-smoothing/eagle/shaders/supereagle.slang similarity index 100% rename from eagle/shaders/supereagle.slang rename to edge-smoothing/eagle/shaders/supereagle.slang diff --git a/eagle/super-2xsai-fix-pixel-shift.slangp b/edge-smoothing/eagle/super-2xsai-fix-pixel-shift.slangp similarity index 100% rename from eagle/super-2xsai-fix-pixel-shift.slangp rename to edge-smoothing/eagle/super-2xsai-fix-pixel-shift.slangp diff --git a/eagle/super-2xsai.slangp b/edge-smoothing/eagle/super-2xsai.slangp similarity index 70% rename from eagle/super-2xsai.slangp rename to edge-smoothing/eagle/super-2xsai.slangp index 6c857e7e..5ce4ea56 100644 --- a/eagle/super-2xsai.slangp +++ b/edge-smoothing/eagle/super-2xsai.slangp @@ -1,17 +1,17 @@ -shaders = 3 - -shader0 = shaders/super-2xsai.slang -filter_linear0 = false -scale_type0 = source -scale_x0 = 2.0 -scale_y0 = 2.0 - -shader1 = ../cubic/shaders/bicubic-x.slang -filter_linear1 = false -scale_type_x1 = viewport -scale_type_y1 = source -scale1 = 1.0 - -shader2 = ../cubic/shaders/bicubic-y.slang -filter_linear2 = false -scale_type2 = viewport +shaders = 3 + +shader0 = shaders/super-2xsai.slang +filter_linear0 = false +scale_type0 = source +scale_x0 = 2.0 +scale_y0 = 2.0 + +shader1 = ../../interpolation/shaders/bicubic-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../../interpolation/shaders/bicubic-y.slang +filter_linear2 = false +scale_type2 = viewport diff --git a/eagle/supereagle.slangp b/edge-smoothing/eagle/supereagle.slangp similarity index 100% rename from eagle/supereagle.slangp rename to edge-smoothing/eagle/supereagle.slangp diff --git a/fsr/fsr-easu.slangp b/edge-smoothing/fsr/fsr-easu.slangp similarity index 100% rename from fsr/fsr-easu.slangp rename to edge-smoothing/fsr/fsr-easu.slangp diff --git a/fsr/fsr.slangp b/edge-smoothing/fsr/fsr.slangp similarity index 100% rename from fsr/fsr.slangp rename to edge-smoothing/fsr/fsr.slangp diff --git a/fsr/shaders/ffx_a.h b/edge-smoothing/fsr/shaders/ffx_a.h similarity index 100% rename from fsr/shaders/ffx_a.h rename to edge-smoothing/fsr/shaders/ffx_a.h diff --git a/fsr/shaders/ffx_fsr1.h b/edge-smoothing/fsr/shaders/ffx_fsr1.h similarity index 100% rename from fsr/shaders/ffx_fsr1.h rename to edge-smoothing/fsr/shaders/ffx_fsr1.h diff --git a/fsr/shaders/fsr-pass0.slang b/edge-smoothing/fsr/shaders/fsr-pass0.slang similarity index 100% rename from fsr/shaders/fsr-pass0.slang rename to edge-smoothing/fsr/shaders/fsr-pass0.slang diff --git a/fsr/shaders/fsr-pass1.slang b/edge-smoothing/fsr/shaders/fsr-pass1.slang similarity index 100% rename from fsr/shaders/fsr-pass1.slang rename to edge-smoothing/fsr/shaders/fsr-pass1.slang diff --git a/fsr/smaa+fsr.slangp b/edge-smoothing/fsr/smaa+fsr.slangp similarity index 75% rename from fsr/smaa+fsr.slangp rename to edge-smoothing/fsr/smaa+fsr.slangp index aaf010b1..aad4ac34 100644 --- a/fsr/smaa+fsr.slangp +++ b/edge-smoothing/fsr/smaa+fsr.slangp @@ -1,29 +1,29 @@ shaders = 6 -shader0 = ../stock.slang +shader0 = ../../stock.slang filter_linear0 = false scale_type0 = source scale0 = 1.0 alias0 = SMAA_Input -shader1 = ../anti-aliasing/shaders/smaa/smaa-pass0.slang +shader1 = ../../anti-aliasing/shaders/smaa/smaa-pass0.slang filter_linear1 = true scale_type1 = source scale1 = 1.0 -shader2 = ../anti-aliasing/shaders/smaa/smaa-pass1.slang +shader2 = ../../anti-aliasing/shaders/smaa/smaa-pass1.slang filter_linear2 = true scale_type2 = source scale2 = 1.0 -shader3 = ../anti-aliasing/shaders/smaa/smaa-pass2.slang +shader3 = ../../anti-aliasing/shaders/smaa/smaa-pass2.slang filter_linear3 = true scale_type3 = source scale3 = 1.0 textures = "areaTex;searchTex" -areaTex = ../anti-aliasing/shaders/smaa/AreaTex.png -searchTex = ../anti-aliasing/shaders/smaa/SearchTex.png +areaTex = ../../anti-aliasing/shaders/smaa/AreaTex.png +searchTex = ../../anti-aliasing/shaders/smaa/SearchTex.png shader4 = shaders/fsr-pass0.slang filter_linear4 = true diff --git a/hqx/hq2x-halphon.slangp b/edge-smoothing/hqx/hq2x-halphon.slangp similarity index 69% rename from hqx/hq2x-halphon.slangp rename to edge-smoothing/hqx/hq2x-halphon.slangp index dc270924..fd38f3a9 100644 --- a/hqx/hq2x-halphon.slangp +++ b/edge-smoothing/hqx/hq2x-halphon.slangp @@ -1,10 +1,10 @@ shaders = 3 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = hqx_refpass shader1 = shaders/hq2x-halphon.slang -shader2 = ../stock.slang +shader2 = ../../stock.slang filter_linear1 = false scale_type1 = source diff --git a/hqx/hq2x.slangp b/edge-smoothing/hqx/hq2x.slangp similarity index 73% rename from hqx/hq2x.slangp rename to edge-smoothing/hqx/hq2x.slangp index 873d0ad8..6efc4f08 100644 --- a/hqx/hq2x.slangp +++ b/edge-smoothing/hqx/hq2x.slangp @@ -1,6 +1,6 @@ shaders = 5 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = hqx_refpass shader1 = shaders/pass1.slang shader2 = shaders/hq2x.slang @@ -13,13 +13,13 @@ filter_linear2 = false scale_type2 = source scale2 = 2.0 -shader3 = ../cubic/shaders/bicubic-x.slang +shader3 = ../../interpolation/shaders/bicubic-x.slang filter_linear3 = false scale_type_x3 = viewport scale_type_y3 = source scale3 = 1.0 -shader4 = ../cubic/shaders/bicubic-y.slang +shader4 = ../../interpolation/shaders/bicubic-y.slang filter_linear4 = false textures = LUT diff --git a/hqx/hq3x.slangp b/edge-smoothing/hqx/hq3x.slangp similarity index 73% rename from hqx/hq3x.slangp rename to edge-smoothing/hqx/hq3x.slangp index d5c1987c..345037fe 100644 --- a/hqx/hq3x.slangp +++ b/edge-smoothing/hqx/hq3x.slangp @@ -1,6 +1,6 @@ shaders = 5 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = hqx_refpass shader1 = shaders/pass1.slang shader2 = shaders/hq3x.slang @@ -13,13 +13,13 @@ filter_linear2 = false scale_type2 = source scale2 = 3.0 -shader3 = ../cubic/shaders/b-spline-x.slang +shader3 = ../../interpolation/shaders/b-spline-x.slang filter_linear3 = false scale_type_x3 = viewport scale_type_y3 = source scale3 = 1.0 -shader4 = ../cubic/shaders/b-spline-y.slang +shader4 = ../../interpolation/shaders/b-spline-y.slang filter_linear4 = false diff --git a/hqx/hq4x.slangp b/edge-smoothing/hqx/hq4x.slangp similarity index 73% rename from hqx/hq4x.slangp rename to edge-smoothing/hqx/hq4x.slangp index cb03ad41..6357cc1c 100644 --- a/hqx/hq4x.slangp +++ b/edge-smoothing/hqx/hq4x.slangp @@ -1,6 +1,6 @@ shaders = 5 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = hqx_refpass shader1 = shaders/pass1.slang shader2 = shaders/hq4x.slang @@ -13,13 +13,13 @@ filter_linear2 = false scale_type2 = source scale2 = 4.0 -shader3 = ../cubic/shaders/b-spline-x.slang +shader3 = ../../interpolation/shaders/b-spline-x.slang filter_linear3 = false scale_type_x3 = viewport scale_type_y3 = source scale3 = 1.0 -shader4 = ../cubic/shaders/b-spline-y.slang +shader4 = ../../interpolation/shaders/b-spline-y.slang filter_linear4 = false textures = LUT diff --git a/hqx/resources/hq2x.png b/edge-smoothing/hqx/resources/hq2x.png similarity index 100% rename from hqx/resources/hq2x.png rename to edge-smoothing/hqx/resources/hq2x.png diff --git a/hqx/resources/hq3x.png b/edge-smoothing/hqx/resources/hq3x.png similarity index 100% rename from hqx/resources/hq3x.png rename to edge-smoothing/hqx/resources/hq3x.png diff --git a/hqx/resources/hq4x.png b/edge-smoothing/hqx/resources/hq4x.png similarity index 100% rename from hqx/resources/hq4x.png rename to edge-smoothing/hqx/resources/hq4x.png diff --git a/hqx/shaders/hq2x-halphon.slang b/edge-smoothing/hqx/shaders/hq2x-halphon.slang similarity index 100% rename from hqx/shaders/hq2x-halphon.slang rename to edge-smoothing/hqx/shaders/hq2x-halphon.slang diff --git a/hqx/shaders/hq2x.slang b/edge-smoothing/hqx/shaders/hq2x.slang similarity index 100% rename from hqx/shaders/hq2x.slang rename to edge-smoothing/hqx/shaders/hq2x.slang diff --git a/hqx/shaders/hq3x.slang b/edge-smoothing/hqx/shaders/hq3x.slang similarity index 100% rename from hqx/shaders/hq3x.slang rename to edge-smoothing/hqx/shaders/hq3x.slang diff --git a/hqx/shaders/hq4x.slang b/edge-smoothing/hqx/shaders/hq4x.slang similarity index 100% rename from hqx/shaders/hq4x.slang rename to edge-smoothing/hqx/shaders/hq4x.slang diff --git a/hqx/shaders/pass1.slang b/edge-smoothing/hqx/shaders/pass1.slang similarity index 100% rename from hqx/shaders/pass1.slang rename to edge-smoothing/hqx/shaders/pass1.slang diff --git a/hqx/shaders/pass2.inc b/edge-smoothing/hqx/shaders/pass2.inc similarity index 100% rename from hqx/shaders/pass2.inc rename to edge-smoothing/hqx/shaders/pass2.inc diff --git a/nedi/fast-bilateral-nedi.slangp b/edge-smoothing/nedi/fast-bilateral-nedi.slangp similarity index 93% rename from nedi/fast-bilateral-nedi.slangp rename to edge-smoothing/nedi/fast-bilateral-nedi.slangp index b662bf0c..c010f7f2 100644 --- a/nedi/fast-bilateral-nedi.slangp +++ b/edge-smoothing/nedi/fast-bilateral-nedi.slangp @@ -1,5 +1,5 @@ shaders = "5" -shader0 = ../denoisers/shaders/fast-bilateral.slang +shader0 = ../../denoisers/shaders/fast-bilateral.slang filter_linear0 = false scale_type0 = source shader1 = "shaders/nedi-pass0.slang" diff --git a/nedi/nedi.slangp b/edge-smoothing/nedi/nedi.slangp similarity index 100% rename from nedi/nedi.slangp rename to edge-smoothing/nedi/nedi.slangp diff --git a/nedi/presets/bilateral-variant.slangp b/edge-smoothing/nedi/presets/bilateral-variant.slangp similarity index 81% rename from nedi/presets/bilateral-variant.slangp rename to edge-smoothing/nedi/presets/bilateral-variant.slangp index 0491709b..bdccb204 100644 --- a/nedi/presets/bilateral-variant.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant.slangp @@ -45,14 +45,14 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "..\..\denoisers\shaders\fast-bilateral.slang" -shader1 = "..\shaders\nedi-pass0.slang" -shader2 = "..\shaders\nedi-pass1.slang" -shader3 = "..\shaders\nedi-pass2.slang" -shader4 = "..\shaders\nedi-jinc.slang" -shader5 = "..\..\denoisers\shaders\slow-bilateral.slang" -shader6 = "..\..\vhs\shaders\vhs.slang" -shader7 = "..\..\sharpen\shaders\adaptive-sharpen.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" +shader1 = "../shaders/nedi-pass0.slang" +shader2 = "../shaders/nedi-pass1.slang" +shader3 = "../shaders/nedi-pass2.slang" +shader4 = "../shaders/nedi-jinc.slang" +shader5 = "../../../denoisers/shaders/slow-bilateral.slang" +shader6 = "../../../vhs/shaders/vhs.slang" +shader7 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "8" SIGMA = "10.000000" SIGMA_R = "0.400000" diff --git a/nedi/presets/bilateral-variant2.slangp b/edge-smoothing/nedi/presets/bilateral-variant2.slangp similarity index 92% rename from nedi/presets/bilateral-variant2.slangp rename to edge-smoothing/nedi/presets/bilateral-variant2.slangp index b20d23a1..a0816e03 100644 --- a/nedi/presets/bilateral-variant2.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant2.slangp @@ -38,12 +38,12 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../sharpen/shaders/adaptive-sharpen.slang" +shader5 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "6" SIGMA_R = "0.400000" srgb_framebuffer0 = "false" diff --git a/nedi/presets/bilateral-variant3.slangp b/edge-smoothing/nedi/presets/bilateral-variant3.slangp similarity index 89% rename from nedi/presets/bilateral-variant3.slangp rename to edge-smoothing/nedi/presets/bilateral-variant3.slangp index 89346d88..3775ab97 100644 --- a/nedi/presets/bilateral-variant3.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant3.slangp @@ -48,14 +48,14 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/shaders/natural-vision.slang" -shader6 = "../../vhs/shaders/vhs.slang" -shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" +shader5 = "../../../misc/shaders/natural-vision.slang" +shader6 = "../../../vhs/shaders/vhs.slang" +shader7 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "8" SIGMA_R = "0.400000" smear = "0.500000" diff --git a/nedi/presets/bilateral-variant4.slangp b/edge-smoothing/nedi/presets/bilateral-variant4.slangp similarity index 88% rename from nedi/presets/bilateral-variant4.slangp rename to edge-smoothing/nedi/presets/bilateral-variant4.slangp index 3f252e90..4cd60296 100644 --- a/nedi/presets/bilateral-variant4.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant4.slangp @@ -51,15 +51,15 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/shaders/natural-vision.slang" -shader6 = "../../vhs/shaders/vhs.slang" -shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" -shader8 = "../../sharpen/shaders/adaptive-sharpen.slang" +shader5 = "../../../misc/shaders/natural-vision.slang" +shader6 = "../../../vhs/shaders/vhs.slang" +shader7 = "../../../sharpen/shaders/adaptive-sharpen.slang" +shader8 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "9" SIGMA_R = "0.400000" smear = "0.500000" diff --git a/nedi/presets/bilateral-variant5.slangp b/edge-smoothing/nedi/presets/bilateral-variant5.slangp similarity index 86% rename from nedi/presets/bilateral-variant5.slangp rename to edge-smoothing/nedi/presets/bilateral-variant5.slangp index 44b1b20c..e99f8735 100644 --- a/nedi/presets/bilateral-variant5.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant5.slangp @@ -54,16 +54,16 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../misc/shaders/natural-vision.slang" -shader6 = "../../vhs/shaders/vhs.slang" -shader7 = "../../sharpen/shaders/adaptive-sharpen.slang" -shader8 = "../../sharpen/shaders/adaptive-sharpen.slang" -shader9 = "../../reshade/shaders/vibrance-pass-sh1nra358.slang" +shader5 = "../../../misc/shaders/natural-vision.slang" +shader6 = "../../../vhs/shaders/vhs.slang" +shader7 = "../../../sharpen/shaders/adaptive-sharpen.slang" +shader8 = "../../../sharpen/shaders/adaptive-sharpen.slang" +shader9 = "../../../reshade/shaders/vibrance-pass-sh1nra358.slang" shaders = "10" SIGMA_R = "0.400000" smear = "0.500000" diff --git a/nedi/presets/bilateral-variant6.slangp b/edge-smoothing/nedi/presets/bilateral-variant6.slangp similarity index 91% rename from nedi/presets/bilateral-variant6.slangp rename to edge-smoothing/nedi/presets/bilateral-variant6.slangp index 850a160d..35a3d74e 100644 --- a/nedi/presets/bilateral-variant6.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant6.slangp @@ -41,13 +41,13 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../vhs/shaders/vhs.slang" -shader6 = "../../sharpen/shaders/adaptive-sharpen.slang" +shader5 = "../../../vhs/shaders/vhs.slang" +shader6 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "7" SIGMA_R = "0.200000" smear = "0.500000" diff --git a/nedi/presets/bilateral-variant7.slangp b/edge-smoothing/nedi/presets/bilateral-variant7.slangp similarity index 91% rename from nedi/presets/bilateral-variant7.slangp rename to edge-smoothing/nedi/presets/bilateral-variant7.slangp index cff0b395..e814cb42 100644 --- a/nedi/presets/bilateral-variant7.slangp +++ b/edge-smoothing/nedi/presets/bilateral-variant7.slangp @@ -41,13 +41,13 @@ scale_x3 = "1.000000" scale_y1 = "1.000000" scale_y2 = "2.000000" scale_y3 = "1.000000" -shader0 = "../../denoisers/shaders/fast-bilateral.slang" +shader0 = "../../../denoisers/shaders/fast-bilateral.slang" shader1 = "../shaders/nedi-pass0.slang" shader2 = "../shaders/nedi-pass1.slang" shader3 = "../shaders/nedi-pass2.slang" shader4 = "../shaders/nedi-jinc.slang" -shader5 = "../../vhs/shaders/vhs.slang" -shader6 = "../../sharpen/shaders/adaptive-sharpen.slang" +shader5 = "../../../vhs/shaders/vhs.slang" +shader6 = "../../../sharpen/shaders/adaptive-sharpen.slang" shaders = "7" SIGMA_R = "0.400000" smear = "0.500000" diff --git a/nedi/presets/test.test b/edge-smoothing/nedi/presets/test.test similarity index 100% rename from nedi/presets/test.test rename to edge-smoothing/nedi/presets/test.test diff --git a/nedi/shaders/nedi-jinc.slang b/edge-smoothing/nedi/shaders/nedi-jinc.slang similarity index 100% rename from nedi/shaders/nedi-jinc.slang rename to edge-smoothing/nedi/shaders/nedi-jinc.slang diff --git a/nedi/shaders/nedi-pass0.slang b/edge-smoothing/nedi/shaders/nedi-pass0.slang similarity index 100% rename from nedi/shaders/nedi-pass0.slang rename to edge-smoothing/nedi/shaders/nedi-pass0.slang diff --git a/nedi/shaders/nedi-pass1.slang b/edge-smoothing/nedi/shaders/nedi-pass1.slang similarity index 100% rename from nedi/shaders/nedi-pass1.slang rename to edge-smoothing/nedi/shaders/nedi-pass1.slang diff --git a/nedi/shaders/nedi-pass2.slang b/edge-smoothing/nedi/shaders/nedi-pass2.slang similarity index 100% rename from nedi/shaders/nedi-pass2.slang rename to edge-smoothing/nedi/shaders/nedi-pass2.slang diff --git a/nnedi3/LICENSE b/edge-smoothing/nnedi3/LICENSE similarity index 100% rename from nnedi3/LICENSE rename to edge-smoothing/nnedi3/LICENSE diff --git a/nnedi3/README.md b/edge-smoothing/nnedi3/README.md similarity index 100% rename from nnedi3/README.md rename to edge-smoothing/nnedi3/README.md diff --git a/nnedi3/nnedi3-nns16-2x-luma.slangp b/edge-smoothing/nnedi3/nnedi3-nns16-2x-luma.slangp similarity index 94% rename from nnedi3/nnedi3-nns16-2x-luma.slangp rename to edge-smoothing/nnedi3/nnedi3-nns16-2x-luma.slangp index bfe5d689..ae9eded2 100644 --- a/nnedi3/nnedi3-nns16-2x-luma.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns16-2x-luma.slangp @@ -41,6 +41,6 @@ scale_type5 = source scale_x5 = 1.0 scale_y5 = 1.0 -shader6 = ../windowed/shaders/jinc2.slang +shader6 = ../../interpolation/shaders/jinc2.slang filter_linear6 = false scale_type6 = viewport diff --git a/nnedi3/nnedi3-nns16-2x-rgb.slangp b/edge-smoothing/nnedi3/nnedi3-nns16-2x-rgb.slangp similarity index 89% rename from nnedi3/nnedi3-nns16-2x-rgb.slangp rename to edge-smoothing/nnedi3/nnedi3-nns16-2x-rgb.slangp index 6f3aea67..0683d87c 100644 --- a/nnedi3/nnedi3-nns16-2x-rgb.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns16-2x-rgb.slangp @@ -18,6 +18,6 @@ scale_type2 = source scale_x2 = 1.0 scale_y2 = 1.0 -shader3 = ../windowed/shaders/jinc2.slang +shader3 = ../../interpolation/shaders/jinc2.slang filter_linear3 = false scale_type3 = viewport diff --git a/nnedi3/nnedi3-nns16-4x-luma.slangp b/edge-smoothing/nnedi3/nnedi3-nns16-4x-luma.slangp similarity index 96% rename from nnedi3/nnedi3-nns16-4x-luma.slangp rename to edge-smoothing/nnedi3/nnedi3-nns16-4x-luma.slangp index eae0c3eb..a7dd2a99 100644 --- a/nnedi3/nnedi3-nns16-4x-luma.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns16-4x-luma.slangp @@ -62,6 +62,6 @@ scale_type8 = source scale_x8 = 1.0 scale_y8 = 1.0 -shader9 = ../windowed/shaders/jinc2.slang +shader9 = ../../interpolation/shaders/jinc2.slang filter_linear9 = false scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp b/edge-smoothing/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp similarity index 96% rename from nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp rename to edge-smoothing/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp index d851776f..c5920393 100644 --- a/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns32-2x-rgb-nns32-4x-luma.slangp @@ -62,6 +62,6 @@ scale_type8 = source scale_x8 = 1.0 scale_y8 = 1.0 -shader9 = ../windowed/shaders/jinc2.slang +shader9 = ../../interpolation/shaders/jinc2.slang filter_linear9 = false scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns32-4x-rgb.slangp b/edge-smoothing/nnedi3/nnedi3-nns32-4x-rgb.slangp similarity index 94% rename from nnedi3/nnedi3-nns32-4x-rgb.slangp rename to edge-smoothing/nnedi3/nnedi3-nns32-4x-rgb.slangp index d54eb78e..b8c1e6db 100644 --- a/nnedi3/nnedi3-nns32-4x-rgb.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns32-4x-rgb.slangp @@ -36,6 +36,6 @@ scale_type5 = source scale_x5 = 1.0 scale_y5 = 1.0 -shader6 = ../windowed/shaders/jinc2.slang +shader6 = ../../interpolation/shaders/jinc2.slang filter_linear6 = false scale_type6 = viewport diff --git a/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp b/edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp similarity index 95% rename from nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp rename to edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp index 023f6b98..c82d1f4a 100644 --- a/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-nns16-8x-rgb.slangp @@ -54,6 +54,6 @@ scale_type8 = source scale_x8 = 1.0 scale_y8 = 1.0 -shader9 = ../windowed/shaders/jinc2.slang +shader9 = ../../interpolation/shaders/jinc2.slang filter_linear9 = false scale_type9 = viewport diff --git a/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp b/edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp similarity index 94% rename from nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp rename to edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp index 55e145ac..ec13fbf5 100644 --- a/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp +++ b/edge-smoothing/nnedi3/nnedi3-nns64-2x-nns32-4x-rgb.slangp @@ -36,6 +36,6 @@ scale_type5 = source scale_x5 = 1.0 scale_y5 = 1.0 -shader6 = ../windowed/shaders/jinc2.slang +shader6 = ../../interpolation/shaders/jinc2.slang filter_linear6 = false scale_type6 = viewport diff --git a/nnedi3/shaders/jinc2-cshift-luma.slang b/edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang similarity index 100% rename from nnedi3/shaders/jinc2-cshift-luma.slang rename to edge-smoothing/nnedi3/shaders/jinc2-cshift-luma.slang diff --git a/nnedi3/shaders/jinc2-cshift-rgb.slang b/edge-smoothing/nnedi3/shaders/jinc2-cshift-rgb.slang similarity index 100% rename from nnedi3/shaders/jinc2-cshift-rgb.slang rename to edge-smoothing/nnedi3/shaders/jinc2-cshift-rgb.slang diff --git a/nnedi3/shaders/jinc2-on-passoutput0.slang b/edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang similarity index 100% rename from nnedi3/shaders/jinc2-on-passoutput0.slang rename to edge-smoothing/nnedi3/shaders/jinc2-on-passoutput0.slang diff --git a/nnedi3/shaders/jinc2-on-passoutput3.slang b/edge-smoothing/nnedi3/shaders/jinc2-on-passoutput3.slang similarity index 100% rename from nnedi3/shaders/jinc2-on-passoutput3.slang rename to edge-smoothing/nnedi3/shaders/jinc2-on-passoutput3.slang diff --git a/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns128-win8x4-pass1-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns128-win8x4-pass1-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass1-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns128-win8x4-pass2-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns128-win8x4-pass2-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns128-win8x4-pass2-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass1-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns16-win8x4-pass2-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns256-win8x4-pass1-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns256-win8x4-pass1-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass1-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns256-win8x4-pass2-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns256-win8x4-pass2-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns256-win8x4-pass2-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass1-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns32-win8x4-pass2-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass1-rgb.slang diff --git a/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-luma.slang diff --git a/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.slang b/edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.slang similarity index 100% rename from nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.slang rename to edge-smoothing/nnedi3/shaders/nnedi3-nns64-win8x4-pass2-rgb.slang diff --git a/nnedi3/shaders/rgb-to-yuv.slang b/edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang similarity index 100% rename from nnedi3/shaders/rgb-to-yuv.slang rename to edge-smoothing/nnedi3/shaders/rgb-to-yuv.slang diff --git a/nnedi3/shaders/yuv-to-rgb-2x.slang b/edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang similarity index 100% rename from nnedi3/shaders/yuv-to-rgb-2x.slang rename to edge-smoothing/nnedi3/shaders/yuv-to-rgb-2x.slang diff --git a/nnedi3/shaders/yuv-to-rgb-4x.slang b/edge-smoothing/nnedi3/shaders/yuv-to-rgb-4x.slang similarity index 100% rename from nnedi3/shaders/yuv-to-rgb-4x.slang rename to edge-smoothing/nnedi3/shaders/yuv-to-rgb-4x.slang diff --git a/omniscale/omniscale-legacy.slangp b/edge-smoothing/omniscale/omniscale-legacy.slangp similarity index 100% rename from omniscale/omniscale-legacy.slangp rename to edge-smoothing/omniscale/omniscale-legacy.slangp diff --git a/omniscale/omniscale.slangp b/edge-smoothing/omniscale/omniscale.slangp similarity index 100% rename from omniscale/omniscale.slangp rename to edge-smoothing/omniscale/omniscale.slangp diff --git a/omniscale/shaders/omniscale-legacy.slang b/edge-smoothing/omniscale/shaders/omniscale-legacy.slang similarity index 100% rename from omniscale/shaders/omniscale-legacy.slang rename to edge-smoothing/omniscale/shaders/omniscale-legacy.slang diff --git a/omniscale/shaders/omniscale.slang b/edge-smoothing/omniscale/shaders/omniscale.slang similarity index 100% rename from omniscale/shaders/omniscale.slang rename to edge-smoothing/omniscale/shaders/omniscale.slang diff --git a/sabr/sabr-hybrid-deposterize.slangp b/edge-smoothing/sabr/sabr-hybrid-deposterize.slangp similarity index 100% rename from sabr/sabr-hybrid-deposterize.slangp rename to edge-smoothing/sabr/sabr-hybrid-deposterize.slangp diff --git a/sabr/sabr.slangp b/edge-smoothing/sabr/sabr.slangp similarity index 100% rename from sabr/sabr.slangp rename to edge-smoothing/sabr/sabr.slangp diff --git a/sabr/shaders/sabr-hybrid-deposterize.slang b/edge-smoothing/sabr/shaders/sabr-hybrid-deposterize.slang similarity index 100% rename from sabr/shaders/sabr-hybrid-deposterize.slang rename to edge-smoothing/sabr/shaders/sabr-hybrid-deposterize.slang diff --git a/sabr/shaders/sabr-hybrid.slang b/edge-smoothing/sabr/shaders/sabr-hybrid.slang similarity index 100% rename from sabr/shaders/sabr-hybrid.slang rename to edge-smoothing/sabr/shaders/sabr-hybrid.slang diff --git a/sabr/shaders/sabr-v3.0.slang b/edge-smoothing/sabr/shaders/sabr-v3.0.slang similarity index 100% rename from sabr/shaders/sabr-v3.0.slang rename to edge-smoothing/sabr/shaders/sabr-v3.0.slang diff --git a/scalefx/scalefx+rAA.slangp b/edge-smoothing/scalefx/scalefx+rAA.slangp similarity index 75% rename from scalefx/scalefx+rAA.slangp rename to edge-smoothing/scalefx/scalefx+rAA.slangp index d1fca32c..39eb0478 100644 --- a/scalefx/scalefx+rAA.slangp +++ b/edge-smoothing/scalefx/scalefx+rAA.slangp @@ -1,6 +1,6 @@ shaders = 9 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = refpass filter_linear0 = "false" @@ -32,16 +32,16 @@ filter_linear5 = false scale_type5 = source scale5 = 3.0 -shader6 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.slang +shader6 = ../../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass0.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 -shader7 = ../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.slang +shader7 = ../../anti-aliasing/shaders/reverse-aa-post3x/reverse-aa-post3x-pass1.slang filter_linear7 = false scale_type7 = source scale7 = 1.0 -shader8 = ../cubic/shaders/bicubic.slang +shader8 = ../../interpolation/shaders/bicubic.slang filter_linear8 = false scale_type0 = viewport diff --git a/scalefx/scalefx-9x.slangp b/edge-smoothing/scalefx/scalefx-9x.slangp similarity index 97% rename from scalefx/scalefx-9x.slangp rename to edge-smoothing/scalefx/scalefx-9x.slangp index 8c7188f2..a83dd7a4 100644 --- a/scalefx/scalefx-9x.slangp +++ b/edge-smoothing/scalefx/scalefx-9x.slangp @@ -1,6 +1,6 @@ shaders = 9 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = scalefx_old_refpass shader1 = shaders/old/scalefx-pass0.slang diff --git a/scalefx/scalefx-hybrid.slangp b/edge-smoothing/scalefx/scalefx-hybrid.slangp similarity index 95% rename from scalefx/scalefx-hybrid.slangp rename to edge-smoothing/scalefx/scalefx-hybrid.slangp index 6cd9f2a0..1e83cb84 100644 --- a/scalefx/scalefx-hybrid.slangp +++ b/edge-smoothing/scalefx/scalefx-hybrid.slangp @@ -1,6 +1,6 @@ shaders = 6 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = refpass filter_linear0 = "false" diff --git a/scalefx/scalefx.slangp b/edge-smoothing/scalefx/scalefx.slangp similarity index 95% rename from scalefx/scalefx.slangp rename to edge-smoothing/scalefx/scalefx.slangp index 262f4fc8..2e4fc423 100644 --- a/scalefx/scalefx.slangp +++ b/edge-smoothing/scalefx/scalefx.slangp @@ -1,6 +1,6 @@ shaders = 6 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = refpass filter_linear0 = "false" diff --git a/scalefx/shaders/old/scalefx-9x.slangp b/edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp similarity index 96% rename from scalefx/shaders/old/scalefx-9x.slangp rename to edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp index 8b3c7b74..f4c5d583 100644 --- a/scalefx/shaders/old/scalefx-9x.slangp +++ b/edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp @@ -1,6 +1,6 @@ shaders = 9 -shader0 = ../../../stock.slang +shader0 = ../../../../stock.slang alias0 = scalefx_old_refpass shader1 = scalefx-pass0.slang diff --git a/scalefx/shaders/old/scalefx-pass0.slang b/edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang similarity index 100% rename from scalefx/shaders/old/scalefx-pass0.slang rename to edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang diff --git a/scalefx/shaders/old/scalefx-pass1.slang b/edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang similarity index 100% rename from scalefx/shaders/old/scalefx-pass1.slang rename to edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang diff --git a/scalefx/shaders/old/scalefx-pass2.slang b/edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang similarity index 100% rename from scalefx/shaders/old/scalefx-pass2.slang rename to edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang diff --git a/scalefx/shaders/old/scalefx-pass3.slang b/edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang similarity index 100% rename from scalefx/shaders/old/scalefx-pass3.slang rename to edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang diff --git a/scalefx/shaders/old/scalefx-pass7.slang b/edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang similarity index 100% rename from scalefx/shaders/old/scalefx-pass7.slang rename to edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang diff --git a/scalefx/shaders/old/scalefx.slangp b/edge-smoothing/scalefx/shaders/old/scalefx.slangp similarity index 92% rename from scalefx/shaders/old/scalefx.slangp rename to edge-smoothing/scalefx/shaders/old/scalefx.slangp index ef7829df..6dd9a796 100644 --- a/scalefx/shaders/old/scalefx.slangp +++ b/edge-smoothing/scalefx/shaders/old/scalefx.slangp @@ -1,6 +1,6 @@ shaders = 5 -shader0 = ../../../stock.slang +shader0 = ../../../../stock.slang alias0 = scalefx_old_refpass shader1 = scalefx-pass0.slang diff --git a/scalefx/shaders/scalefx-pass0.slang b/edge-smoothing/scalefx/shaders/scalefx-pass0.slang similarity index 100% rename from scalefx/shaders/scalefx-pass0.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass0.slang diff --git a/scalefx/shaders/scalefx-pass1.slang b/edge-smoothing/scalefx/shaders/scalefx-pass1.slang similarity index 100% rename from scalefx/shaders/scalefx-pass1.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass1.slang diff --git a/scalefx/shaders/scalefx-pass2.slang b/edge-smoothing/scalefx/shaders/scalefx-pass2.slang similarity index 100% rename from scalefx/shaders/scalefx-pass2.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass2.slang diff --git a/scalefx/shaders/scalefx-pass3.slang b/edge-smoothing/scalefx/shaders/scalefx-pass3.slang similarity index 100% rename from scalefx/shaders/scalefx-pass3.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass3.slang diff --git a/scalefx/shaders/scalefx-pass4-hybrid.slang b/edge-smoothing/scalefx/shaders/scalefx-pass4-hybrid.slang similarity index 100% rename from scalefx/shaders/scalefx-pass4-hybrid.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass4-hybrid.slang diff --git a/scalefx/shaders/scalefx-pass4.slang b/edge-smoothing/scalefx/shaders/scalefx-pass4.slang similarity index 100% rename from scalefx/shaders/scalefx-pass4.slang rename to edge-smoothing/scalefx/shaders/scalefx-pass4.slang diff --git a/scalehq/2xScaleHQ.slangp b/edge-smoothing/scalehq/2xScaleHQ.slangp similarity index 70% rename from scalehq/2xScaleHQ.slangp rename to edge-smoothing/scalehq/2xScaleHQ.slangp index e9e62e36..8922d5a9 100644 --- a/scalehq/2xScaleHQ.slangp +++ b/edge-smoothing/scalehq/2xScaleHQ.slangp @@ -6,13 +6,13 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/shaders/bicubic-x.slang +shader1 = ../../interpolation/shaders/bicubic-x.slang filter_linear1 = false scale_type_x1 = viewport scale_type_y1 = source scale1 = 1.0 -shader2 = ../cubic/shaders/bicubic-y.slang +shader2 = ../../interpolation/shaders/bicubic-y.slang filter_linear2 = false scale_type2 = viewport diff --git a/scalehq/4xScaleHQ.slangp b/edge-smoothing/scalehq/4xScaleHQ.slangp similarity index 70% rename from scalehq/4xScaleHQ.slangp rename to edge-smoothing/scalehq/4xScaleHQ.slangp index 0e994ca7..6e42762d 100644 --- a/scalehq/4xScaleHQ.slangp +++ b/edge-smoothing/scalehq/4xScaleHQ.slangp @@ -6,13 +6,13 @@ scale_type0 = source scale_x0 = 4.0 scale_y0 = 4.0 -shader1 = ../cubic/shaders/bicubic-x.slang +shader1 = ../../interpolation/shaders/bicubic-x.slang filter_linear1 = false scale_type_x1 = viewport scale_type_y1 = source scale1 = 1.0 -shader2 = ../cubic/shaders/bicubic-y.slang +shader2 = ../../interpolation/shaders/bicubic-y.slang filter_linear2 = false scale_type2 = viewport diff --git a/scalehq/shaders/2xScaleHQ.slang b/edge-smoothing/scalehq/shaders/2xScaleHQ.slang similarity index 100% rename from scalehq/shaders/2xScaleHQ.slang rename to edge-smoothing/scalehq/shaders/2xScaleHQ.slang diff --git a/scalehq/shaders/4xScaleHQ.slang b/edge-smoothing/scalehq/shaders/4xScaleHQ.slang similarity index 100% rename from scalehq/shaders/4xScaleHQ.slang rename to edge-smoothing/scalehq/shaders/4xScaleHQ.slang diff --git a/scalenx/epx.slangp b/edge-smoothing/scalenx/epx.slangp similarity index 73% rename from scalenx/epx.slangp rename to edge-smoothing/scalenx/epx.slangp index c803ffe9..b614892d 100644 --- a/scalenx/epx.slangp +++ b/edge-smoothing/scalenx/epx.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/mmpx.slangp b/edge-smoothing/scalenx/mmpx.slangp similarity index 73% rename from scalenx/mmpx.slangp rename to edge-smoothing/scalenx/mmpx.slangp index cb7bb7d3..749546e2 100644 --- a/scalenx/mmpx.slangp +++ b/edge-smoothing/scalenx/mmpx.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2x.slangp b/edge-smoothing/scalenx/scale2x.slangp similarity index 76% rename from scalenx/scale2x.slangp rename to edge-smoothing/scalenx/scale2x.slangp index f96eef0c..0453a425 100644 --- a/scalenx/scale2x.slangp +++ b/edge-smoothing/scalenx/scale2x.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2xSFX.slangp b/edge-smoothing/scalenx/scale2xSFX.slangp similarity index 76% rename from scalenx/scale2xSFX.slangp rename to edge-smoothing/scalenx/scale2xSFX.slangp index 3a7fffbe..89f83f81 100644 --- a/scalenx/scale2xSFX.slangp +++ b/edge-smoothing/scalenx/scale2xSFX.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale2xplus.slangp b/edge-smoothing/scalenx/scale2xplus.slangp similarity index 76% rename from scalenx/scale2xplus.slangp rename to edge-smoothing/scalenx/scale2xplus.slangp index 7fe4db16..b3fedd24 100644 --- a/scalenx/scale2xplus.slangp +++ b/edge-smoothing/scalenx/scale2xplus.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 2.0 scale_y0 = 2.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/scale3x.slangp b/edge-smoothing/scalenx/scale3x.slangp similarity index 76% rename from scalenx/scale3x.slangp rename to edge-smoothing/scalenx/scale3x.slangp index 09b35dd7..8a5fe762 100644 --- a/scalenx/scale3x.slangp +++ b/edge-smoothing/scalenx/scale3x.slangp @@ -6,6 +6,6 @@ scale_type0 = source scale_x0 = 3.0 scale_y0 = 3.0 -shader1 = ../cubic/shaders/bicubic.slang +shader1 = ../../interpolation/shaders/bicubic.slang filter_linear1 = false scale_type1 = viewport diff --git a/scalenx/shaders/epx.slang b/edge-smoothing/scalenx/shaders/epx.slang similarity index 100% rename from scalenx/shaders/epx.slang rename to edge-smoothing/scalenx/shaders/epx.slang diff --git a/scalenx/shaders/mmpx.slang b/edge-smoothing/scalenx/shaders/mmpx.slang similarity index 100% rename from scalenx/shaders/mmpx.slang rename to edge-smoothing/scalenx/shaders/mmpx.slang diff --git a/scalenx/shaders/scale2x.slang b/edge-smoothing/scalenx/shaders/scale2x.slang similarity index 100% rename from scalenx/shaders/scale2x.slang rename to edge-smoothing/scalenx/shaders/scale2x.slang diff --git a/scalenx/shaders/scale2xSFX.slang b/edge-smoothing/scalenx/shaders/scale2xSFX.slang similarity index 100% rename from scalenx/shaders/scale2xSFX.slang rename to edge-smoothing/scalenx/shaders/scale2xSFX.slang diff --git a/scalenx/shaders/scale2xplus.slang b/edge-smoothing/scalenx/shaders/scale2xplus.slang similarity index 100% rename from scalenx/shaders/scale2xplus.slang rename to edge-smoothing/scalenx/shaders/scale2xplus.slang diff --git a/scalenx/shaders/scale3x.slang b/edge-smoothing/scalenx/shaders/scale3x.slang similarity index 100% rename from scalenx/shaders/scale3x.slang rename to edge-smoothing/scalenx/shaders/scale3x.slang diff --git a/scalenx/shaders/scale3xSFX.slang b/edge-smoothing/scalenx/shaders/scale3xSFX.slang similarity index 100% rename from scalenx/shaders/scale3xSFX.slang rename to edge-smoothing/scalenx/shaders/scale3xSFX.slang diff --git a/xbr/README.md b/edge-smoothing/xbr/README.md similarity index 100% rename from xbr/README.md rename to edge-smoothing/xbr/README.md diff --git a/xbr/other presets/2xBR-lv1-multipass.slangp b/edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp similarity index 78% rename from xbr/other presets/2xBR-lv1-multipass.slangp rename to edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp index 6553a702..adf475e5 100644 --- a/xbr/other presets/2xBR-lv1-multipass.slangp +++ b/edge-smoothing/xbr/other presets/2xBR-lv1-multipass.slangp @@ -1,6 +1,6 @@ shaders = 4 -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = xBR_lv1_mp_refpass shader1 = "shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang" @@ -12,6 +12,6 @@ filter_linear2 = false scale_type2 = source scale2 = 2.0 -shader3 = ../../cubic/shaders/bicubic.slang +shader3 = ../../../interpolation/shaders/bicubic.slang filter_linear3 = false scale_type3 = viewport diff --git a/xbr/other presets/4xbr-hybrid-crt.slangp b/edge-smoothing/xbr/other presets/4xbr-hybrid-crt.slangp similarity index 100% rename from xbr/other presets/4xbr-hybrid-crt.slangp rename to edge-smoothing/xbr/other presets/4xbr-hybrid-crt.slangp diff --git a/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang b/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang similarity index 100% rename from xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang rename to edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass0.slang diff --git a/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang b/edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang similarity index 100% rename from xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang rename to edge-smoothing/xbr/other presets/shaders/2xBR-multipass/2xbr-lv1-c-pass1.slang diff --git a/xbr/other presets/shaders/4xbr-hybrid-crt.slang b/edge-smoothing/xbr/other presets/shaders/4xbr-hybrid-crt.slang similarity index 100% rename from xbr/other presets/shaders/4xbr-hybrid-crt.slang rename to edge-smoothing/xbr/other presets/shaders/4xbr-hybrid-crt.slang diff --git a/xbr/other presets/shaders/super-xbr/custom-jinc2-sharper.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/custom-jinc2-sharper.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/custom-jinc2-sharper.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/custom-jinc2-sharper.slang diff --git a/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass0.slang diff --git a/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass1.slang diff --git a/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-2xbr-3d-pass2.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass0.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass0.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass0.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass0.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1f.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1f.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1f.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass1f.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass2.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass2.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass2.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass2.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3.slang diff --git a/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3f.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3f.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3f.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-4xbr-3d-pass3f.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass0.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass0.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass0.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass0.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass1.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass1.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass1.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass1.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass2.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass2.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass2.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass2.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass3.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass3.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass3.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass3.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass4.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass4.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass4.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass4.slang diff --git a/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass5.slang b/edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass5.slang similarity index 100% rename from xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass5.slang rename to edge-smoothing/xbr/other presets/shaders/super-xbr/super-8xbr-3d-pass5.slang diff --git a/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang b/edge-smoothing/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang similarity index 100% rename from xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang rename to edge-smoothing/xbr/other presets/shaders/xbr-hybrid/2xbr-hybrid-v5-gamma.slang diff --git a/xbr/other presets/super-2xbr-3d-2p.slangp b/edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp similarity index 94% rename from xbr/other presets/super-2xbr-3d-2p.slangp rename to edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp index de510759..a20f1ff6 100644 --- a/xbr/other presets/super-2xbr-3d-2p.slangp +++ b/edge-smoothing/xbr/other presets/super-2xbr-3d-2p.slangp @@ -1,6 +1,6 @@ shaders = "4" -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = super2xbr3d_refpass shader1 = "shaders/super-xbr/super-2xbr-3d-pass0.slang" diff --git a/xbr/other presets/super-2xbr-3d-3p-smoother.slangp b/edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp similarity index 95% rename from xbr/other presets/super-2xbr-3d-3p-smoother.slangp rename to edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp index 805498cc..3cb29075 100644 --- a/xbr/other presets/super-2xbr-3d-3p-smoother.slangp +++ b/edge-smoothing/xbr/other presets/super-2xbr-3d-3p-smoother.slangp @@ -1,6 +1,6 @@ shaders = "5" -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = super2xbr3d_refpass shader1 = "shaders/super-xbr/super-2xbr-3d-pass0.slang" diff --git a/xbr/other presets/super-4xbr-3d-4p.slangp b/edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp similarity index 96% rename from xbr/other presets/super-4xbr-3d-4p.slangp rename to edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp index f4040199..e37f9bd6 100644 --- a/xbr/other presets/super-4xbr-3d-4p.slangp +++ b/edge-smoothing/xbr/other presets/super-4xbr-3d-4p.slangp @@ -1,6 +1,6 @@ shaders = "6" -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = super4xbr3d_refpass shader1 = "shaders/super-xbr/super-4xbr-3d-pass0.slang" diff --git a/xbr/other presets/super-4xbr-3d-6p-smoother.slangp b/edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp similarity index 97% rename from xbr/other presets/super-4xbr-3d-6p-smoother.slangp rename to edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp index 71ddd540..198fc255 100644 --- a/xbr/other presets/super-4xbr-3d-6p-smoother.slangp +++ b/edge-smoothing/xbr/other presets/super-4xbr-3d-6p-smoother.slangp @@ -1,6 +1,6 @@ shaders = "8" -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = super4xbr3d_refpass shader1 = "shaders/super-xbr/super-4xbr-3d-pass0.slang" diff --git a/xbr/other presets/super-8xbr-3d-6p.slangp b/edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp similarity index 97% rename from xbr/other presets/super-8xbr-3d-6p.slangp rename to edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp index f908e4dd..03fdeb11 100644 --- a/xbr/other presets/super-8xbr-3d-6p.slangp +++ b/edge-smoothing/xbr/other presets/super-8xbr-3d-6p.slangp @@ -1,6 +1,6 @@ shaders = "8" -shader0 = ../../stock.slang +shader0 = ../../../stock.slang alias0 = super8xbr3d_refpass shader1 = "shaders/super-xbr/super-8xbr-3d-pass0.slang" diff --git a/xbr/other presets/xbr-hybrid.slangp b/edge-smoothing/xbr/other presets/xbr-hybrid.slangp similarity index 100% rename from xbr/other presets/xbr-hybrid.slangp rename to edge-smoothing/xbr/other presets/xbr-hybrid.slangp diff --git a/xbr/other presets/xbr-lv1-standalone.slangp b/edge-smoothing/xbr/other presets/xbr-lv1-standalone.slangp similarity index 100% rename from xbr/other presets/xbr-lv1-standalone.slangp rename to edge-smoothing/xbr/other presets/xbr-lv1-standalone.slangp diff --git a/xbr/other presets/xbr-lv2-hd.slangp b/edge-smoothing/xbr/other presets/xbr-lv2-hd.slangp similarity index 100% rename from xbr/other presets/xbr-lv2-hd.slangp rename to edge-smoothing/xbr/other presets/xbr-lv2-hd.slangp diff --git a/xbr/other presets/xbr-lv2-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv2-multipass.slangp similarity index 100% rename from xbr/other presets/xbr-lv2-multipass.slangp rename to edge-smoothing/xbr/other presets/xbr-lv2-multipass.slangp diff --git a/xbr/other presets/xbr-lv2-standalone.slangp b/edge-smoothing/xbr/other presets/xbr-lv2-standalone.slangp similarity index 100% rename from xbr/other presets/xbr-lv2-standalone.slangp rename to edge-smoothing/xbr/other presets/xbr-lv2-standalone.slangp diff --git a/xbr/other presets/xbr-lv3-9x-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-9x-multipass.slangp similarity index 100% rename from xbr/other presets/xbr-lv3-9x-multipass.slangp rename to edge-smoothing/xbr/other presets/xbr-lv3-9x-multipass.slangp diff --git a/xbr/other presets/xbr-lv3-9x-standalone.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-9x-standalone.slangp similarity index 100% rename from xbr/other presets/xbr-lv3-9x-standalone.slangp rename to edge-smoothing/xbr/other presets/xbr-lv3-9x-standalone.slangp diff --git a/xbr/other presets/xbr-lv3-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-multipass.slangp similarity index 100% rename from xbr/other presets/xbr-lv3-multipass.slangp rename to edge-smoothing/xbr/other presets/xbr-lv3-multipass.slangp diff --git a/xbr/other presets/xbr-lv3-standalone.slangp b/edge-smoothing/xbr/other presets/xbr-lv3-standalone.slangp similarity index 100% rename from xbr/other presets/xbr-lv3-standalone.slangp rename to edge-smoothing/xbr/other presets/xbr-lv3-standalone.slangp diff --git a/xbr/other presets/xbr-mlv4-multipass.slangp b/edge-smoothing/xbr/other presets/xbr-mlv4-multipass.slangp similarity index 100% rename from xbr/other presets/xbr-mlv4-multipass.slangp rename to edge-smoothing/xbr/other presets/xbr-mlv4-multipass.slangp diff --git a/xbr/shaders/super-xbr/custom-jinc2-sharper.slang b/edge-smoothing/xbr/shaders/super-xbr/custom-jinc2-sharper.slang similarity index 100% rename from xbr/shaders/super-xbr/custom-jinc2-sharper.slang rename to edge-smoothing/xbr/shaders/super-xbr/custom-jinc2-sharper.slang diff --git a/xbr/shaders/super-xbr/super-xbr-fast-pass0.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass0.slang similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-fast-pass0.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass0.slang diff --git a/xbr/shaders/super-xbr/super-xbr-fast-pass1.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass1.slang similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-fast-pass1.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass1.slang diff --git a/xbr/shaders/super-xbr/super-xbr-fast-pass2.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass2.slang similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-fast-pass2.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-fast-pass2.slang diff --git a/xbr/shaders/super-xbr/super-xbr-pass0.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang old mode 100755 new mode 100644 similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-pass0.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang diff --git a/xbr/shaders/super-xbr/super-xbr-pass1.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang old mode 100755 new mode 100644 similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-pass1.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang diff --git a/xbr/shaders/super-xbr/super-xbr-pass1b.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang old mode 100755 new mode 100644 similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-pass1b.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang diff --git a/xbr/shaders/super-xbr/super-xbr-pass2.slang b/edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang old mode 100755 new mode 100644 similarity index 100% rename from xbr/shaders/super-xbr/super-xbr-pass2.slang rename to edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang diff --git a/xbr/shaders/support/b-spline-x.slang b/edge-smoothing/xbr/shaders/support/b-spline-x.slang similarity index 100% rename from xbr/shaders/support/b-spline-x.slang rename to edge-smoothing/xbr/shaders/support/b-spline-x.slang diff --git a/xbr/shaders/support/b-spline-y.slang b/edge-smoothing/xbr/shaders/support/b-spline-y.slang similarity index 100% rename from xbr/shaders/support/b-spline-y.slang rename to edge-smoothing/xbr/shaders/support/b-spline-y.slang diff --git a/cubic/shaders/bicubic-x.slang b/edge-smoothing/xbr/shaders/support/bicubic-x.slang similarity index 100% rename from cubic/shaders/bicubic-x.slang rename to edge-smoothing/xbr/shaders/support/bicubic-x.slang diff --git a/cubic/shaders/bicubic-y.slang b/edge-smoothing/xbr/shaders/support/bicubic-y.slang similarity index 100% rename from cubic/shaders/bicubic-y.slang rename to edge-smoothing/xbr/shaders/support/bicubic-y.slang diff --git a/xbr/shaders/support/delinearize.slang b/edge-smoothing/xbr/shaders/support/delinearize.slang similarity index 100% rename from xbr/shaders/support/delinearize.slang rename to edge-smoothing/xbr/shaders/support/delinearize.slang diff --git a/xbr/shaders/support/linearize.slang b/edge-smoothing/xbr/shaders/support/linearize.slang similarity index 100% rename from xbr/shaders/support/linearize.slang rename to edge-smoothing/xbr/shaders/support/linearize.slang diff --git a/cubic/shaders/spline16-x.slang b/edge-smoothing/xbr/shaders/support/spline16-x.slang similarity index 100% rename from cubic/shaders/spline16-x.slang rename to edge-smoothing/xbr/shaders/support/spline16-x.slang diff --git a/cubic/shaders/spline16-y.slang b/edge-smoothing/xbr/shaders/support/spline16-y.slang similarity index 100% rename from cubic/shaders/spline16-y.slang rename to edge-smoothing/xbr/shaders/support/spline16-y.slang diff --git a/xbr/shaders/support/stock.slang b/edge-smoothing/xbr/shaders/support/stock.slang similarity index 100% rename from xbr/shaders/support/stock.slang rename to edge-smoothing/xbr/shaders/support/stock.slang diff --git a/xbr/shaders/xbr-lv1-standalone.slang b/edge-smoothing/xbr/shaders/xbr-lv1-standalone.slang similarity index 100% rename from xbr/shaders/xbr-lv1-standalone.slang rename to edge-smoothing/xbr/shaders/xbr-lv1-standalone.slang diff --git a/xbr/shaders/xbr-lv2-hd.slang b/edge-smoothing/xbr/shaders/xbr-lv2-hd.slang similarity index 100% rename from xbr/shaders/xbr-lv2-hd.slang rename to edge-smoothing/xbr/shaders/xbr-lv2-hd.slang diff --git a/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang b/edge-smoothing/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang similarity index 100% rename from xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang rename to edge-smoothing/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass0.slang diff --git a/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang b/edge-smoothing/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang similarity index 100% rename from xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang rename to edge-smoothing/xbr/shaders/xbr-lv2-multipass/xbr-lv2-pass1.slang diff --git a/xbr/shaders/xbr-lv2-standalone.slang b/edge-smoothing/xbr/shaders/xbr-lv2-standalone.slang similarity index 100% rename from xbr/shaders/xbr-lv2-standalone.slang rename to edge-smoothing/xbr/shaders/xbr-lv2-standalone.slang diff --git a/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang b/edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang similarity index 100% rename from xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang rename to edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass0.slang diff --git a/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang b/edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang similarity index 100% rename from xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang rename to edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1.slang diff --git a/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang b/edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang similarity index 100% rename from xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang rename to edge-smoothing/xbr/shaders/xbr-lv3-multipass/xbr-lv3-pass1b.slang diff --git a/xbr/shaders/xbr-lv3-standalone.slang b/edge-smoothing/xbr/shaders/xbr-lv3-standalone.slang similarity index 100% rename from xbr/shaders/xbr-lv3-standalone.slang rename to edge-smoothing/xbr/shaders/xbr-lv3-standalone.slang diff --git a/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang similarity index 100% rename from xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang rename to edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang diff --git a/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang similarity index 100% rename from xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang rename to edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass2.slang diff --git a/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang similarity index 100% rename from xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang rename to edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass3.slang diff --git a/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang b/edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang similarity index 100% rename from xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang rename to edge-smoothing/xbr/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang diff --git a/xbr/super-xbr-fast.slangp b/edge-smoothing/xbr/super-xbr-fast.slangp similarity index 100% rename from xbr/super-xbr-fast.slangp rename to edge-smoothing/xbr/super-xbr-fast.slangp diff --git a/xbr/super-xbr.slangp b/edge-smoothing/xbr/super-xbr.slangp similarity index 100% rename from xbr/super-xbr.slangp rename to edge-smoothing/xbr/super-xbr.slangp diff --git a/xbr/xbr-lv2-sharp.slangp b/edge-smoothing/xbr/xbr-lv2-sharp.slangp similarity index 100% rename from xbr/xbr-lv2-sharp.slangp rename to edge-smoothing/xbr/xbr-lv2-sharp.slangp diff --git a/xbr/xbr-lv2.slangp b/edge-smoothing/xbr/xbr-lv2.slangp similarity index 100% rename from xbr/xbr-lv2.slangp rename to edge-smoothing/xbr/xbr-lv2.slangp diff --git a/xbr/xbr-lv3-sharp.slangp b/edge-smoothing/xbr/xbr-lv3-sharp.slangp similarity index 100% rename from xbr/xbr-lv3-sharp.slangp rename to edge-smoothing/xbr/xbr-lv3-sharp.slangp diff --git a/xbr/xbr-lv3.slangp b/edge-smoothing/xbr/xbr-lv3.slangp similarity index 100% rename from xbr/xbr-lv3.slangp rename to edge-smoothing/xbr/xbr-lv3.slangp diff --git a/xbrz/2xbrz-linear.slangp b/edge-smoothing/xbrz/2xbrz-linear.slangp similarity index 68% rename from xbrz/2xbrz-linear.slangp rename to edge-smoothing/xbrz/2xbrz-linear.slangp index a4178057..4a908f5d 100644 --- a/xbrz/2xbrz-linear.slangp +++ b/edge-smoothing/xbrz/2xbrz-linear.slangp @@ -5,12 +5,12 @@ filter_linear0 = false scale_type0 = source scale0 = 2.0 -shader1 = ../cubic/shaders/bicubic-x.slang +shader1 = ../../interpolation/shaders/bicubic-x.slang filter_linear1 = false scale_type_x1 = viewport scale_type_y1 = source scale1 = 1.0 -shader2 = ../cubic/shaders/bicubic-y.slang +shader2 = ../../interpolation/shaders/bicubic-y.slang filter_linear2 = false scale_type2 = viewport diff --git a/xbrz/4xbrz-linear.slangp b/edge-smoothing/xbrz/4xbrz-linear.slangp similarity index 83% rename from xbrz/4xbrz-linear.slangp rename to edge-smoothing/xbrz/4xbrz-linear.slangp index 89515e01..13f4d4a3 100644 --- a/xbrz/4xbrz-linear.slangp +++ b/edge-smoothing/xbrz/4xbrz-linear.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 4.0 -shader1 = ../stock.slang +shader1 = ../../stock.slang filter_linear1 = true scale_type1 = viewport diff --git a/xbrz/5xbrz-linear.slangp b/edge-smoothing/xbrz/5xbrz-linear.slangp similarity index 83% rename from xbrz/5xbrz-linear.slangp rename to edge-smoothing/xbrz/5xbrz-linear.slangp index 2e83831f..82efbcc3 100644 --- a/xbrz/5xbrz-linear.slangp +++ b/edge-smoothing/xbrz/5xbrz-linear.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 5.0 -shader1 = ../stock.slang +shader1 = ../../stock.slang filter_linear1 = true scale_type1 = viewport diff --git a/xbrz/6xbrz-linear.slangp b/edge-smoothing/xbrz/6xbrz-linear.slangp similarity index 83% rename from xbrz/6xbrz-linear.slangp rename to edge-smoothing/xbrz/6xbrz-linear.slangp index bc73282a..c0f3a1d7 100644 --- a/xbrz/6xbrz-linear.slangp +++ b/edge-smoothing/xbrz/6xbrz-linear.slangp @@ -5,6 +5,6 @@ filter_linear0 = false scale_type0 = source scale0 = 6.0 -shader1 = ../stock.slang +shader1 = ../../stock.slang filter_linear1 = true scale_type1 = viewport diff --git a/xbrz/shaders/2xbrz.slang b/edge-smoothing/xbrz/shaders/2xbrz.slang similarity index 100% rename from xbrz/shaders/2xbrz.slang rename to edge-smoothing/xbrz/shaders/2xbrz.slang diff --git a/xbrz/shaders/4xbrz.slang b/edge-smoothing/xbrz/shaders/4xbrz.slang similarity index 100% rename from xbrz/shaders/4xbrz.slang rename to edge-smoothing/xbrz/shaders/4xbrz.slang diff --git a/xbrz/shaders/5xbrz.slang b/edge-smoothing/xbrz/shaders/5xbrz.slang similarity index 100% rename from xbrz/shaders/5xbrz.slang rename to edge-smoothing/xbrz/shaders/5xbrz.slang diff --git a/xbrz/shaders/6xbrz.slang b/edge-smoothing/xbrz/shaders/6xbrz.slang similarity index 100% rename from xbrz/shaders/6xbrz.slang rename to edge-smoothing/xbrz/shaders/6xbrz.slang diff --git a/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang b/edge-smoothing/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang similarity index 100% rename from xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang rename to edge-smoothing/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang diff --git a/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang b/edge-smoothing/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang similarity index 100% rename from xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang rename to edge-smoothing/xbrz/shaders/xbrz-freescale-multipass/xbrz-freescale-pass1.slang diff --git a/xbrz/shaders/xbrz-freescale.slang b/edge-smoothing/xbrz/shaders/xbrz-freescale.slang similarity index 100% rename from xbrz/shaders/xbrz-freescale.slang rename to edge-smoothing/xbrz/shaders/xbrz-freescale.slang diff --git a/xbrz/xbrz-freescale-multipass.slangp b/edge-smoothing/xbrz/xbrz-freescale-multipass.slangp similarity index 91% rename from xbrz/xbrz-freescale-multipass.slangp rename to edge-smoothing/xbrz/xbrz-freescale-multipass.slangp index dd5c3d4e..ef4abdbc 100644 --- a/xbrz/xbrz-freescale-multipass.slangp +++ b/edge-smoothing/xbrz/xbrz-freescale-multipass.slangp @@ -1,6 +1,6 @@ shaders = 3 -shader0 = ../stock.slang +shader0 = ../../stock.slang alias0 = xbrz_fs_refpass shader1 = shaders/xbrz-freescale-multipass/xbrz-freescale-pass0.slang diff --git a/xbrz/xbrz-freescale.slangp b/edge-smoothing/xbrz/xbrz-freescale.slangp similarity index 100% rename from xbrz/xbrz-freescale.slangp rename to edge-smoothing/xbrz/xbrz-freescale.slangp diff --git a/xsal/2xsal-level2-crt.slangp b/edge-smoothing/xsal/2xsal-level2-crt.slangp similarity index 81% rename from xsal/2xsal-level2-crt.slangp rename to edge-smoothing/xsal/2xsal-level2-crt.slangp index 451d4228..2e0013cd 100644 --- a/xsal/2xsal-level2-crt.slangp +++ b/edge-smoothing/xsal/2xsal-level2-crt.slangp @@ -1,15 +1,15 @@ -shaders = 2 - -shader0 = shaders/2xsal-level2.slang -filter_linear0 = false -scale_type0 = source -scale0 = 2.0 - -shader1 = ../crt/shaders/dotmask.slang -filter_linear1 = true -scale_type1 = viewport -scale1 = 1.0 - -parameters = "maskDark; maskLight" -maskDark = 0.6 -maskLight = 1.4 +shaders = 2 + +shader0 = shaders/2xsal-level2.slang +filter_linear0 = false +scale_type0 = source +scale0 = 2.0 + +shader1 = ../../crt/shaders/dotmask.slang +filter_linear1 = true +scale_type1 = viewport +scale1 = 1.0 + +parameters = "maskDark; maskLight" +maskDark = 0.6 +maskLight = 1.4 diff --git a/xsal/2xsal.slangp b/edge-smoothing/xsal/2xsal.slangp similarity index 69% rename from xsal/2xsal.slangp rename to edge-smoothing/xsal/2xsal.slangp index ba1fbd73..eb3a8a1e 100644 --- a/xsal/2xsal.slangp +++ b/edge-smoothing/xsal/2xsal.slangp @@ -1,17 +1,17 @@ -shaders = 3 - -shader0 = shaders/2xsal.slang -filter_linear0 = false -scale_type0 = source -scale_x0 = 2.0 -scale_y0 = 2.0 - -shader1 = ../cubic/shaders/spline16-x.slang -filter_linear1 = false -scale_type_x1 = viewport -scale_type_y1 = source -scale1 = 1.0 - -shader2 = ../cubic/shaders/spline16-y.slang -filter_linear2 = false -scale_type2 = viewport +shaders = 3 + +shader0 = shaders/2xsal.slang +filter_linear0 = false +scale_type0 = source +scale_x0 = 2.0 +scale_y0 = 2.0 + +shader1 = ../../interpolation/shaders/spline16-x.slang +filter_linear1 = false +scale_type_x1 = viewport +scale_type_y1 = source +scale1 = 1.0 + +shader2 = ../../interpolation/shaders/spline16-y.slang +filter_linear2 = false +scale_type2 = viewport diff --git a/xsal/4xsal-level2-crt.slangp b/edge-smoothing/xsal/4xsal-level2-crt.slangp similarity index 85% rename from xsal/4xsal-level2-crt.slangp rename to edge-smoothing/xsal/4xsal-level2-crt.slangp index 8bb0df53..e6730c88 100644 --- a/xsal/4xsal-level2-crt.slangp +++ b/edge-smoothing/xsal/4xsal-level2-crt.slangp @@ -1,20 +1,20 @@ -shaders = 3 - -shader0 = shaders/2xsal-level2.slang -filter_linear0 = false -scale_type0 = source -scale0 = 4.0 - -shader1 = shaders/2xsal-level2-pass2.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 - -shader2 = ../crt/shaders/dotmask.slang -filter_linear2 = true -scale_type2 = viewport -scale2 = 1.0 - -parameters = "maskDark; maskLight" -maskDark = 0.6 -maskLight = 1.4 +shaders = 3 + +shader0 = shaders/2xsal-level2.slang +filter_linear0 = false +scale_type0 = source +scale0 = 4.0 + +shader1 = shaders/2xsal-level2-pass2.slang +filter_linear1 = false +scale_type1 = source +scale1 = 1.0 + +shader2 = ../../crt/shaders/dotmask.slang +filter_linear2 = true +scale_type2 = viewport +scale2 = 1.0 + +parameters = "maskDark; maskLight" +maskDark = 0.6 +maskLight = 1.4 diff --git a/xsal/4xsal-level2-hq.slangp b/edge-smoothing/xsal/4xsal-level2-hq.slangp similarity index 86% rename from xsal/4xsal-level2-hq.slangp rename to edge-smoothing/xsal/4xsal-level2-hq.slangp index 2f2ae9a5..5d3f374d 100644 --- a/xsal/4xsal-level2-hq.slangp +++ b/edge-smoothing/xsal/4xsal-level2-hq.slangp @@ -1,15 +1,15 @@ -shaders = 3 - -shader0 = shaders/2xsal-level2-hq.slang -filter_linear0 = false -scale_type0 = source -scale0 = 4.0 - -shader1 = shaders/2xsal-level2-pass2.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 - -shader2 = ../stock.slang -filter_linear2 = true -scale_type2 = viewport +shaders = 3 + +shader0 = shaders/2xsal-level2-hq.slang +filter_linear0 = false +scale_type0 = source +scale0 = 4.0 + +shader1 = shaders/2xsal-level2-pass2.slang +filter_linear1 = false +scale_type1 = source +scale1 = 1.0 + +shader2 = ../../stock.slang +filter_linear2 = true +scale_type2 = viewport diff --git a/xsal/4xsal-level2.slangp b/edge-smoothing/xsal/4xsal-level2.slangp similarity index 86% rename from xsal/4xsal-level2.slangp rename to edge-smoothing/xsal/4xsal-level2.slangp index f9533134..6b858e07 100644 --- a/xsal/4xsal-level2.slangp +++ b/edge-smoothing/xsal/4xsal-level2.slangp @@ -1,15 +1,15 @@ -shaders = 3 - -shader0 = shaders/2xsal-level2.slang -filter_linear0 = false -scale_type0 = source -scale0 = 4.0 - -shader1 = shaders/2xsal-level2-pass2.slang -filter_linear1 = false -scale_type1 = source -scale1 = 1.0 - -shader2 = ../stock.slang -filter_linear2 = true -scale_type2 = viewport +shaders = 3 + +shader0 = shaders/2xsal-level2.slang +filter_linear0 = false +scale_type0 = source +scale0 = 4.0 + +shader1 = shaders/2xsal-level2-pass2.slang +filter_linear1 = false +scale_type1 = source +scale1 = 1.0 + +shader2 = ../../stock.slang +filter_linear2 = true +scale_type2 = viewport diff --git a/xsal/shaders/2xsal-level2-hq.slang b/edge-smoothing/xsal/shaders/2xsal-level2-hq.slang similarity index 97% rename from xsal/shaders/2xsal-level2-hq.slang rename to edge-smoothing/xsal/shaders/2xsal-level2-hq.slang index 32072da2..5b3ce09c 100644 --- a/xsal/shaders/2xsal-level2-hq.slang +++ b/edge-smoothing/xsal/shaders/2xsal-level2-hq.slang @@ -1,117 +1,117 @@ -#version 450 -/* - Copyright (C) 2016 guest(r) - guest.r@gmail.com - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* Default Vertex shader */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - - -void main() -{ - //vec2 texsize = IN.texture_size; - float dx = 0.25*params.SourceSize.z; - float dy = 0.25*params.SourceSize.w; - vec3 dt = vec3(1.0, 1.0, 1.0); - - vec4 yx = vec4( dx, dy, -dx, -dy); - vec4 xh = vec4(3*dx, dy, -3*dx, -dy); - vec4 yv = vec4( dx, 3*dy, -dx, -3*dy); - vec4 ox = 2*yx; - - vec3 c11 = texture(Source, vTexCoord ).xyz; - vec3 s00 = texture(Source, vTexCoord + yx.zw).xyz; - vec3 s20 = texture(Source, vTexCoord + yx.xw).xyz; - vec3 s22 = texture(Source, vTexCoord + yx.xy).xyz; - vec3 s02 = texture(Source, vTexCoord + yx.zy).xyz; - vec3 h00 = texture(Source, vTexCoord + xh.zw).xyz; - vec3 h20 = texture(Source, vTexCoord + xh.xw).xyz; - vec3 h22 = texture(Source, vTexCoord + xh.xy).xyz; - vec3 h02 = texture(Source, vTexCoord + xh.zy).xyz; - vec3 v00 = texture(Source, vTexCoord + yv.zw).xyz; - vec3 v20 = texture(Source, vTexCoord + yv.xw).xyz; - vec3 v22 = texture(Source, vTexCoord + yv.xy).xyz; - vec3 v02 = texture(Source, vTexCoord + yv.zy).xyz; - vec3 o00 = texture(Source, vTexCoord + ox.zw).xyz; - vec3 o20 = texture(Source, vTexCoord + ox.xw).xyz; - vec3 o22 = texture(Source, vTexCoord + ox.xy).xyz; - vec3 o02 = texture(Source, vTexCoord + ox.zy).xyz; - - float m1 = 1.0/(dot(abs(s00 - s22), dt) + 0.00001); - float m2 = 1.0/(dot(abs(s02 - s20), dt) + 0.00001); - float h1 = 1.0/(dot(abs(s00 - h22), dt) + 0.00001); - float h2 = 1.0/(dot(abs(s02 - h20), dt) + 0.00001); - float h3 = 1.0/(dot(abs(h00 - s22), dt) + 0.00001); - float h4 = 1.0/(dot(abs(h02 - s20), dt) + 0.00001); - float v1 = 1.0/(dot(abs(s00 - v22), dt) + 0.00001); - float v2 = 1.0/(dot(abs(s02 - v20), dt) + 0.00001); - float v3 = 1.0/(dot(abs(v00 - s22), dt) + 0.00001); - float v4 = 1.0/(dot(abs(v02 - s20), dt) + 0.00001); - - vec3 t1 = 0.5*(m1*(s00 + s22) + m2*(s02 + s20))/(m1 + m2); - vec3 t2 = 0.5*(h1*(s00 + h22) + h2*(s02 + h20) + h3*(h00 + s22) + h4*(h02 + s20))/(h1 + h2 + h3 + h4); - vec3 t3 = 0.5*(v1*(s00 + v22) + v2*(s02 + v20) + v3*(v00 + s22) + v4*(v02 + s20))/(v1 + v2 + v3 + v4); - - float k00 = dot(abs(o00 - c11), dt) + 0.00001; - float k20 = dot(abs(o20 - c11), dt) + 0.00001; - float k22 = dot(abs(o22 - c11), dt) + 0.00001; - float k02 = dot(abs(o02 - c11), dt) + 0.00001; - - float kr1 = min(dot(abs(s00 - s22), dt), dot(abs(o00 - o22), dt)); - float kr2 = min(dot(abs(s02 - s20), dt), dot(abs(o20 - o02), dt)); - - float w1 = (k22 < k00) ? 0.0 : kr2; - float w2 = (k02 < k20) ? 0.0 : kr1; - float w3 = (k00 < k22) ? 0.0 : kr2; - float w4 = (k20 < k02) ? 0.0 : kr1; - - c11 = (w1*o00 + w2*o20 + w3*o22 + w4*o02 + 0.001*c11)/(w1 + w2 + w3 + w4 + 0.001); - - float k1 = 1.0/(dot(abs(t1 - c11), dt) + 0.00001); - float k2 = 1.0/(dot(abs(t2 - c11), dt) + 0.00001); - float k3 = 1.0/(dot(abs(t3 - c11), dt) + 0.00001); - - - FragColor = vec4((k1*t1 + k2*t2 + k3*t3)/(k1 + k2 + k3), 1.0); -} +#version 450 +/* + Copyright (C) 2016 guest(r) - guest.r@gmail.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* Default Vertex shader */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + + +void main() +{ + //vec2 texsize = IN.texture_size; + float dx = 0.25*params.SourceSize.z; + float dy = 0.25*params.SourceSize.w; + vec3 dt = vec3(1.0, 1.0, 1.0); + + vec4 yx = vec4( dx, dy, -dx, -dy); + vec4 xh = vec4(3*dx, dy, -3*dx, -dy); + vec4 yv = vec4( dx, 3*dy, -dx, -3*dy); + vec4 ox = 2*yx; + + vec3 c11 = texture(Source, vTexCoord ).xyz; + vec3 s00 = texture(Source, vTexCoord + yx.zw).xyz; + vec3 s20 = texture(Source, vTexCoord + yx.xw).xyz; + vec3 s22 = texture(Source, vTexCoord + yx.xy).xyz; + vec3 s02 = texture(Source, vTexCoord + yx.zy).xyz; + vec3 h00 = texture(Source, vTexCoord + xh.zw).xyz; + vec3 h20 = texture(Source, vTexCoord + xh.xw).xyz; + vec3 h22 = texture(Source, vTexCoord + xh.xy).xyz; + vec3 h02 = texture(Source, vTexCoord + xh.zy).xyz; + vec3 v00 = texture(Source, vTexCoord + yv.zw).xyz; + vec3 v20 = texture(Source, vTexCoord + yv.xw).xyz; + vec3 v22 = texture(Source, vTexCoord + yv.xy).xyz; + vec3 v02 = texture(Source, vTexCoord + yv.zy).xyz; + vec3 o00 = texture(Source, vTexCoord + ox.zw).xyz; + vec3 o20 = texture(Source, vTexCoord + ox.xw).xyz; + vec3 o22 = texture(Source, vTexCoord + ox.xy).xyz; + vec3 o02 = texture(Source, vTexCoord + ox.zy).xyz; + + float m1 = 1.0/(dot(abs(s00 - s22), dt) + 0.00001); + float m2 = 1.0/(dot(abs(s02 - s20), dt) + 0.00001); + float h1 = 1.0/(dot(abs(s00 - h22), dt) + 0.00001); + float h2 = 1.0/(dot(abs(s02 - h20), dt) + 0.00001); + float h3 = 1.0/(dot(abs(h00 - s22), dt) + 0.00001); + float h4 = 1.0/(dot(abs(h02 - s20), dt) + 0.00001); + float v1 = 1.0/(dot(abs(s00 - v22), dt) + 0.00001); + float v2 = 1.0/(dot(abs(s02 - v20), dt) + 0.00001); + float v3 = 1.0/(dot(abs(v00 - s22), dt) + 0.00001); + float v4 = 1.0/(dot(abs(v02 - s20), dt) + 0.00001); + + vec3 t1 = 0.5*(m1*(s00 + s22) + m2*(s02 + s20))/(m1 + m2); + vec3 t2 = 0.5*(h1*(s00 + h22) + h2*(s02 + h20) + h3*(h00 + s22) + h4*(h02 + s20))/(h1 + h2 + h3 + h4); + vec3 t3 = 0.5*(v1*(s00 + v22) + v2*(s02 + v20) + v3*(v00 + s22) + v4*(v02 + s20))/(v1 + v2 + v3 + v4); + + float k00 = dot(abs(o00 - c11), dt) + 0.00001; + float k20 = dot(abs(o20 - c11), dt) + 0.00001; + float k22 = dot(abs(o22 - c11), dt) + 0.00001; + float k02 = dot(abs(o02 - c11), dt) + 0.00001; + + float kr1 = min(dot(abs(s00 - s22), dt), dot(abs(o00 - o22), dt)); + float kr2 = min(dot(abs(s02 - s20), dt), dot(abs(o20 - o02), dt)); + + float w1 = (k22 < k00) ? 0.0 : kr2; + float w2 = (k02 < k20) ? 0.0 : kr1; + float w3 = (k00 < k22) ? 0.0 : kr2; + float w4 = (k20 < k02) ? 0.0 : kr1; + + c11 = (w1*o00 + w2*o20 + w3*o22 + w4*o02 + 0.001*c11)/(w1 + w2 + w3 + w4 + 0.001); + + float k1 = 1.0/(dot(abs(t1 - c11), dt) + 0.00001); + float k2 = 1.0/(dot(abs(t2 - c11), dt) + 0.00001); + float k3 = 1.0/(dot(abs(t3 - c11), dt) + 0.00001); + + + FragColor = vec4((k1*t1 + k2*t2 + k3*t3)/(k1 + k2 + k3), 1.0); +} diff --git a/xsal/shaders/2xsal-level2-pass2.slang b/edge-smoothing/xsal/shaders/2xsal-level2-pass2.slang similarity index 96% rename from xsal/shaders/2xsal-level2-pass2.slang rename to edge-smoothing/xsal/shaders/2xsal-level2-pass2.slang index 635f7663..11d5eed6 100644 --- a/xsal/shaders/2xsal-level2-pass2.slang +++ b/edge-smoothing/xsal/shaders/2xsal-level2-pass2.slang @@ -1,79 +1,79 @@ -#version 450 - -/* - Copyright (C) 2016 guest(r) - guest.r@gmail.com - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* Default Vertex shader */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - -struct deltas -{ - vec2 UL, UR, DL, DR; -}; - -void main() -{ - vec2 texsize = params.SourceSize.xy; - float dx = pow(texsize.x, -1.0) * 0.5; - float dy = pow(texsize.y, -1.0) * 0.5; - vec3 dt = vec3(1.0, 1.0, 1.0); - - deltas VAR = { - vTexCoord + vec2(-dx, -dy), - vTexCoord + vec2( dx, -dy), - vTexCoord + vec2(-dx, dy), - vTexCoord + vec2( dx, dy) - }; - - vec3 c00 = texture(Source, VAR.UL).xyz; - vec3 c20 = texture(Source, VAR.UR).xyz; - vec3 c02 = texture(Source, VAR.DL).xyz; - vec3 c22 = texture(Source, VAR.DR).xyz; - - float m1 = dot(abs(c00 - c22), dt) + 0.001; - float m2 = dot(abs(c02 - c20), dt) + 0.001; - - FragColor = vec4((m1*(c02 + c20) + m2*(c22 + c00))/(2.0*(m1 + m2)), 1.0); -} +#version 450 + +/* + Copyright (C) 2016 guest(r) - guest.r@gmail.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* Default Vertex shader */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +struct deltas +{ + vec2 UL, UR, DL, DR; +}; + +void main() +{ + vec2 texsize = params.SourceSize.xy; + float dx = pow(texsize.x, -1.0) * 0.5; + float dy = pow(texsize.y, -1.0) * 0.5; + vec3 dt = vec3(1.0, 1.0, 1.0); + + deltas VAR = { + vTexCoord + vec2(-dx, -dy), + vTexCoord + vec2( dx, -dy), + vTexCoord + vec2(-dx, dy), + vTexCoord + vec2( dx, dy) + }; + + vec3 c00 = texture(Source, VAR.UL).xyz; + vec3 c20 = texture(Source, VAR.UR).xyz; + vec3 c02 = texture(Source, VAR.DL).xyz; + vec3 c22 = texture(Source, VAR.DR).xyz; + + float m1 = dot(abs(c00 - c22), dt) + 0.001; + float m2 = dot(abs(c02 - c20), dt) + 0.001; + + FragColor = vec4((m1*(c02 + c20) + m2*(c22 + c00))/(2.0*(m1 + m2)), 1.0); +} diff --git a/xsal/shaders/2xsal-level2.slang b/edge-smoothing/xsal/shaders/2xsal-level2.slang similarity index 97% rename from xsal/shaders/2xsal-level2.slang rename to edge-smoothing/xsal/shaders/2xsal-level2.slang index 8426ee26..8a14b366 100644 --- a/xsal/shaders/2xsal-level2.slang +++ b/edge-smoothing/xsal/shaders/2xsal-level2.slang @@ -1,97 +1,97 @@ -#version 450 - -/* - Copyright (C) 2016 guest(r) - guest.r@gmail.com - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* VERTEX_SHADER */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - -void main() -{ - vec2 tex = vTexCoord; - //vec2 texsize = IN.texture_size; - float dx = 0.25*params.SourceSize.z; - float dy = 0.25*params.SourceSize.w; - vec3 dt = vec3(1.0, 1.0, 1.0); - - vec4 yx = vec4(dx, dy, -dx, -dy); - vec4 xh = yx*vec4(3.0, 1.0, 3.0, 1.0); - vec4 yv = yx*vec4(1.0, 3.0, 1.0, 3.0); - - vec3 c11 = texture(Source, tex ).xyz; - vec3 s00 = texture(Source, tex + yx.zw).xyz; - vec3 s20 = texture(Source, tex + yx.xw).xyz; - vec3 s22 = texture(Source, tex + yx.xy).xyz; - vec3 s02 = texture(Source, tex + yx.zy).xyz; - vec3 h00 = texture(Source, tex + xh.zw).xyz; - vec3 h20 = texture(Source, tex + xh.xw).xyz; - vec3 h22 = texture(Source, tex + xh.xy).xyz; - vec3 h02 = texture(Source, tex + xh.zy).xyz; - vec3 v00 = texture(Source, tex + yv.zw).xyz; - vec3 v20 = texture(Source, tex + yv.xw).xyz; - vec3 v22 = texture(Source, tex + yv.xy).xyz; - vec3 v02 = texture(Source, tex + yv.zy).xyz; - - float m1 = 1.0/(dot(abs(s00 - s22), dt) + 0.00001); - float m2 = 1.0/(dot(abs(s02 - s20), dt) + 0.00001); - float h1 = 1.0/(dot(abs(s00 - h22), dt) + 0.00001); - float h2 = 1.0/(dot(abs(s02 - h20), dt) + 0.00001); - float h3 = 1.0/(dot(abs(h00 - s22), dt) + 0.00001); - float h4 = 1.0/(dot(abs(h02 - s20), dt) + 0.00001); - float v1 = 1.0/(dot(abs(s00 - v22), dt) + 0.00001); - float v2 = 1.0/(dot(abs(s02 - v20), dt) + 0.00001); - float v3 = 1.0/(dot(abs(v00 - s22), dt) + 0.00001); - float v4 = 1.0/(dot(abs(v02 - s20), dt) + 0.00001); - - vec3 t1 = 0.5*(m1*(s00 + s22) + m2*(s02 + s20))/(m1 + m2); - vec3 t2 = 0.5*(h1*(s00 + h22) + h2*(s02 + h20) + h3*(h00 + s22) + h4*(h02 + s20))/(h1 + h2 + h3 + h4); - vec3 t3 = 0.5*(v1*(s00 + v22) + v2*(s02 + v20) + v3*(v00 + s22) + v4*(v02 + s20))/(v1 + v2 + v3 + v4); - - float k1 = 1.0/(dot(abs(t1 - c11), dt) + 0.00001); - float k2 = 1.0/(dot(abs(t2 - c11), dt) + 0.00001); - float k3 = 1.0/(dot(abs(t3 - c11), dt) + 0.00001); - - FragColor = vec4((k1*t1 + k2*t2 + k3*t3)/(k1 + k2 + k3), 1.0); -} +#version 450 + +/* + Copyright (C) 2016 guest(r) - guest.r@gmail.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* VERTEX_SHADER */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +void main() +{ + vec2 tex = vTexCoord; + //vec2 texsize = IN.texture_size; + float dx = 0.25*params.SourceSize.z; + float dy = 0.25*params.SourceSize.w; + vec3 dt = vec3(1.0, 1.0, 1.0); + + vec4 yx = vec4(dx, dy, -dx, -dy); + vec4 xh = yx*vec4(3.0, 1.0, 3.0, 1.0); + vec4 yv = yx*vec4(1.0, 3.0, 1.0, 3.0); + + vec3 c11 = texture(Source, tex ).xyz; + vec3 s00 = texture(Source, tex + yx.zw).xyz; + vec3 s20 = texture(Source, tex + yx.xw).xyz; + vec3 s22 = texture(Source, tex + yx.xy).xyz; + vec3 s02 = texture(Source, tex + yx.zy).xyz; + vec3 h00 = texture(Source, tex + xh.zw).xyz; + vec3 h20 = texture(Source, tex + xh.xw).xyz; + vec3 h22 = texture(Source, tex + xh.xy).xyz; + vec3 h02 = texture(Source, tex + xh.zy).xyz; + vec3 v00 = texture(Source, tex + yv.zw).xyz; + vec3 v20 = texture(Source, tex + yv.xw).xyz; + vec3 v22 = texture(Source, tex + yv.xy).xyz; + vec3 v02 = texture(Source, tex + yv.zy).xyz; + + float m1 = 1.0/(dot(abs(s00 - s22), dt) + 0.00001); + float m2 = 1.0/(dot(abs(s02 - s20), dt) + 0.00001); + float h1 = 1.0/(dot(abs(s00 - h22), dt) + 0.00001); + float h2 = 1.0/(dot(abs(s02 - h20), dt) + 0.00001); + float h3 = 1.0/(dot(abs(h00 - s22), dt) + 0.00001); + float h4 = 1.0/(dot(abs(h02 - s20), dt) + 0.00001); + float v1 = 1.0/(dot(abs(s00 - v22), dt) + 0.00001); + float v2 = 1.0/(dot(abs(s02 - v20), dt) + 0.00001); + float v3 = 1.0/(dot(abs(v00 - s22), dt) + 0.00001); + float v4 = 1.0/(dot(abs(v02 - s20), dt) + 0.00001); + + vec3 t1 = 0.5*(m1*(s00 + s22) + m2*(s02 + s20))/(m1 + m2); + vec3 t2 = 0.5*(h1*(s00 + h22) + h2*(s02 + h20) + h3*(h00 + s22) + h4*(h02 + s20))/(h1 + h2 + h3 + h4); + vec3 t3 = 0.5*(v1*(s00 + v22) + v2*(s02 + v20) + v3*(v00 + s22) + v4*(v02 + s20))/(v1 + v2 + v3 + v4); + + float k1 = 1.0/(dot(abs(t1 - c11), dt) + 0.00001); + float k2 = 1.0/(dot(abs(t2 - c11), dt) + 0.00001); + float k3 = 1.0/(dot(abs(t3 - c11), dt) + 0.00001); + + FragColor = vec4((k1*t1 + k2*t2 + k3*t3)/(k1 + k2 + k3), 1.0); +} diff --git a/xsal/shaders/2xsal.slang b/edge-smoothing/xsal/shaders/2xsal.slang similarity index 96% rename from xsal/shaders/2xsal.slang rename to edge-smoothing/xsal/shaders/2xsal.slang index 3bd7db1e..f9b7efd1 100644 --- a/xsal/shaders/2xsal.slang +++ b/edge-smoothing/xsal/shaders/2xsal.slang @@ -1,79 +1,79 @@ -#version 450 - -/* - Copyright (C) 2007 guest(r) - guest.r@gmail.com - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -layout(push_constant) uniform Push -{ - vec4 OutputSize; - vec4 OriginalSize; - vec4 SourceSize; -} params; - -layout(std140, set = 0, binding = 0) uniform UBO -{ - mat4 MVP; -} global; - -#pragma stage vertex -layout(location = 0) in vec4 Position; -layout(location = 1) in vec2 TexCoord; -layout(location = 0) out vec2 vTexCoord; - -/* Default Vertex shader */ -void main() -{ - gl_Position = global.MVP * Position; - vTexCoord = TexCoord; -} - -#pragma stage fragment -layout(location = 0) in vec2 vTexCoord; -layout(location = 1) in vec2 FragCoord; -layout(location = 0) out vec4 FragColor; -layout(set = 0, binding = 2) uniform sampler2D Source; - -struct deltas -{ - vec2 UL, UR, DL, DR; -}; - -void main() -{ - vec2 texsize = params.SourceSize.xy; - float dx = pow(texsize.x, -1.0) * 0.25; - float dy = pow(texsize.y, -1.0) * 0.25; - vec3 dt = vec3(1.0, 1.0, 1.0); - - deltas VAR = { - vTexCoord + vec2(-dx, -dy), - vTexCoord + vec2( dx, -dy), - vTexCoord + vec2(-dx, dy), - vTexCoord + vec2( dx, dy) - }; - - vec3 c00 = texture(Source, VAR.UL).xyz; - vec3 c20 = texture(Source, VAR.UR).xyz; - vec3 c02 = texture(Source, VAR.DL).xyz; - vec3 c22 = texture(Source, VAR.DR).xyz; - - float m1 = dot(abs(c00 - c22), dt) + 0.001; - float m2 = dot(abs(c02 - c20), dt) + 0.001; - - FragColor = vec4((m1*(c02 + c20) + m2*(c22 + c00))/(2.0*(m1 + m2)), 1.0); -} +#version 450 + +/* + Copyright (C) 2007 guest(r) - guest.r@gmail.com + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +layout(push_constant) uniform Push +{ + vec4 OutputSize; + vec4 OriginalSize; + vec4 SourceSize; +} params; + +layout(std140, set = 0, binding = 0) uniform UBO +{ + mat4 MVP; +} global; + +#pragma stage vertex +layout(location = 0) in vec4 Position; +layout(location = 1) in vec2 TexCoord; +layout(location = 0) out vec2 vTexCoord; + +/* Default Vertex shader */ +void main() +{ + gl_Position = global.MVP * Position; + vTexCoord = TexCoord; +} + +#pragma stage fragment +layout(location = 0) in vec2 vTexCoord; +layout(location = 1) in vec2 FragCoord; +layout(location = 0) out vec4 FragColor; +layout(set = 0, binding = 2) uniform sampler2D Source; + +struct deltas +{ + vec2 UL, UR, DL, DR; +}; + +void main() +{ + vec2 texsize = params.SourceSize.xy; + float dx = pow(texsize.x, -1.0) * 0.25; + float dy = pow(texsize.y, -1.0) * 0.25; + vec3 dt = vec3(1.0, 1.0, 1.0); + + deltas VAR = { + vTexCoord + vec2(-dx, -dy), + vTexCoord + vec2( dx, -dy), + vTexCoord + vec2(-dx, dy), + vTexCoord + vec2( dx, dy) + }; + + vec3 c00 = texture(Source, VAR.UL).xyz; + vec3 c20 = texture(Source, VAR.UR).xyz; + vec3 c02 = texture(Source, VAR.DL).xyz; + vec3 c22 = texture(Source, VAR.DR).xyz; + + float m1 = dot(abs(c00 - c22), dt) + 0.001; + float m2 = dot(abs(c02 - c20), dt) + 0.001; + + FragColor = vec4((m1*(c02 + c20) + m2*(c22 + c00))/(2.0*(m1 + m2)), 1.0); +} diff --git a/xsoft/4xsoft.slangp b/edge-smoothing/xsoft/4xsoft.slangp similarity index 70% rename from xsoft/4xsoft.slangp rename to edge-smoothing/xsoft/4xsoft.slangp index a7b9d3e5..86a27b0e 100644 --- a/xsoft/4xsoft.slangp +++ b/edge-smoothing/xsoft/4xsoft.slangp @@ -1,6 +1,6 @@ shaders = 4 -shader0 = ../stock.slang +shader0 = ../../stock.slang filter_linear0 = false scale_type0 = source scale_x0 = 2.0 @@ -12,12 +12,12 @@ scale_type1 = source scale_x1 = 2.0 scale_y1 = 2.0 -shader2 = ../cubic/shaders/b-spline-x.slang +shader2 = ../../interpolation/shaders/b-spline-x.slang filter_linear2 = false scale_type_x2 = viewport scale_type_y2 = source scale2 = 1.0 -shader3 = ../cubic/shaders/b-spline-y.slang +shader3 = ../../interpolation/shaders/b-spline-y.slang filter_linear3 = false scale_type3 = viewport diff --git a/xsoft/4xsoftSdB.slangp b/edge-smoothing/xsoft/4xsoftSdB.slangp similarity index 70% rename from xsoft/4xsoftSdB.slangp rename to edge-smoothing/xsoft/4xsoftSdB.slangp index 787659fc..371f104f 100644 --- a/xsoft/4xsoftSdB.slangp +++ b/edge-smoothing/xsoft/4xsoftSdB.slangp @@ -1,6 +1,6 @@ shaders = 4 -shader0 = ../stock.slang +shader0 = ../../stock.slang filter_linear0 = false scale_type0 = source scale_x0 = 2.0 @@ -12,12 +12,12 @@ scale_type1 = source scale_x1 = 2.0 scale_y1 = 2.0 -shader2 = ../cubic/shaders/b-spline-x.slang +shader2 = ../../interpolation/shaders/b-spline-x.slang filter_linear2 = false scale_type_x2 = viewport scale_type_y2 = source scale2 = 1.0 -shader3 = ../cubic/shaders/b-spline-y.slang +shader3 = ../../interpolation/shaders/b-spline-y.slang filter_linear3 = false scale_type3 = viewport diff --git a/xsoft/shaders/4xsoft.slang b/edge-smoothing/xsoft/shaders/4xsoft.slang similarity index 100% rename from xsoft/shaders/4xsoft.slang rename to edge-smoothing/xsoft/shaders/4xsoft.slang diff --git a/xsoft/shaders/4xsoftSdB.slang b/edge-smoothing/xsoft/shaders/4xsoftSdB.slang similarity index 100% rename from xsoft/shaders/4xsoftSdB.slang rename to edge-smoothing/xsoft/shaders/4xsoftSdB.slang diff --git a/handheld/bandlimit-pixel-gba-color.slangp b/handheld/bandlimit-pixel-gba-color.slangp index a35170db..4f4ef53b 100644 --- a/handheld/bandlimit-pixel-gba-color.slangp +++ b/handheld/bandlimit-pixel-gba-color.slangp @@ -1,7 +1,7 @@ shaders = 3 shader0 = shaders/color/gba-color.slang shader1 = ../linear/linearize.slang -shader2 = ../interpolation/shaders/bandlimit-pixel.slang +shader2 = ../pixel-art-scaling/shaders/bandlimit-pixel.slang filter_linear1 = false scale_type1 = source diff --git a/handheld/ds-hybrid-sabr.slangp b/handheld/ds-hybrid-sabr.slangp index 30bbc977..84bb7dd8 100644 --- a/handheld/ds-hybrid-sabr.slangp +++ b/handheld/ds-hybrid-sabr.slangp @@ -6,7 +6,7 @@ shaders = 3 shader0 = ../stock.slang alias0 = ds_hybrid_view_refpass -shader1 = ../sabr/shaders/sabr-v3.0.slang +shader1 = ../edge-smoothing/sabr/shaders/sabr-v3.0.slang filter_linear1 = false scale_type1 = source scale1 = 2.0 diff --git a/handheld/ds-hybrid-scalefx.slangp b/handheld/ds-hybrid-scalefx.slangp index c672253c..c3a72a8d 100644 --- a/handheld/ds-hybrid-scalefx.slangp +++ b/handheld/ds-hybrid-scalefx.slangp @@ -7,30 +7,30 @@ shader0 = ../stock.slang alias0 = refpass filter_linear0 = "false" -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 diff --git a/cubic/b-spline-fast.slangp b/interpolation/b-spline-fast.slangp old mode 100755 new mode 100644 similarity index 100% rename from cubic/b-spline-fast.slangp rename to interpolation/b-spline-fast.slangp diff --git a/cubic/bicubic-fast.slangp b/interpolation/bicubic-fast.slangp similarity index 100% rename from cubic/bicubic-fast.slangp rename to interpolation/bicubic-fast.slangp diff --git a/cubic/bicubic.slangp b/interpolation/bicubic.slangp similarity index 94% rename from cubic/bicubic.slangp rename to interpolation/bicubic.slangp index 857417d3..29aa90fb 100644 --- a/cubic/bicubic.slangp +++ b/interpolation/bicubic.slangp @@ -1,5 +1,5 @@ -shaders = 1 - -shader0 = shaders/bicubic.slang -filter_linear0 = false -scale_type0 = viewport +shaders = 1 + +shader0 = shaders/bicubic.slang +filter_linear0 = false +scale_type0 = viewport diff --git a/cubic/catmull-rom-fast.slangp b/interpolation/catmull-rom-fast.slangp old mode 100755 new mode 100644 similarity index 100% rename from cubic/catmull-rom-fast.slangp rename to interpolation/catmull-rom-fast.slangp diff --git a/cubic/catmull-rom.slangp b/interpolation/catmull-rom.slangp similarity index 100% rename from cubic/catmull-rom.slangp rename to interpolation/catmull-rom.slangp diff --git a/cubic/README.md b/interpolation/cubic-README.md similarity index 100% rename from cubic/README.md rename to interpolation/cubic-README.md diff --git a/cubic/cubic-gamma-correct.slangp b/interpolation/cubic-gamma-correct.slangp similarity index 100% rename from cubic/cubic-gamma-correct.slangp rename to interpolation/cubic-gamma-correct.slangp diff --git a/cubic/cubic.slangp b/interpolation/cubic.slangp similarity index 100% rename from cubic/cubic.slangp rename to interpolation/cubic.slangp diff --git a/windowed/jinc2-sharp.slangp b/interpolation/jinc2-sharp.slangp similarity index 100% rename from windowed/jinc2-sharp.slangp rename to interpolation/jinc2-sharp.slangp diff --git a/windowed/jinc2-sharper.slangp b/interpolation/jinc2-sharper.slangp similarity index 100% rename from windowed/jinc2-sharper.slangp rename to interpolation/jinc2-sharper.slangp diff --git a/windowed/jinc2.slangp b/interpolation/jinc2.slangp similarity index 100% rename from windowed/jinc2.slangp rename to interpolation/jinc2.slangp diff --git a/windowed/lanczos16.slangp b/interpolation/lanczos16.slangp similarity index 100% rename from windowed/lanczos16.slangp rename to interpolation/lanczos16.slangp diff --git a/windowed/lanczos3-fast.slangp b/interpolation/lanczos3-fast.slangp similarity index 100% rename from windowed/lanczos3-fast.slangp rename to interpolation/lanczos3-fast.slangp diff --git a/cubic/shaders/b-spline-x.slang b/interpolation/shaders/b-spline-x.slang similarity index 100% rename from cubic/shaders/b-spline-x.slang rename to interpolation/shaders/b-spline-x.slang diff --git a/cubic/shaders/b-spline-y.slang b/interpolation/shaders/b-spline-y.slang similarity index 100% rename from cubic/shaders/b-spline-y.slang rename to interpolation/shaders/b-spline-y.slang diff --git a/xbr/shaders/support/bicubic-x.slang b/interpolation/shaders/bicubic-x.slang similarity index 100% rename from xbr/shaders/support/bicubic-x.slang rename to interpolation/shaders/bicubic-x.slang diff --git a/xbr/shaders/support/bicubic-y.slang b/interpolation/shaders/bicubic-y.slang similarity index 100% rename from xbr/shaders/support/bicubic-y.slang rename to interpolation/shaders/bicubic-y.slang diff --git a/cubic/shaders/bicubic.slang b/interpolation/shaders/bicubic.slang similarity index 100% rename from cubic/shaders/bicubic.slang rename to interpolation/shaders/bicubic.slang diff --git a/cubic/shaders/catmull-rom-x.slang b/interpolation/shaders/catmull-rom-x.slang similarity index 100% rename from cubic/shaders/catmull-rom-x.slang rename to interpolation/shaders/catmull-rom-x.slang diff --git a/cubic/shaders/catmull-rom-y.slang b/interpolation/shaders/catmull-rom-y.slang similarity index 100% rename from cubic/shaders/catmull-rom-y.slang rename to interpolation/shaders/catmull-rom-y.slang diff --git a/cubic/shaders/catmull-rom.slang b/interpolation/shaders/catmull-rom.slang similarity index 100% rename from cubic/shaders/catmull-rom.slang rename to interpolation/shaders/catmull-rom.slang diff --git a/cubic/shaders/cubic-gamma-correct.slang b/interpolation/shaders/cubic-gamma-correct.slang similarity index 100% rename from cubic/shaders/cubic-gamma-correct.slang rename to interpolation/shaders/cubic-gamma-correct.slang diff --git a/cubic/shaders/cubic.slang b/interpolation/shaders/cubic.slang similarity index 100% rename from cubic/shaders/cubic.slang rename to interpolation/shaders/cubic.slang diff --git a/windowed/shaders/jinc2.slang b/interpolation/shaders/jinc2.slang similarity index 100% rename from windowed/shaders/jinc2.slang rename to interpolation/shaders/jinc2.slang diff --git a/windowed/shaders/lanczos16.slang b/interpolation/shaders/lanczos16.slang similarity index 100% rename from windowed/shaders/lanczos16.slang rename to interpolation/shaders/lanczos16.slang diff --git a/windowed/shaders/lanczos3-x.slang b/interpolation/shaders/lanczos3-x.slang similarity index 100% rename from windowed/shaders/lanczos3-x.slang rename to interpolation/shaders/lanczos3-x.slang diff --git a/windowed/shaders/lanczos3-y.slang b/interpolation/shaders/lanczos3-y.slang similarity index 100% rename from windowed/shaders/lanczos3-y.slang rename to interpolation/shaders/lanczos3-y.slang diff --git a/cubic/shaders/linearize.slang b/interpolation/shaders/linearize.slang similarity index 100% rename from cubic/shaders/linearize.slang rename to interpolation/shaders/linearize.slang diff --git a/xbr/shaders/support/spline16-x.slang b/interpolation/shaders/spline16-x.slang similarity index 100% rename from xbr/shaders/support/spline16-x.slang rename to interpolation/shaders/spline16-x.slang diff --git a/xbr/shaders/support/spline16-y.slang b/interpolation/shaders/spline16-y.slang similarity index 100% rename from xbr/shaders/support/spline16-y.slang rename to interpolation/shaders/spline16-y.slang diff --git a/cubic/shaders/spline36-x.slang b/interpolation/shaders/spline36-x.slang similarity index 100% rename from cubic/shaders/spline36-x.slang rename to interpolation/shaders/spline36-x.slang diff --git a/cubic/shaders/spline36-y.slang b/interpolation/shaders/spline36-y.slang similarity index 100% rename from cubic/shaders/spline36-y.slang rename to interpolation/shaders/spline36-y.slang diff --git a/cubic/spline16-fast.slangp b/interpolation/spline16-fast.slangp similarity index 100% rename from cubic/spline16-fast.slangp rename to interpolation/spline16-fast.slangp diff --git a/cubic/spline36-fast.slangp b/interpolation/spline36-fast.slangp similarity index 100% rename from cubic/spline36-fast.slangp rename to interpolation/spline36-fast.slangp diff --git a/interpolation/half_res.slangp b/misc/half_res.slangp similarity index 100% rename from interpolation/half_res.slangp rename to misc/half_res.slangp diff --git a/interpolation/aann.slangp b/pixel-art-scaling/aann.slangp similarity index 100% rename from interpolation/aann.slangp rename to pixel-art-scaling/aann.slangp diff --git a/interpolation/bandlimit-pixel.slangp b/pixel-art-scaling/bandlimit-pixel.slangp similarity index 100% rename from interpolation/bandlimit-pixel.slangp rename to pixel-art-scaling/bandlimit-pixel.slangp diff --git a/interpolation/bilinear-adjustable.slangp b/pixel-art-scaling/bilinear-adjustable.slangp similarity index 100% rename from interpolation/bilinear-adjustable.slangp rename to pixel-art-scaling/bilinear-adjustable.slangp diff --git a/interpolation/controlled_sharpness.slangp b/pixel-art-scaling/controlled_sharpness.slangp similarity index 100% rename from interpolation/controlled_sharpness.slangp rename to pixel-art-scaling/controlled_sharpness.slangp diff --git a/interpolation/grid-blend-hybrid.slangp b/pixel-art-scaling/grid-blend-hybrid.slangp similarity index 95% rename from interpolation/grid-blend-hybrid.slangp rename to pixel-art-scaling/grid-blend-hybrid.slangp index 6e3f949c..7d532a9a 100644 --- a/interpolation/grid-blend-hybrid.slangp +++ b/pixel-art-scaling/grid-blend-hybrid.slangp @@ -1,5 +1,5 @@ -shaders = 1 - -shader0 = shaders/grid-blend-hybrid.slang -filter_linear0 = true -scale_type0 = viewport +shaders = 1 + +shader0 = shaders/grid-blend-hybrid.slang +filter_linear0 = true +scale_type0 = viewport diff --git a/interpolation/pixel_aa.slangp b/pixel-art-scaling/pixel_aa.slangp similarity index 100% rename from interpolation/pixel_aa.slangp rename to pixel-art-scaling/pixel_aa.slangp diff --git a/interpolation/pixellate.slangp b/pixel-art-scaling/pixellate.slangp similarity index 100% rename from interpolation/pixellate.slangp rename to pixel-art-scaling/pixellate.slangp diff --git a/interpolation/shaders/ControlledSharpness.slang b/pixel-art-scaling/shaders/ControlledSharpness.slang similarity index 100% rename from interpolation/shaders/ControlledSharpness.slang rename to pixel-art-scaling/shaders/ControlledSharpness.slang diff --git a/interpolation/shaders/SmuberStep.slang b/pixel-art-scaling/shaders/SmuberStep.slang similarity index 100% rename from interpolation/shaders/SmuberStep.slang rename to pixel-art-scaling/shaders/SmuberStep.slang diff --git a/interpolation/shaders/aann.slang b/pixel-art-scaling/shaders/aann.slang similarity index 100% rename from interpolation/shaders/aann.slang rename to pixel-art-scaling/shaders/aann.slang diff --git a/interpolation/shaders/bandlimit-pixel.slang b/pixel-art-scaling/shaders/bandlimit-pixel.slang similarity index 100% rename from interpolation/shaders/bandlimit-pixel.slang rename to pixel-art-scaling/shaders/bandlimit-pixel.slang diff --git a/interpolation/shaders/bilinear-adjustable.slang b/pixel-art-scaling/shaders/bilinear-adjustable.slang similarity index 100% rename from interpolation/shaders/bilinear-adjustable.slang rename to pixel-art-scaling/shaders/bilinear-adjustable.slang diff --git a/interpolation/shaders/grid-blend-hybrid.slang b/pixel-art-scaling/shaders/grid-blend-hybrid.slang similarity index 100% rename from interpolation/shaders/grid-blend-hybrid.slang rename to pixel-art-scaling/shaders/grid-blend-hybrid.slang diff --git a/interpolation/shaders/pixel_aa/pixel_aa.slang b/pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang similarity index 100% rename from interpolation/shaders/pixel_aa/pixel_aa.slang rename to pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang diff --git a/interpolation/shaders/pixel_aa/shared.slang b/pixel-art-scaling/shaders/pixel_aa/shared.slang similarity index 100% rename from interpolation/shaders/pixel_aa/shared.slang rename to pixel-art-scaling/shaders/pixel_aa/shared.slang diff --git a/interpolation/shaders/pixellate.slang b/pixel-art-scaling/shaders/pixellate.slang similarity index 100% rename from interpolation/shaders/pixellate.slang rename to pixel-art-scaling/shaders/pixellate.slang diff --git a/interpolation/shaders/sharp-bilinear-scanlines.slang b/pixel-art-scaling/shaders/sharp-bilinear-scanlines.slang similarity index 100% rename from interpolation/shaders/sharp-bilinear-scanlines.slang rename to pixel-art-scaling/shaders/sharp-bilinear-scanlines.slang diff --git a/interpolation/shaders/sharp-bilinear-simple.slang b/pixel-art-scaling/shaders/sharp-bilinear-simple.slang similarity index 100% rename from interpolation/shaders/sharp-bilinear-simple.slang rename to pixel-art-scaling/shaders/sharp-bilinear-simple.slang diff --git a/interpolation/shaders/sharp-bilinear.slang b/pixel-art-scaling/shaders/sharp-bilinear.slang similarity index 100% rename from interpolation/shaders/sharp-bilinear.slang rename to pixel-art-scaling/shaders/sharp-bilinear.slang diff --git a/interpolation/shaders/smootheststep.slang b/pixel-art-scaling/shaders/smootheststep.slang similarity index 100% rename from interpolation/shaders/smootheststep.slang rename to pixel-art-scaling/shaders/smootheststep.slang diff --git a/interpolation/shaders/uniform-nearest.slang b/pixel-art-scaling/shaders/uniform-nearest.slang similarity index 100% rename from interpolation/shaders/uniform-nearest.slang rename to pixel-art-scaling/shaders/uniform-nearest.slang diff --git a/interpolation/sharp-bilinear-2x-prescale.slangp b/pixel-art-scaling/sharp-bilinear-2x-prescale.slangp similarity index 100% rename from interpolation/sharp-bilinear-2x-prescale.slangp rename to pixel-art-scaling/sharp-bilinear-2x-prescale.slangp diff --git a/interpolation/sharp-bilinear-scanlines.slangp b/pixel-art-scaling/sharp-bilinear-scanlines.slangp similarity index 100% rename from interpolation/sharp-bilinear-scanlines.slangp rename to pixel-art-scaling/sharp-bilinear-scanlines.slangp diff --git a/interpolation/sharp-bilinear-simple.slangp b/pixel-art-scaling/sharp-bilinear-simple.slangp similarity index 100% rename from interpolation/sharp-bilinear-simple.slangp rename to pixel-art-scaling/sharp-bilinear-simple.slangp diff --git a/interpolation/sharp-bilinear.slangp b/pixel-art-scaling/sharp-bilinear.slangp similarity index 100% rename from interpolation/sharp-bilinear.slangp rename to pixel-art-scaling/sharp-bilinear.slangp diff --git a/interpolation/smootheststep.slangp b/pixel-art-scaling/smootheststep.slangp similarity index 100% rename from interpolation/smootheststep.slangp rename to pixel-art-scaling/smootheststep.slangp diff --git a/interpolation/smuberstep.slangp b/pixel-art-scaling/smuberstep.slangp similarity index 100% rename from interpolation/smuberstep.slangp rename to pixel-art-scaling/smuberstep.slangp diff --git a/interpolation/uniform-nearest.slangp b/pixel-art-scaling/uniform-nearest.slangp similarity index 100% rename from interpolation/uniform-nearest.slangp rename to pixel-art-scaling/uniform-nearest.slangp diff --git a/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp b/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp index 7ea363af..3e56b35b 100644 --- a/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp +++ b/presets/mdapt+fast-bilateral+super-4xbr+scanlines.slangp @@ -42,7 +42,7 @@ scale_type_y7 = "source" scale_y7 = "1.000000" alias7 = XbrSource -shader8 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader8 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear8 = "false" wrap_mode8 = "clamp_to_edge" scale_type_x8 = "source" @@ -50,7 +50,7 @@ scale_x8 = "1.000000" scale_type_y8 = "source" scale_y8 = "1.000000" -shader9 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader9 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear9 = "false" wrap_mode9 = "clamp_to_edge" scale_type_x9 = "source" @@ -59,7 +59,7 @@ scale_type_y9 = "source" scale_y9 = "2.000000" alias9 = "PassPrev2" -shader10 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader10 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear10 = "false" wrap_mode10 = "clamp_to_edge" scale_type_x10 = "source" @@ -67,7 +67,7 @@ scale_x10 = "1.000000" scale_type_y10 = "source" scale_y10 = "1.000000" -shader11 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader11 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear11 = "false" wrap_mode11 = "clamp_to_edge" scale_type_x11 = "source" @@ -75,7 +75,7 @@ scale_x11 = "1.000000" scale_type_y11 = "source" scale_y11 = "1.000000" -shader12 = "../xbr/shaders/super-xbr/super-xbr-pass1b.slang" +shader12 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1b.slang" filter_linear12 = "false" wrap_mode12 = "clamp_to_edge" scale_type_x12 = "source" @@ -83,7 +83,7 @@ scale_x12 = "2.000000" scale_type_y12 = "source" scale_y12 = "2.000000" -shader13 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader13 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear13 = "false" wrap_mode13 = "clamp_to_edge" scale_type_x13 = "source" diff --git a/presets/nedi-powervr-sharpen.slangp b/presets/nedi-powervr-sharpen.slangp index 63022203..8f2e1117 100644 --- a/presets/nedi-powervr-sharpen.slangp +++ b/presets/nedi-powervr-sharpen.slangp @@ -10,7 +10,7 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../nedi/shaders/nedi-pass0.slang" +shader1 = "../edge-smoothing/nedi/shaders/nedi-pass0.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_border" mipmap_input1 = "false" @@ -21,7 +21,7 @@ scale_type_x1 = "source" scale_x1 = "2.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../nedi/shaders/nedi-pass1.slang" +shader2 = "../edge-smoothing/nedi/shaders/nedi-pass1.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_border" mipmap_input2 = "false" @@ -32,7 +32,7 @@ scale_type_x2 = "source" scale_x2 = "1.000000" scale_type_y2 = "source" scale_y2 = "2.000000" -shader3 = "../nedi/shaders/nedi-pass2.slang" +shader3 = "../edge-smoothing/nedi/shaders/nedi-pass2.slang" filter_linear3 = "false" wrap_mode3 = "clamp_to_border" mipmap_input3 = "false" @@ -43,7 +43,7 @@ scale_type_x3 = "source" scale_x3 = "1.000000" scale_type_y3 = "source" scale_y3 = "1.000000" -shader4 = "../nedi/shaders/nedi-jinc.slang" +shader4 = "../edge-smoothing/nedi/shaders/nedi-jinc.slang" filter_linear4 = "false" wrap_mode4 = "clamp_to_border" mipmap_input4 = "false" diff --git a/presets/nes-color-decoder+colorimetry+pixellate.slangp b/presets/nes-color-decoder+colorimetry+pixellate.slangp index 8322c6fe..f9d72aa2 100644 --- a/presets/nes-color-decoder+colorimetry+pixellate.slangp +++ b/presets/nes-color-decoder+colorimetry+pixellate.slangp @@ -1,7 +1,7 @@ shaders = "3" shader0 = ../nes_raw_palette/shaders/nes-color-decoder.slang shader1 = ../misc/shaders/colorimetry.slang -shader2 = ../interpolation/shaders/pixellate.slang +shader2 = ../pixel-art-scaling/shaders/pixellate.slang filter_linear0 = "false" scale_type0 = "source" diff --git a/presets/nes-color-decoder+pixellate.slangp b/presets/nes-color-decoder+pixellate.slangp index 88d39c41..5289f7fe 100644 --- a/presets/nes-color-decoder+pixellate.slangp +++ b/presets/nes-color-decoder+pixellate.slangp @@ -1,6 +1,6 @@ shaders = "2" shader0 = ../nes_raw_palette/shaders/nes-color-decoder.slang -shader1 = ../interpolation/shaders/pixellate.slang +shader1 = ../pixel-art-scaling/shaders/pixellate.slang filter_linear0 = "false" scale_type0 = "source" diff --git a/presets/scalefx+rAA+aa-fast.slangp b/presets/scalefx+rAA+aa-fast.slangp index 55fe6c7a..593ad38e 100644 --- a/presets/scalefx+rAA+aa-fast.slangp +++ b/presets/scalefx+rAA+aa-fast.slangp @@ -4,30 +4,30 @@ shader0 = ../stock.slang alias0 = refpass filter_linear0 = "false" -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 diff --git a/presets/scalefx+rAA+aa.slangp b/presets/scalefx+rAA+aa.slangp index 4b0140a8..d5f5e08b 100644 --- a/presets/scalefx+rAA+aa.slangp +++ b/presets/scalefx+rAA+aa.slangp @@ -4,30 +4,30 @@ shader0 = ../stock.slang alias0 = refpass filter_linear0 = "false" -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 @@ -47,7 +47,7 @@ filter_linear8 = true scale_type8 = source scale8 = 1.0 -shader9 = ../xsoft/shaders/4xsoft.slang +shader9 = ../edge-smoothing/xsoft/shaders/4xsoft.slang filter_linear9 = true scale_type9 = source scale9 = 2.0 diff --git a/presets/scalefx-aa-fast.slangp b/presets/scalefx-aa-fast.slangp index 2e6702da..c10ca9a9 100644 --- a/presets/scalefx-aa-fast.slangp +++ b/presets/scalefx-aa-fast.slangp @@ -4,30 +4,30 @@ shader0 = ../stock.slang alias0 = refpass filter_linear0 = "false" -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 diff --git a/presets/scalefx-aa.slangp b/presets/scalefx-aa.slangp index 4627c8e0..2e4007cc 100644 --- a/presets/scalefx-aa.slangp +++ b/presets/scalefx-aa.slangp @@ -4,30 +4,30 @@ shader0 = ../stock.slang alias0 = refpass filter_linear0 = "false" -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 @@ -37,7 +37,7 @@ filter_linear6 = true scale_type6 = source scale6 = 1.0 -shader7 = ../xsoft/shaders/4xsoft.slang +shader7 = ../edge-smoothing/xsoft/shaders/4xsoft.slang filter_linear7 = true scale_type7 = source scale7 = 2.0 diff --git a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp index 22679f73..0167e4a2 100644 --- a/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-ntsc-sh1nra358.slangp @@ -3,49 +3,49 @@ shaders = 17 shader0 = ../stock.slang alias0 = scalefx_old_refpass -shader1 = ../scalefx/shaders/old/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 alias1 = sfxp0 -shader2 = ../scalefx/shaders/old/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 alias2 = sfxp1 -shader3 = ../scalefx/shaders/old/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 alias3 = sfxp2 -shader4 = ../scalefx/shaders/old/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 3.0 alias4 = sfxp3 -shader5 = ../scalefx/shaders/old/scalefx-pass0.slang +shader5 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang filter_linear5 = false scale_type5 = source scale5 = 1.0 alias5 = sfxp4 -shader6 = ../scalefx/shaders/old/scalefx-pass1.slang +shader6 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 alias6 = sfxp5 -shader7 = ../scalefx/shaders/old/scalefx-pass2.slang +shader7 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang filter_linear7 = false scale_type7 = source scale7 = 1.0 alias7 = sfxp6 -shader8 = ../scalefx/shaders/old/scalefx-pass7.slang +shader8 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang filter_linear8 = false scale_type8 = source scale8 = 3.0 diff --git a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp index c7301b2f..ae5a2f3a 100644 --- a/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp +++ b/presets/scalefx9-aa-blur-hazy-vibrance-sh1nra358.slangp @@ -3,49 +3,49 @@ shaders = 17 shader0 = ../stock.slang alias0 = scalefx_old_refpass -shader1 = ../scalefx/shaders/old/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 alias1 = sfxp0 -shader2 = ../scalefx/shaders/old/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 alias2 = sfxp1 -shader3 = ../scalefx/shaders/old/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 alias3 = sfxp2 -shader4 = ../scalefx/shaders/old/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 3.0 alias4 = sfxp3 -shader5 = ../scalefx/shaders/old/scalefx-pass0.slang +shader5 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass0.slang filter_linear5 = false scale_type5 = source scale5 = 1.0 alias5 = sfxp4 -shader6 = ../scalefx/shaders/old/scalefx-pass1.slang +shader6 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass1.slang filter_linear6 = false scale_type6 = source scale6 = 1.0 alias6 = sfxp5 -shader7 = ../scalefx/shaders/old/scalefx-pass2.slang +shader7 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass2.slang filter_linear7 = false scale_type7 = source scale7 = 1.0 alias7 = sfxp6 -shader8 = ../scalefx/shaders/old/scalefx-pass7.slang +shader8 = ../edge-smoothing/scalefx/shaders/old/scalefx-pass7.slang filter_linear8 = false scale_type8 = source scale8 = 3.0 diff --git a/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp b/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp index ff8352b9..ce5a7ca7 100644 --- a/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp +++ b/presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp @@ -3,7 +3,7 @@ shaders = "4" shader0 = "../../crt/shaders/tvout-tweaks.slang" shader1 = "../../misc/shaders/image-adjustment.slang" -shader2 = "../../windowed/shaders/jinc2.slang" +shader2 = "../../interpolation/shaders/jinc2.slang" shader3 = "../../misc/shaders/interlacing.slang" scale_type_x0 = "source" diff --git a/presets/tvout/tvout-jinc-sharpen.slangp b/presets/tvout/tvout-jinc-sharpen.slangp index 357c29fb..7655ef0d 100644 --- a/presets/tvout/tvout-jinc-sharpen.slangp +++ b/presets/tvout/tvout-jinc-sharpen.slangp @@ -3,7 +3,7 @@ shaders = "3" shader0 = "../../crt/shaders/tvout-tweaks.slang" shader1 = "../../misc/shaders/image-adjustment.slang" -shader2 = "../../windowed/shaders/jinc2.slang" +shader2 = "../../interpolation/shaders/jinc2.slang" shader3 = "../../misc/shaders/interlacing.slang" scale_type_x0 = "source" diff --git a/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp b/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp index 7998b652..bacf9948 100644 --- a/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp +++ b/presets/xsoft+scalefx-level2aa+sharpsmoother.slangp @@ -1,35 +1,35 @@ shaders = 10 -shader0 = ../windowed/shaders/jinc2.slang +shader0 = ../interpolation/shaders/jinc2.slang filter_linear0 = false scale_type0 = source scale0 = 1.0 alias0 = refpass -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.0 diff --git a/presets/xsoft+scalefx-level2aa.slangp b/presets/xsoft+scalefx-level2aa.slangp index c00ffda9..3228d5d4 100644 --- a/presets/xsoft+scalefx-level2aa.slangp +++ b/presets/xsoft+scalefx-level2aa.slangp @@ -3,30 +3,30 @@ shaders = 9 shader0 = ../stock.slang alias0 = refpass -shader1 = ../scalefx/shaders/scalefx-pass0.slang +shader1 = ../edge-smoothing/scalefx/shaders/scalefx-pass0.slang filter_linear1 = false scale_type1 = source scale1 = 1.0 float_framebuffer1 = true alias1 = scalefx_pass0 -shader2 = ../scalefx/shaders/scalefx-pass1.slang +shader2 = ../edge-smoothing/scalefx/shaders/scalefx-pass1.slang filter_linear2 = false scale_type2 = source scale2 = 1.0 float_framebuffer2 = true -shader3 = ../scalefx/shaders/scalefx-pass2.slang +shader3 = ../edge-smoothing/scalefx/shaders/scalefx-pass2.slang filter_linear3 = false scale_type3 = source scale3 = 1.0 -shader4 = ../scalefx/shaders/scalefx-pass3.slang +shader4 = ../edge-smoothing/scalefx/shaders/scalefx-pass3.slang filter_linear4 = false scale_type4 = source scale4 = 1.0 -shader5 = ../scalefx/shaders/scalefx-pass4.slang +shader5 = ../edge-smoothing/scalefx/shaders/scalefx-pass4.slang filter_linear5 = false scale_type5 = source scale5 = 3.1 diff --git a/scanlines/ossc_slot.slangp b/scanlines/ossc_slot.slangp index 9aa87882..971e08e0 100644 --- a/scanlines/ossc_slot.slangp +++ b/scanlines/ossc_slot.slangp @@ -10,7 +10,7 @@ scale_type_x0 = "source" scale_x0 = "1.000000" scale_type_y0 = "source" scale_y0 = "1.000000" -shader1 = "../windowed/shaders/lanczos3-x.slang" +shader1 = "../interpolation/shaders/lanczos3-x.slang" filter_linear1 = "false" wrap_mode1 = "clamp_to_edge" mipmap_input1 = "false" @@ -21,7 +21,7 @@ scale_type_x1 = "viewport" scale_x1 = "1.000000" scale_type_y1 = "source" scale_y1 = "1.000000" -shader2 = "../windowed/shaders/lanczos3-y.slang" +shader2 = "../interpolation/shaders/lanczos3-y.slang" filter_linear2 = "false" wrap_mode2 = "clamp_to_edge" mipmap_input2 = "false" diff --git a/sharpen/super-xbr-super-res.slangp b/sharpen/super-xbr-super-res.slangp index a7a9453e..49b4b084 100644 --- a/sharpen/super-xbr-super-res.slangp +++ b/sharpen/super-xbr-super-res.slangp @@ -6,23 +6,23 @@ alias0 = diff_refpass shader1 = ../stock.slang alias1 = XbrSource -shader2 = "../xbr/shaders/super-xbr/super-xbr-pass0.slang" +shader2 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass0.slang" filter_linear2 = "false" scale_type2 = "source" scale2 = "1.000000" -shader3 = "../xbr/shaders/super-xbr/super-xbr-pass1.slang" +shader3 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass1.slang" filter_linear3 = "false" scale_type3 = "source" scale3 = "2.000000" -shader4 = "../xbr/shaders/super-xbr/super-xbr-pass2.slang" +shader4 = "../edge-smoothing/xbr/shaders/super-xbr/super-xbr-pass2.slang" filter_linear4 = "false" scale_type4 = "source" scale4 = "1.000000" alias4 = "REF" -shader5 = "../cubic/shaders/cubic.slang" +shader5 = "../interpolation/shaders/cubic.slang" filter_linear5 = "false" scale_type5 = "source" scale5 = "0.500000" @@ -47,6 +47,6 @@ filter_linear9 = "false" scale_type9 = "source" scale9 = "1.000000" -shader10 = "../xbr/shaders/super-xbr/custom-jinc2-sharper.slang" +shader10 = "../edge-smoothing/xbr/shaders/super-xbr/custom-jinc2-sharper.slang" filter_linear10 = "false" scale_type10 = viewport