From 57aa495ca1bb79df443a5c4231a2b7f3813fac90 Mon Sep 17 00:00:00 2001 From: hunterk Date: Sat, 24 Sep 2022 09:00:43 -0500 Subject: [PATCH] cleanup ntsc dir --- ...p => ntsc-256px-composite-scanline.slangp} | 8 +++--- ...6px.slangp => ntsc-256px-composite.slangp} | 4 +-- ...angp => ntsc-256px-svideo-scanline.slangp} | 8 +++--- ntsc/ntsc-256px-svideo.slangp | 4 +-- ...p => ntsc-320px-composite-scanline.slangp} | 8 +++--- ...0px.slangp => ntsc-320px-composite.slangp} | 4 +-- ...angp => ntsc-320px-svideo-scanline.slangp} | 8 +++--- ntsc/ntsc-320px-svideo.slangp | 4 +-- ntsc/ntsc-svideo.slangp | 25 ------------------- ntsc/ntsc.slangp | 25 ------------------- .../ntsc-decode-filter-2phase.inc | 0 .../ntsc-decode-filter-3phase.inc | 0 .../{ => maister}/ntsc-gauss-pass.slang | 0 ntsc/shaders/{ => maister}/ntsc-param.inc | 0 .../ntsc-pass1-composite-2phase.slang | 0 .../ntsc-pass1-composite-3phase.slang | 0 .../ntsc-pass1-encode-demodulate.inc | 0 .../ntsc-pass1-svideo-2phase.slang | 0 .../ntsc-pass1-svideo-3phase.slang | 0 .../{ => maister}/ntsc-pass1-vertex.inc | 0 .../ntsc-pass2-2phase-gamma.slang | 0 .../ntsc-pass2-2phase-linear.slang | 0 .../{ => maister}/ntsc-pass2-2phase.slang | 0 .../ntsc-pass2-3phase-gamma.slang | 0 .../ntsc-pass2-3phase-linear.slang | 0 .../{ => maister}/ntsc-pass2-3phase.slang | 0 .../{ => maister}/ntsc-pass2-decode.inc | 0 .../{ => maister}/ntsc-pass2-vertex.inc | 0 ntsc/shaders/{ => maister}/ntsc-rgbyuv.inc | 0 ntsc/shaders/{ => maister}/ntsc-stock.slang | 0 30 files changed, 24 insertions(+), 74 deletions(-) rename ntsc/{ntsc-256px-svideo-gauss-scanline.slangp => ntsc-256px-composite-scanline.slangp} (63%) rename ntsc/{ntsc-256px.slangp => ntsc-256px-composite.slangp} (67%) rename ntsc/{ntsc-256px-gauss-scanline.slangp => ntsc-256px-svideo-scanline.slangp} (63%) rename ntsc/{ntsc-320px-gauss-scanline.slangp => ntsc-320px-composite-scanline.slangp} (63%) rename ntsc/{ntsc-320px.slangp => ntsc-320px-composite.slangp} (67%) rename ntsc/{ntsc-320px-svideo-gauss-scanline.slangp => ntsc-320px-svideo-scanline.slangp} (63%) delete mode 100644 ntsc/ntsc-svideo.slangp delete mode 100644 ntsc/ntsc.slangp rename ntsc/shaders/{ => maister}/ntsc-decode-filter-2phase.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-decode-filter-3phase.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-gauss-pass.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-param.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-composite-2phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-composite-3phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-encode-demodulate.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-svideo-2phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-svideo-3phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass1-vertex.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-2phase-gamma.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-2phase-linear.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-2phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-3phase-gamma.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-3phase-linear.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-3phase.slang (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-decode.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-pass2-vertex.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-rgbyuv.inc (100%) rename ntsc/shaders/{ => maister}/ntsc-stock.slang (100%) diff --git a/ntsc/ntsc-256px-svideo-gauss-scanline.slangp b/ntsc/ntsc-256px-composite-scanline.slangp similarity index 63% rename from ntsc/ntsc-256px-svideo-gauss-scanline.slangp rename to ntsc/ntsc-256px-composite-scanline.slangp index 4348dc9..c768259 100644 --- a/ntsc/ntsc-256px-svideo-gauss-scanline.slangp +++ b/ntsc/ntsc-256px-composite-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px.slangp b/ntsc/ntsc-256px-composite.slangp similarity index 67% rename from ntsc/ntsc-256px.slangp rename to ntsc/ntsc-256px-composite.slangp index 7e8d8a8..8cb31fc 100644 --- a/ntsc/ntsc-256px.slangp +++ b/ntsc/ntsc-256px-composite.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-composite-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px-gauss-scanline.slangp b/ntsc/ntsc-256px-svideo-scanline.slangp similarity index 63% rename from ntsc/ntsc-256px-gauss-scanline.slangp rename to ntsc/ntsc-256px-svideo-scanline.slangp index 1a38872..c521f91 100644 --- a/ntsc/ntsc-256px-gauss-scanline.slangp +++ b/ntsc/ntsc-256px-svideo-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-256px-svideo.slangp b/ntsc/ntsc-256px-svideo.slangp index 663b7ed..c95c695 100644 --- a/ntsc/ntsc-256px-svideo.slangp +++ b/ntsc/ntsc-256px-svideo.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-svideo-3phase.slang +shader1 = shaders/maister/ntsc-pass2-3phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-gauss-scanline.slangp b/ntsc/ntsc-320px-composite-scanline.slangp similarity index 63% rename from ntsc/ntsc-320px-gauss-scanline.slangp rename to ntsc/ntsc-320px-composite-scanline.slangp index e7ddf50..7c83711 100644 --- a/ntsc/ntsc-320px-gauss-scanline.slangp +++ b/ntsc/ntsc-320px-composite-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-composite-2phase.slang -shader1 = shaders/ntsc-pass2-2phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px.slangp b/ntsc/ntsc-320px-composite.slangp similarity index 67% rename from ntsc/ntsc-320px.slangp rename to ntsc/ntsc-320px-composite.slangp index d2139fa..e3d1b8f 100644 --- a/ntsc/ntsc-320px.slangp +++ b/ntsc/ntsc-320px-composite.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-composite-2phase.slang -shader1 = shaders/ntsc-pass2-2phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-composite-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-svideo-gauss-scanline.slangp b/ntsc/ntsc-320px-svideo-scanline.slangp similarity index 63% rename from ntsc/ntsc-320px-svideo-gauss-scanline.slangp rename to ntsc/ntsc-320px-svideo-scanline.slangp index 675cecf..5f52c20 100644 --- a/ntsc/ntsc-320px-svideo-gauss-scanline.slangp +++ b/ntsc/ntsc-320px-svideo-scanline.slangp @@ -1,8 +1,8 @@ shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-2phase.slang -shader1 = shaders/ntsc-pass2-2phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang +shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase.slang +shader2 = shaders/maister/ntsc-gauss-pass.slang +shader3 = shaders/maister/ntsc-stock.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-320px-svideo.slangp b/ntsc/ntsc-320px-svideo.slangp index 2b4531f..b78b8c5 100644 --- a/ntsc/ntsc-320px-svideo.slangp +++ b/ntsc/ntsc-320px-svideo.slangp @@ -1,6 +1,6 @@ shaders = 2 -shader0 = shaders/ntsc-pass1-svideo-2phase.slang -shader1 = shaders/ntsc-pass2-2phase-gamma.slang +shader0 = shaders/maister/ntsc-pass1-svideo-2phase.slang +shader1 = shaders/maister/ntsc-pass2-2phase-gamma.slang filter_linear0 = false filter_linear1 = false diff --git a/ntsc/ntsc-svideo.slangp b/ntsc/ntsc-svideo.slangp deleted file mode 100644 index e3931cc..0000000 --- a/ntsc/ntsc-svideo.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = 4 -shader0 = shaders/ntsc-pass1-svideo-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -scale_type0 = source -scale_x0 = 4.0 -scale_y0 = 1.0 -frame_count_mod0 = 2 -float_framebuffer0 = true - -scale_type1 = source -scale_x1 = 0.5 -scale_y1 = 1.0 - -scale_type_x2 = source -scale_type_y2 = viewport -scale2 = 1.0 - diff --git a/ntsc/ntsc.slangp b/ntsc/ntsc.slangp deleted file mode 100644 index b8143e9..0000000 --- a/ntsc/ntsc.slangp +++ /dev/null @@ -1,25 +0,0 @@ -shaders = 4 -shader0 = shaders/ntsc-pass1-composite-3phase.slang -shader1 = shaders/ntsc-pass2-3phase.slang -shader2 = shaders/ntsc-gauss-pass.slang -shader3 = shaders/ntsc-stock.slang - -filter_linear0 = false -filter_linear1 = false -filter_linear2 = false -filter_linear3 = true - -scale_type0 = source -scale_x0 = 4.0 -scale_y0 = 1.0 -frame_count_mod0 = 2 -float_framebuffer0 = true - -scale_type1 = source -scale_x1 = 0.5 -scale_y1 = 1.0 - -scale_type_x2 = source -scale_type_y2 = viewport -scale2 = 1.0 - diff --git a/ntsc/shaders/ntsc-decode-filter-2phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-2phase.inc similarity index 100% rename from ntsc/shaders/ntsc-decode-filter-2phase.inc rename to ntsc/shaders/maister/ntsc-decode-filter-2phase.inc diff --git a/ntsc/shaders/ntsc-decode-filter-3phase.inc b/ntsc/shaders/maister/ntsc-decode-filter-3phase.inc similarity index 100% rename from ntsc/shaders/ntsc-decode-filter-3phase.inc rename to ntsc/shaders/maister/ntsc-decode-filter-3phase.inc diff --git a/ntsc/shaders/ntsc-gauss-pass.slang b/ntsc/shaders/maister/ntsc-gauss-pass.slang similarity index 100% rename from ntsc/shaders/ntsc-gauss-pass.slang rename to ntsc/shaders/maister/ntsc-gauss-pass.slang diff --git a/ntsc/shaders/ntsc-param.inc b/ntsc/shaders/maister/ntsc-param.inc similarity index 100% rename from ntsc/shaders/ntsc-param.inc rename to ntsc/shaders/maister/ntsc-param.inc diff --git a/ntsc/shaders/ntsc-pass1-composite-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-composite-2phase.slang rename to ntsc/shaders/maister/ntsc-pass1-composite-2phase.slang diff --git a/ntsc/shaders/ntsc-pass1-composite-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-composite-3phase.slang rename to ntsc/shaders/maister/ntsc-pass1-composite-3phase.slang diff --git a/ntsc/shaders/ntsc-pass1-encode-demodulate.inc b/ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc similarity index 100% rename from ntsc/shaders/ntsc-pass1-encode-demodulate.inc rename to ntsc/shaders/maister/ntsc-pass1-encode-demodulate.inc diff --git a/ntsc/shaders/ntsc-pass1-svideo-2phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-svideo-2phase.slang rename to ntsc/shaders/maister/ntsc-pass1-svideo-2phase.slang diff --git a/ntsc/shaders/ntsc-pass1-svideo-3phase.slang b/ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass1-svideo-3phase.slang rename to ntsc/shaders/maister/ntsc-pass1-svideo-3phase.slang diff --git a/ntsc/shaders/ntsc-pass1-vertex.inc b/ntsc/shaders/maister/ntsc-pass1-vertex.inc similarity index 100% rename from ntsc/shaders/ntsc-pass1-vertex.inc rename to ntsc/shaders/maister/ntsc-pass1-vertex.inc diff --git a/ntsc/shaders/ntsc-pass2-2phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase-gamma.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase-gamma.slang diff --git a/ntsc/shaders/ntsc-pass2-2phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase-linear.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase-linear.slang diff --git a/ntsc/shaders/ntsc-pass2-2phase.slang b/ntsc/shaders/maister/ntsc-pass2-2phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-2phase.slang rename to ntsc/shaders/maister/ntsc-pass2-2phase.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase-gamma.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase-gamma.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase-gamma.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase-linear.slang b/ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase-linear.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase-linear.slang diff --git a/ntsc/shaders/ntsc-pass2-3phase.slang b/ntsc/shaders/maister/ntsc-pass2-3phase.slang similarity index 100% rename from ntsc/shaders/ntsc-pass2-3phase.slang rename to ntsc/shaders/maister/ntsc-pass2-3phase.slang diff --git a/ntsc/shaders/ntsc-pass2-decode.inc b/ntsc/shaders/maister/ntsc-pass2-decode.inc similarity index 100% rename from ntsc/shaders/ntsc-pass2-decode.inc rename to ntsc/shaders/maister/ntsc-pass2-decode.inc diff --git a/ntsc/shaders/ntsc-pass2-vertex.inc b/ntsc/shaders/maister/ntsc-pass2-vertex.inc similarity index 100% rename from ntsc/shaders/ntsc-pass2-vertex.inc rename to ntsc/shaders/maister/ntsc-pass2-vertex.inc diff --git a/ntsc/shaders/ntsc-rgbyuv.inc b/ntsc/shaders/maister/ntsc-rgbyuv.inc similarity index 100% rename from ntsc/shaders/ntsc-rgbyuv.inc rename to ntsc/shaders/maister/ntsc-rgbyuv.inc diff --git a/ntsc/shaders/ntsc-stock.slang b/ntsc/shaders/maister/ntsc-stock.slang similarity index 100% rename from ntsc/shaders/ntsc-stock.slang rename to ntsc/shaders/maister/ntsc-stock.slang