ares v124

ares v124 brings the compatibility rating for the Famicom and Nintendo 64 cores up to three stars. This means that at least 80% of the game library is working. There have been notable improvements to Game Boy, Mega Drive, Sega Mega CD, Sega 32X and Nintendo 64 emulation, and the PC-Engine multi-tap is now supported. Finally, the dynamic recompiler now generates slightly more efficient code. You may notice a slight performance boost in Nintendo 64, Sega 32X and Sony PlayStation. **Changelog:** * Famicom: Add support for Jaleco JF11/JF14 mapper [Shideravan] * Game Boy: Bring fast-boot closer to normal boot; Fixes Dr. Fraken [invertego] * Game Boy: Use stable sort for sprites; fixes speech bubbles in Crayon Shin-chan 3 [invertego] * Game Boy: Remove limit on window width; fixes pause screen in Heiankyo Alien [invertego] * Game Boy: Emulate serial transfers with no link; fixes input in Alleyway [invertego] * Game Boy: Improve handling of LCD/BG enable for DMG; fixes Hyper Lode Runner [invertego] * Game Boy: Resume from halt whenever (IE & IF) != 0; fies Amazing Penguin [invertego] * Mega Drive: Fix DMA transfer rate and H-Int signalling; fixes Another World, 3 Ninja's Kick Back, Virtua Racing, Burning Force [TascoDLX] * Mega Drive: Fix sprite masking and overflow; Fixes Mickey Mania [TascoDLX] * Mega Drive: Fix DMA fill; Fixes Demons of Asteborg [TascoDLX] * Mega Drive: Fix VRAM byte addressing; Fixes Contra Hard Corps, Musha [TascoDLX] * Mega Drive: Fix VDP control port writes [TascoDLX] * Mega Drive: Implement HV Counter Patching [TascoDLX] * Mega Drive: Implement STOP instruction; fixes Thunder Force IV [TascoDLX] * Mega Drive: Default to 3-button gamepad; fixes games that don't support 6-button pads [Shideravan] * Mega Drive/Mega CD: Fix detection of device rom header; allows Mode-1 to work [Luke Usher] * Mega CD: Fix word-ram 1M access pattern; Fixes Lethal Enforcers II [TascoDLX] * Mega CD: Fix H-Int vectoring; Fixes Microcosm, Silpheed, Wing Commander, and others [TascoDLX] * Mega CD: Implement full graphics/1M wordram translations; fixes Rebel Assault [TascoDLX] * Mega 32X: Tighten M68k sync; Fixes Kolibri and Fifa 96 [TascoDLX] * Neo Geo Pocket: Fix off-by-one error in LDAR instruction; fixes a crash in SNK Gals' Fighters [invertego] * Nintendo 64: Support controller ports 3 & 4 [LukeUsher] * Nintendo 64: Better Flash Ram support; Fixes Majora's Mask, Paper Mario, Derby Stallion 64 [jeltaqq] * Nintendo 64: Add mempack/rumble status to database; eliminates controller pak/rumble pak warnings [remutro] * Nintendo 64: Consume cycles to compensate for skipped RDRAM initialization; fixes Wave Race 64 Shindou Pak [invertego] * Nintendo 64: Fix PIF RAM init on cold boot, preserve RDRAM on warm reset; fixes Perfect Dark boot [invertego] * Nintendo 64: Default to 3 controllers for Jeopardy!, this game doesn't work with 4 controllers, even on hardware [invertego] * Nintendo 64: Fix FPU compare and divide exceptions; Turok is now able to play the entire Acclaim logo animation [invertego] * Nintendo 64: Decrease SI DMA delay; improves Turok, Donkey Kong 64, Forsaken 64, Hercules, Triple Play 2000 [invertego] * Nintendo 64: Implement perfect PI DMA write [rasky] * PC Engine: Support Multi-Tap [LukeUsher] * TMS9918: Widen vcounter to 9-bits; improves ColecoVision, SG-1000, MSX [invertego] * desktop-ui: Support up-to 5 virtual controllers (For PC-Engine) [LukeUsher] * desktop-ui: Fix window background with GTK3 [ghisvail] * desktop-ui: Install icons in freedesktop compliant locations [ghisvail] * desktop-ui/hiro: Improved macOS user experience [LIJI32] * ruby: Fix conflated keys on Windows; fixes some keyboard input issues [invertego] * nall: Use XDG base directories on *nix systems [ghisvail] * shaders: Include a selection of public-domain shaders [LukeUsher] * ares: Fix address masking in instruction tracer [invertego] * ares: Fix warnings reported by clang [invertego] * ares: Fix static init in node subclasses [invertego] * ares: Use 64-bit integers instead of 128-bit integers in the scheduler [invertego] * ares: Use IP relative direct branches in the recompiler, where possible [invertego] * ares: Emit only one epilog per block in the recompiler [invertego] * ares: add label API to recompiler to simplify branches [invertego] * ares: Use fixed BSS allocation for code cache; improves recompiler performance [invertego] * ares: Fix instructionEpilogue test [invertego] * ares: Directly emit code for target ABI; generates more efficient code in the recompiler [invertego] * ares: Avoid encoding absolute data addresses in the recompiler [invertego] * nall: allow mingw headers to define _MSVCRT_VERSION_ [invertego] * nall: generate PDB when building with clang on windows [invertego] * nall: allow generation of debug symbols with symbols=true [invertego] * nall: link with lld wen building with clang on Windows [invertego] * nall: Make thread movable but not copyable; fixes random UI hangs on Windows [invertego] * mia: Fix MSU-1 rom loading [Luke Usher]
recompiler: avoid encoding absolute data addresses
2026-11-12 18:06:03 -10:00 · 2021-10-15 14:48:42 +01:00 · 2021-10-15 09:11:47 +01:00 · 2021-10-14 20:14:04 +01:00 · 2021-10-02 10:14:00 +01:00 · 2021-10-01 09:00:52 +01:00
1726 changed files with 249325 additions and 170478 deletions
@@ -0,0 +1,170 @@
+name: Build
+on:
+  push:
+    branches: [ master ]
+    tags: [ 'v*' ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build:
+    strategy:
+      matrix:
+        program:
+        - ares
+        os:
+        - name: windows
+          version: latest
+        - name: macos
+          version: latest
+        - name: ubuntu
+          version: latest
+    runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Dependencies
+      if: matrix.os.name == 'ubuntu'
+      run: |
+        sudo apt-get update -y -qq
+        sudo apt-get install libsdl2-dev libgtksourceview2.0-dev libgtk2.0-dev libao-dev libopenal-dev   
+    - name: Make
+      run: make -j4 -C desktop-ui build=optimized local=false lto=true
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.program }}-${{ matrix.os.name }}
+        path: desktop-ui/out/*
+
+     
+  release:
+    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    needs:
+    - build
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: 'src'
+    - name: Download Artifacts
+      uses: actions/download-artifact@v2
+      with:
+        path: 'bin'
+    - name: Package Artifacts
+      run: |
+        set -eu
+        case ${GITHUB_REF} in
+          refs/tags/*) suffix="-${GITHUB_REF#refs/tags/}" ;;
+          refs/heads/master) suffix="-nightly" ;;
+          *) suffix="" ;;
+        esac
+
+        srcdir="${GITHUB_WORKSPACE}/src"
+        bindir="${GITHUB_WORKSPACE}/bin"
+
+        # Hack: Workaround for GitHub artifacts losing attributes.
+        chmod +x ${bindir}/ares-macos/ares.app/Contents/MacOS/ares
+
+        for os in windows macos
+        do
+          mkdir "${os}"
+          cd "${os}"
+
+          # Package ares.
+          outdir=ares${suffix}
+          mkdir ${outdir}
+          cp -ar ${bindir}/ares-${os}/* ${outdir}
+          zip -r ../ares-${os}.zip ${outdir}
+
+          cd -
+        done
+    - name: Create Release
+      id: release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        set -eu
+        github_rest()
+        {
+          local method="${1}"
+          local url="https://api.github.com${2}"
+          shift 2
+          >&2 echo "${method} ${url}"
+          curl \
+            --fail \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -X "${method}" \
+            "${url}" \
+            "$@"
+        }
+        github_get_release_id_for_tag()
+        {
+          payload=$(github_rest GET "/repos/${GITHUB_REPOSITORY}/releases/tags/${1}") || return
+          echo "${payload}" | jq .id
+        }
+        github_delete_release_by_id()
+        {
+          github_rest DELETE "/repos/${GITHUB_REPOSITORY}/releases/${1}"
+        }
+        github_create_release()
+        {
+          local payload="{
+            \"tag_name\": \"${1}\",
+            \"target_commitish\": \"${2}\",
+            \"name\": \"${3}\",
+            \"body\": \"${4}\",
+            \"draft\": ${5},
+            \"prerelease\": ${6}
+          }"
+          github_rest POST "/repos/${GITHUB_REPOSITORY}/releases" -d "${payload}"
+        }
+        make_nightly_release()
+        {
+          github_create_release \
+            nightly \
+            "${GITHUB_SHA}" \
+            "ares nightly $(date +"%Y-%m-%d")" \
+            "Auto-generated nightly release on $(date -u +"%Y-%m-%d %T %Z")" \
+            false \
+            true
+        }
+        make_version_release()
+        {
+          github_create_release \
+            "${1}" \
+            "${GITHUB_SHA}" \
+            "ares ${1}" \
+            "This is ares ${1}, released on $(date +"%Y-%m-%d")." \
+            false \
+            false
+        }
+        case ${GITHUB_REF} in
+          refs/tags/*)
+            # Create a new version release using the current revision.
+            echo "UPLOAD_URL=$(make_version_release ${GITHUB_REF#refs/tags/} | jq -r .upload_url)" >> $GITHUB_ENV
+            ;;
+          refs/heads/master)
+            # Check for an existing nightly release.
+            { release_id=$(github_get_release_id_for_tag nightly); status=$?; } || true
+            # Delete existing nightly release if it exists.
+            case ${status} in
+              0) github_delete_release_by_id "${release_id}" ;;
+              22) >&2 echo "No current nightly release; skipping tag deletion." ;;
+              *) >&2 echo "API call failed unexpectedly." && exit 1 ;;
+            esac
+            # Create a new nightly release using the current revision.
+            echo "UPLOAD_URL=$(make_nightly_release | jq -r .upload_url)" >> $GITHUB_ENV
+            ;;
+        esac
+    - name: Upload ares-windows
+      uses: actions/upload-release-asset@v1
+      env: { GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' }
+      with: { upload_url: '${{ env.UPLOAD_URL }}', asset_path: 'ares-windows.zip', asset_name: 'ares-windows.zip', asset_content_type: 'application/zip' }
+    - name: Upload ares-macos
+      uses: actions/upload-release-asset@v1
+      env: { GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' }
+      with: { upload_url: '${{ env.UPLOAD_URL }}', asset_path: 'ares-macos.zip', asset_name: 'ares-macos.zip', asset_content_type: 'application/zip' }
+#  - name: Upload ares-ubuntu
+#      uses: actions/upload-release-asset@v1
+#      env: { GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' }
+#      with: { upload_url: '${{ env.UPLOAD_URL }}', asset_path: 'ares-ubuntu.zip', asset_name: 'ares-ubuntu.zip', asset_content_type: 'application/zip' }
+
@@ -0,0 +1,15 @@
+ares
+
+Copyright (c) 2004-2021 ares team, Near et al
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -0,0 +1,18 @@
+# ares
+
+[![License: ISC](https://img.shields.io/badge/License-ISC-blue.svg)](https://github.com/higan-emu/ares/blob/master/LICENSE)
+
+**ares** is a multi-system emulator that began development on October 14th, 2004.
+It is a descendent of [higan](https://github.com/higan-emu/higan) and [bsnes](https://github.com/bsnes-emu/bsnes/), and focuses on accuracy and preservation.
+
+Official Releases
+-----------------
+
+Official releases are available from
+[the ares website](https://ares-emulator.github.io).
+
+Nightly Builds
+--------------
+
+Automated, untested builds of ares are available for Windows and macOS as a [pre-release](https://github.com/higan-emu/ares/releases/tag/nightly). 
+Only the latest nightly build is kept.
@@ -10,9 +10,10 @@ else
  $(error "ares is a library and cannot be built directly.")
 endif

-ares.objects := ares
+ares.objects := ares ares-fixed-allocator

 $(object.path)/ares.o: $(ares.path)/ares/ares.cpp
+$(object.path)/ares-fixed-allocator.o: $(ares.path)/ares/memory/fixed-allocator.cpp

 ifeq ($(vulkan),true)
  flags += -DVULKAN
@@ -50,6 +51,10 @@ ifneq ($(filter $(cores),md),)
  include $(ares.path)/md/GNUmakefile
 endif

+ifneq ($(filter $(cores),saturn),)
+  include $(ares.path)/saturn/GNUmakefile
+endif
+
 ifneq ($(filter $(cores),ps1),)
  include $(ares.path)/ps1/GNUmakefile
 endif
@@ -78,6 +83,10 @@ ifneq ($(filter $(cores),ws),)
  include $(ares.path)/ws/GNUmakefile
 endif

+ifneq ($(filter $(cores),ng),)
+  include $(ares.path)/ng/GNUmakefile
+endif
+
 ifneq ($(filter $(cores),ngp),)
  include $(ares.path)/ngp/GNUmakefile
 endif
@@ -1,8 +1,6 @@
 #version 150

-// AntiAliased Nearest Neighbor
-// by jimbo1qaz and wareya
-// Licensed MIT
+//anti-aliased nearest-neighbor

 precision highp float;

@@ -16,78 +14,68 @@ in Vertex {

 out vec4 fragColor;

-#define NOT(fl) (1-fl)
-#define YES(fl) fl
-
-vec4 vpow(vec4 n, float e)
-{
-    return vec4(pow(n.x, e), pow(n.y, e), pow(n.z, e), pow(n.w, e));
+vec4 vpow(vec4 n, float e) {
+  return vec4(pow(n.x, e), pow(n.y, e), pow(n.z, e), pow(n.w, e));
 }

-vec4 getLQV(vec3 mine) {
-    return vec4
-    ( mine.r
-    , mine.g
-    , mine.b
-    , mine.r*0.2989 + mine.g*0.5870 + mine.b*0.1140);
+vec4 toLQV(vec3 c) {
+  return vec4(c.r, c.g, c.b, c.r * 0.2989 + c.g * 0.5870 + c.b * 0.1140);
 }
-vec3 fromLQV(vec4 mine) {
-    float f = mine.w/(mine.r*0.2989 + mine.g*0.5870 + mine.b*0.1140);
-    return vec3(mine.rgb)*f;
+
+vec3 fromLQV(vec4 c) {
+  float f = c.w / (c.r * 0.2989 + c.g * 0.5870 + c.b * 0.1140);
+  return vec3(c.rgb) * f;
 }

 vec3 percent(float ssize, float tsize, float coord) {
-    float minfull = (coord*tsize - 0.5) /tsize*ssize;
-    float maxfull = (coord*tsize + 0.5) /tsize*ssize;
-
-    float realfull = floor(maxfull);
-
-    if (minfull > realfull) {
-        return vec3(1, (realfull+0.5)/ssize, (realfull+0.5)/ssize);
-    }
+  float minfull  = (coord * tsize - 0.5) / tsize * ssize;
+  float maxfull  = (coord * tsize + 0.5) / tsize * ssize;
+  float realfull = floor(maxfull);

+  if(minfull > realfull) {
    return vec3(
-            (maxfull - realfull) / (maxfull - minfull),
-            (realfull-0.5) / ssize,
-            (realfull+0.5) / ssize
-        );
-}
+      1,
+      (realfull + 0.5) / ssize,
+      (realfull + 0.5) / ssize
+    );
+  }

+  return vec3(
+    (maxfull - realfull) / (maxfull - minfull),
+    (realfull - 0.5) / ssize,
+    (realfull + 0.5) / ssize
+  );
+}

 void main() {
-    float cheapsrgb = 2.1;
-    float gamma = 3.0;
-    vec3 xstuff = percent(sourceSize[0].x, targetSize[0].x, texCoord.x);
-    vec3 ystuff = percent(sourceSize[0].y, targetSize[0].y, texCoord.y);
+  float srgb  = 2.1;
+  float gamma = 3.0;

-    float xkeep = xstuff[0];
-    float ykeep = ystuff[0];
-    
-    // get points to interpolate across, in linear rgb
-    vec4 a = getLQV(vpow(texture(source[0],vec2(xstuff[1],ystuff[1])), cheapsrgb).rgb);
-    vec4 b = getLQV(vpow(texture(source[0],vec2(xstuff[2],ystuff[1])), cheapsrgb).rgb);
-    vec4 c = getLQV(vpow(texture(source[0],vec2(xstuff[1],ystuff[2])), cheapsrgb).rgb);
-    vec4 d = getLQV(vpow(texture(source[0],vec2(xstuff[2],ystuff[2])), cheapsrgb).rgb);
-    
-    // use perceptual gamma for luminance component
-    a.w = pow(a.w, 1/gamma);
-    b.w = pow(b.w, 1/gamma);
-    c.w = pow(c.w, 1/gamma);
-    d.w = pow(d.w, 1/gamma);
-    
-    // interpolate
-    vec4 gammaLQVresult =
-        NOT(xkeep)*NOT(ykeep)*a +
-        YES(xkeep)*NOT(ykeep)*b +
-        NOT(xkeep)*YES(ykeep)*c +
-        YES(xkeep)*YES(ykeep)*d;
-    
-    // change luminance gamma back to linear
-    vec4 LQVresult = gammaLQVresult;
-    LQVresult.w = pow(gammaLQVresult.w, gamma);
-    
-    // convert back to srgb; lqv -> lrgb -> srgb
-    vec4 c1 = vpow(vec4(fromLQV(LQVresult), 1), 1/cheapsrgb);
-    
-    fragColor = c1;
+  vec3 x = percent(sourceSize[0].x, targetSize[0].x, texCoord.x);
+  vec3 y = percent(sourceSize[0].y, targetSize[0].y, texCoord.y);
+
+  //get points to interpolate across in linear RGB
+  vec4 a = toLQV(vpow(texture(source[0], vec2(x[1], y[1])), srgb).rgb);
+  vec4 b = toLQV(vpow(texture(source[0], vec2(x[2], y[1])), srgb).rgb);
+  vec4 c = toLQV(vpow(texture(source[0], vec2(x[1], y[2])), srgb).rgb);
+  vec4 d = toLQV(vpow(texture(source[0], vec2(x[2], y[2])), srgb).rgb);
+
+  //use perceptual gamma for luminance component
+  a.w = pow(a.w, 1 / gamma);
+  b.w = pow(b.w, 1 / gamma);
+  c.w = pow(c.w, 1 / gamma);
+  d.w = pow(d.w, 1 / gamma);
+
+  //interpolate
+  vec4 gammaLQV =
+    (1.0 - x[0]) * (1.0 - y[0]) * a +
+    (0.0 + x[0]) * (1.0 - y[0]) * b +
+    (1.0 - x[0]) * (0.0 + y[0]) * c +
+    (0.0 + x[0]) * (0.0 + y[0]) * d;
+
+  //convert luminance gamma back to linear
+  gammaLQV.w = pow(gammaLQV.w, gamma);
+
+  //convert color back to sRGB
+  fragColor = vpow(vec4(fromLQV(gammaLQV), 1), 1 / srgb);
 }
@@ -3,6 +3,6 @@ input

 program
  fragment: AANN.fs
-  
+
 output
-  filter: nearest
+  filter: nearest
@@ -1,297 +0,0 @@
-#version 150
-
-/*
-    CRT-interlaced
-
-    Copyright (C) 2010-2012 cgwg, Themaister and DOLLS
-
-    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.
-
-    (cgwg gave their consent to have the original version of this shader
-    distributed under the GPL in this message:
-
-    http://board.byuu.org/viewtopic.php?p=26075#p26075
-
-    "Feel free to distribute my shaders under the GPL. After all, the
-    barrel distortion code was taken from the Curvature shader, which is
-    under the GPL."
-    )
-    This shader variant is pre-configured with screen curvature
-*/
-
-//#define INTERLACED
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-uniform int phase;
-
-in Vertex {
-  vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-// Comment the next line to disable interpolation in linear gamma (and gain speed).
-#define LINEAR_PROCESSING
-
-// Enable screen curvature.
-#define CURVATURE
-
-// Enable 3x oversampling of the beam profile
-#define OVERSAMPLE
-
-// Use the older, purely gaussian beam profile
-//#define USEGAUSSIAN
-
-// vertex params //
-
-  // gamma of simulated CRT
-#define CRTgamma 2.4
-  // gamma of display monitor (typically 2.2 is correct)
-#define monitorgamma 2.2
-  // overscan (e.g. 1.02 for 2% overscan)
-#define overscan vec2(1.0 , 1.0)//(0.93 , 0.915)
-  // aspect ratio
-#define aspect vec2(1.0, 0.75)
-  // lengths are measured in units of (approximately) the width of the monitor
-  // simulated distance from viewer to monitor
-#define d 2.0
-  // radius of curvature
-#define R 2.0
-  // tilt angle in radians
-  // (behavior might be a bit wrong if both components are nonzero)
-#define angle vec2(0.0,-0.0)
-  // size of curved corners
-#define cornersize 0.02
-  // border smoothness parameter
-  // decrease if borders are too aliased
-#define cornersmooth 80.0
-
-#define sinangle sin(angle)
-#define cosangle cos(angle)
-#define stretch maxscale()
-#define ilfac vec2(1.0, floor(sourceSize[0].y / 200.0))
-#define one (ilfac / sourceSize[0].xy)
-#define mod_factor (texCoord.x * targetSize.x)
-
-// END of vertex params // 
-
-// Macros.
-#define FIX(c) max(abs(c), 1e-5);
-#define PI 3.141592653589
-
-#ifdef LINEAR_PROCESSING
-#       define TEX2D(c) pow(texture(source[0], (c)), vec4(CRTgamma))
-#else
-#       define TEX2D(c) texture(source[0], (c))
-#endif
-
-#define FIX(c) max(abs(c), 1e-5);
-
-float intersect(vec2 xy)
-{
-  float A = dot(xy,xy)+d*d;
-  float B = 2.0*(R*(dot(xy,sinangle)-d*cosangle.x*cosangle.y)-d*d);
-  float C = d*d + 2.0*R*d*cosangle.x*cosangle.y;
-  return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy)
-{
-  float c = intersect(xy);
-  vec2 point = vec2(c)*xy;
-  point -= vec2(-R)*sinangle;
-  point /= vec2(R);
-  vec2 tang = sinangle/cosangle;
-  vec2 poc = point/cosangle;
-  float A = dot(tang,tang)+1.0;
-  float B = -2.0*dot(poc,tang);
-  float C = dot(poc,poc)-1.0;
-  float a = (-B+sqrt(B*B-4.0*A*C))/(2.0*A);
-  vec2 uv = (point-a*sinangle)/cosangle;
-  float r = R*acos(a);
-  return uv*r/sin(r/R);
-}
-
-vec2 fwtrans(vec2 uv)
-{
-  float r = FIX(sqrt(dot(uv,uv)));
-  uv *= sin(r/R)/r;
-  float x = 1.0-cos(r/R);
-  float D = d/R + x*cosangle.x*cosangle.y+dot(uv,sinangle);
-  return d*(uv*cosangle-x*sinangle)/D;
-}
-
-vec3 maxscale()
-{
-  vec2 c = bkwtrans(-R * sinangle / (1.0 + R/d*cosangle.x*cosangle.y));
-  vec2 a = vec2(0.5,0.5)*aspect;
-  vec2 lo = vec2(fwtrans(vec2(-a.x,c.y)).x,
-		 fwtrans(vec2(c.x,-a.y)).y)/aspect;
-  vec2 hi = vec2(fwtrans(vec2(+a.x,c.y)).x,
-		 fwtrans(vec2(c.x,+a.y)).y)/aspect;
-  return vec3((hi+lo)*aspect*0.5,max(hi.x-lo.x,hi.y-lo.y));
-}
-
-vec2 transform(vec2 coord)
-{
-  coord = (coord-vec2(0.5))*aspect*stretch.z+stretch.xy;
-  return (bkwtrans(coord)/overscan/aspect+vec2(0.5));
-}
-
-float corner(vec2 coord)
-{
-  coord = (coord - vec2(0.5)) * overscan + vec2(0.5);
-  coord = min(coord, vec2(1.0)-coord) * aspect;
-  vec2 cdist = vec2(cornersize);
-  coord = (cdist - min(coord,cdist));
-  float dist = sqrt(dot(coord,coord));
-  return clamp((cdist.x-dist)*cornersmooth,0.0, 1.0);
-}
-
-// Calculate the influence of a scanline on the current pixel.
-//
-// 'distance' is the distance in texture coordinates from the current
-// pixel to the scanline in question.
-// 'color' is the colour of the scanline at the horizontal location of
-// the current pixel.
-vec4 scanlineWeights(float distance, vec4 color)
-{
-  // "wid" controls the width of the scanline beam, for each RGB channel
-  // The "weights" lines basically specify the formula that gives
-  // you the profile of the beam, i.e. the intensity as
-  // a function of distance from the vertical center of the
-  // scanline. In this case, it is gaussian if width=2, and
-  // becomes nongaussian for larger widths. Ideally this should
-  // be normalized so that the integral across the beam is
-  // independent of its width. That is, for a narrower beam
-  // "weights" should have a higher peak at the center of the
-  // scanline than for a wider beam.
-#ifdef USEGAUSSIAN
-  vec4 wid = 0.3 + 0.1 * pow(color, vec4(3.0));
-  vec4 weights = vec4(distance / wid);
-  return 0.4 * exp(-weights * weights) / wid;
-#else
-  vec4 wid = 2.0 + 2.0 * pow(color, vec4(4.0));
-  vec4 weights = vec4(distance / 0.3);
-  return 1.4 * exp(-pow(weights * inversesqrt(0.5 * wid), wid)) / (0.6 + 0.2 * wid);
-#endif
-}
-
-void main()
-{
-
-  // Here's a helpful diagram to keep in mind while trying to
-  // understand the code:
-  //
-  //  |      |      |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //  |  01  |  11  |  21  |  31  | <-- current scanline
-  //  |      | @    |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //  |  02  |  12  |  22  |  32  | <-- next scanline
-  //  |      |      |      |      |
-  // -------------------------------
-  //  |      |      |      |      |
-  //
-  // Each character-cell represents a pixel on the output
-  // surface, "@" represents the current pixel (always somewhere
-  // in the bottom half of the current scan-line, or the top-half
-  // of the next scanline). The grid of lines represents the
-  // edges of the texels of the underlying texture.
-
-  // Texture coordinates of the texel containing the active pixel.
-#ifdef CURVATURE
-  vec2 xy = transform(texCoord);
-#else
-  vec2 xy = texCoord;
-#endif
-  float cval = corner(xy);
-
-  // Of all the pixels that are mapped onto the texel we are
-  // currently rendering, which pixel are we currently rendering?
-#ifdef INTERLACED
-  vec2 ilvec = vec2(0.0,ilfac.y > 1.5 ? mod(float(phase),2.0) : 0.0);
-#else
-  vec2 ilvec = vec2(0.0,ilfac.y);
-#endif
-  vec2 ratio_scale = (xy * sourceSize[0].xy - vec2(0.5) + ilvec)/ilfac;
-#ifdef OVERSAMPLE
-  float filter_ = sourceSize[0].y / targetSize.y;
-#endif
-  vec2 uv_ratio = fract(ratio_scale);
-
-  // Snap to the center of the underlying texel.
-  xy = (floor(ratio_scale)*ilfac + vec2(0.5) - ilvec) / sourceSize[0].xy;
-
-  // Calculate Lanczos scaling coefficients describing the effect
-  // of various neighbour texels in a scanline on the current
-  // pixel.
-  vec4 coeffs = PI * vec4(1.0 + uv_ratio.x, uv_ratio.x, 1.0 - uv_ratio.x, 2.0 - uv_ratio.x);
-
-  // Prevent division by zero.
-  coeffs = FIX(coeffs);
-
-  // Lanczos2 kernel.
-  coeffs = 2.0 * sin(coeffs) * sin(coeffs / 2.0) / (coeffs * coeffs);
-
-  // Normalize.
-  coeffs /= dot(coeffs, vec4(1.0));
-
-  // Calculate the effective colour of the current and next
-  // scanlines at the horizontal location of the current pixel,
-  // using the Lanczos coefficients above.
-  vec4 col  = clamp(mat4(
-			 TEX2D(xy + vec2(-one.x, 0.0)),
-			 TEX2D(xy),
-			 TEX2D(xy + vec2(one.x, 0.0)),
-			 TEX2D(xy + vec2(2.0 * one.x, 0.0))) * coeffs,
-		    0.0, 1.0);
-  vec4 col2 = clamp(mat4(
-			 TEX2D(xy + vec2(-one.x, one.y)),
-			 TEX2D(xy + vec2(0.0, one.y)),
-			 TEX2D(xy + one),
-			 TEX2D(xy + vec2(2.0 * one.x, one.y))) * coeffs,
-		    0.0, 1.0);
-
-#ifndef LINEAR_PROCESSING
-  col  = pow(col , vec4(CRTgamma));
-  col2 = pow(col2, vec4(CRTgamma));
-#endif
-
-  // Calculate the influence of the current and next scanlines on
-  // the current pixel.
-  vec4 weights  = scanlineWeights(uv_ratio.y, col);
-  vec4 weights2 = scanlineWeights(1.0 - uv_ratio.y, col2);
-#ifdef OVERSAMPLE
-  uv_ratio.y =uv_ratio.y+1.0/3.0*filter_;
-  weights = (weights+scanlineWeights(uv_ratio.y, col))/3.0;
-  weights2=(weights2+scanlineWeights(abs(1.0-uv_ratio.y), col2))/3.0;
-  uv_ratio.y =uv_ratio.y-2.0/3.0*filter_;
-  weights=weights+scanlineWeights(abs(uv_ratio.y), col)/3.0;
-  weights2=weights2+scanlineWeights(abs(1.0-uv_ratio.y), col2)/3.0;
-#endif
-  vec3 mul_res  = (col * weights + col2 * weights2).rgb * vec3(cval);
-
-  // dot-mask emulation:
-  // Output pixels are alternately tinted green and magenta.
-  vec3 dotMaskWeights = mix(
-          vec3(1.0, 0.7, 1.0),
-          vec3(0.7, 1.0, 0.7),
-          floor(mod(mod_factor, 2.0))
-      );
-					
-  mul_res *= dotMaskWeights;
-
-  // Convert the image gamma for display on our output device.
-  mul_res = pow(mul_res, vec3(1.0 / monitorgamma));
-
-  // Color the texel.
-  fragColor = vec4(mul_res, 1.0);
-}
@@ -1,121 +0,0 @@
-#version 150
- 
-in vec4 position;
-in vec2 texCoord;
-in vec4 sourceSize[];
-in vec4 targetSize;
- 
-out Vertex {
-   vec2 texCoord;
-} vertexOut;
- 
-float CRTgamma;
-float monitorgamma;
-vec2 overscan;
-vec2 aspect;
-float d;
-float R;
-float cornersize;
-float cornersmooth;
-
-vec3 stretch;
-vec2 sinangle;
-vec2 cosangle;
-
-vec2 one;
-float mod_factor;
-vec2 ilfac;
-
-#define FIX(c) max(abs(c), 1e-5);
-
-float intersect(vec2 xy)
-{
-  float A = dot(xy,xy)+d*d;
-  float B = 2.0*(R*(dot(xy,sinangle)-d*cosangle.x*cosangle.y)-d*d);
-  float C = d*d + 2.0*R*d*cosangle.x*cosangle.y;
-  return (-B-sqrt(B*B-4.0*A*C))/(2.0*A);
-}
-
-vec2 bkwtrans(vec2 xy)
-{
-  float c = intersect(xy);
-  vec2 point = vec2(c)*xy;
-  point -= vec2(-R)*sinangle;
-  point /= vec2(R);
-  vec2 tang = sinangle/cosangle;
-  vec2 poc = point/cosangle;
-  float A = dot(tang,tang)+1.0;
-  float B = -2.0*dot(poc,tang);
-  float C = dot(poc,poc)-1.0;
-  float a = (-B+sqrt(B*B-4.0*A*C))/(2.0*A);
-  vec2 uv = (point-a*sinangle)/cosangle;
-  float r = R*acos(a);
-  return uv*r/sin(r/R);
-}
-
-vec2 fwtrans(vec2 uv)
-{
-  float r = FIX(sqrt(dot(uv,uv)));
-  uv *= sin(r/R)/r;
-  float x = 1.0-cos(r/R);
-  float D = d/R + x*cosangle.x*cosangle.y+dot(uv,sinangle);
-  return d*(uv*cosangle-x*sinangle)/D;
-}
-
-vec3 maxscale()
-{
-  vec2 c = bkwtrans(-R * sinangle / (1.0 + R/d*cosangle.x*cosangle.y));
-  vec2 a = vec2(0.5,0.5)*aspect;
-  vec2 lo = vec2(fwtrans(vec2(-a.x,c.y)).x,
-		 fwtrans(vec2(c.x,-a.y)).y)/aspect;
-  vec2 hi = vec2(fwtrans(vec2(+a.x,c.y)).x,
-		 fwtrans(vec2(c.x,+a.y)).y)/aspect;
-  return vec3((hi+lo)*aspect*0.5,max(hi.x-lo.x,hi.y-lo.y));
-}
-
-void main()
-{
-
-  // START of parameters
-
-  // gamma of simulated CRT
-  CRTgamma = 2.4;
-  // gamma of display monitor (typically 2.2 is correct)
-  monitorgamma = 2.2;
-  // overscan (e.g. 1.02 for 2% overscan)
-  overscan = vec2(0.99,0.99);
-  // aspect ratio
-  aspect = vec2(1.0, 0.75);
-  // lengths are measured in units of (approximately) the width of the monitor
-  // simulated distance from viewer to monitor
-  d = 2.0;
-  // radius of curvature
-  R = 2.0;
-  // tilt angle in radians
-  // (behavior might be a bit wrong if both components are nonzero)
-  const vec2 angle = vec2(0.0,-0.0);
-  // size of curved corners
-  cornersize = 0.03;
-  // border smoothness parameter
-  // decrease if borders are too aliased
-  cornersmooth = 80.0;
-
-  // END of parameters
-  
-vertexOut.texCoord = texCoord.xy;
-gl_Position = position;
-
-  // Precalculate a bunch of useful values we'll need in the fragment
-  // shader.
-  sinangle = sin(angle);
-  cosangle = cos(angle);
-  stretch = maxscale();
-
-  ilfac = vec2(1.0,floor(sourceSize[0].y/200.0));
-
-  // The size of one texel, in texture-coordinates.
-  one = ilfac / sourceSize[0].xy;
-
-  // Resulting X pixel-coordinate of the pixel we're drawing.
-  mod_factor = texCoord.x * targetSize.x;			
-}
@@ -1,5 +0,0 @@
-program
-  vertex: crt-geom.vs
-  fragment: crt-geom.fs
-  modulo: 2
-  
@@ -1,32 +0,0 @@
-#version 150
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-// Higher value, more centered glow.
-// Lower values might need more taps.
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main() {
-   vec3 col = vec3(0.0);
-   float dx = 4.0 * sourceSize[0].z; // Mipmapped
-
-   float k_total = 0.0;
-   for (int i = -TAPS; i <= TAPS; i++)
-   {
-      float k  = kernel(i);
-      k_total += k;
-      col     += k * texture(source[0], vTexCoord + vec2(float(i) * dx, 0.0)).rgb;
-   }
-
-   FragColor = vec4(col / k_total, 1.0);
-}
@@ -1,32 +0,0 @@
-#version 150
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-// Higher value, more centered glow.
-// Lower values might need more taps.
-#define GLOW_FALLOFF 0.35
-#define TAPS 4
-
-#define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
-
-void main() {
-   vec3 col = vec3(0.0);
-   float dy = sourceSize[0].w;
-
-   float k_total = 0.0;
-   for (int i = -TAPS; i <= TAPS; i++)
-   {
-      float k = kernel(i);
-      k_total += k;
-      col += k * texture(source[0], vTexCoord + vec2(0.0, float(i) * dy)).rgb;
-   }
-
-   FragColor = vec4(col / k_total, 1.0);
-}
@@ -1,13 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,33 +0,0 @@
-#version 150
-
-#define INV_SQRT_2_PI 0.38 // Doesn't have to be accurate.
-
-#define HORIZ_GAUSS_WIDTH 0.5
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-   float data_pix_no;
-   float data_one;
-};
-
-out vec4 FragColor;
-
-void main() {
-   float texel      = floor(data_pix_no);
-   float phase      = data_pix_no - texel;
-   float base_phase = phase - 0.5;
-   vec2 tex         = vec2((texel + 0.5) * sourceSize[0].z, vTexCoord.y);
-
-   vec3 col = vec3(0.0);
-   for (int i = -2; i <= 2; i++)
-   {
-      float phase = base_phase - float(i);
-      float g = INV_SQRT_2_PI * exp(-0.5 * phase * phase / (HORIZ_GAUSS_WIDTH * HORIZ_GAUSS_WIDTH)) / HORIZ_GAUSS_WIDTH;
-      col += texture(source[0], tex + vec2(float(i) * data_one, 0.0)).rgb * g;
-   }
-
-   FragColor = vec4(col, 1.0);
-}
@@ -1,20 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-   float data_pix_no;
-   float data_one;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-   
-   data_pix_no = vTexCoord.x * sourceSize[0].x;
-   data_one = sourceSize[0].z;
-}
@@ -1,49 +0,0 @@
-#version 150
-
-#define BOOST 1.0
-#define CRT_GEOM_BEAM 1
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-   vec2 data_pix_no;
-   float data_one;
-};
-
-out vec4 FragColor;
-
-vec3 beam(vec3 color, float dist)
-{
-#if CRT_GEOM_BEAM
-   vec3 wid     = 2.0 + 2.0 * pow(color, vec3(4.0));
-   vec3 weights = vec3(abs(dist) * 3.333333333);
-
-   return 2.0 * color * exp(-pow(weights * inversesqrt(0.5 * wid), wid)) / (0.6 + 0.2 * wid);
-#else
-   float reciprocal_width = 4.0;
-   vec3 x = dist * reciprocal_width;
-
-   return 2.0 * color * exp(-0.5 * x * x) * reciprocal_width;
-#endif
-}
-
-void main() {
-   vec2  texel = floor(data_pix_no);
-   float phase = data_pix_no.y - texel.y;
-   vec2  tex   = vec2(texel + 0.5) * sourceSize[0].zw;
-
-   vec3 top    = texture(source[0], tex + vec2(0.0, 0 * data_one)).rgb;
-   vec3 bottom = texture(source[0], tex + vec2(0.0, 1 * data_one)).rgb;
-
-   float dist0 = phase;
-   float dist1 = 1.0 - phase;
-
-   vec3 scanline = vec3(0.0);
-
-   scanline += beam(top,    dist0);
-   scanline += beam(bottom, dist1);
-
-   FragColor = vec4(BOOST * scanline * 0.869565217391304, 1.0);
-}
@@ -1,20 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-   vec2 data_pix_no;
-   float data_one;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-   
-   data_pix_no = vTexCoord.xy * sourceSize[0].xy - vec2(0.0, 0.5);
-   data_one = sourceSize[0].w;
-}
@@ -1,13 +0,0 @@
-#version 150
-
-uniform sampler2D source[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-void main() {
-   FragColor = texture(source[0], vTexCoord);
-}
@@ -1,15 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,15 +0,0 @@
-#version 150
-
-#define INPUT_GAMMA 2.2
-
-uniform sampler2D source[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-void main() {
-   FragColor = pow(texture(source[0], vTexCoord), vec4(INPUT_GAMMA));
-}
@@ -1,15 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,54 +0,0 @@
-input
-  filter: nearest
-
-program
-  format: srgb8
-  filter: nearest
-  vertex: linearize.vs
-  fragment: linearize.fs
-  
-program
-  format: srgb8
-  filter: nearest
-  height: 25%
-  width: 100%
-  vertex: gauss_horiz.vs
-  fragment: gauss_horiz.fs
-  
-program
-  format: srgb8
-  filter: nearest
-  vertex: gauss_vert.vs
-  fragment: gauss_vert.fs
-  
-program
-  format: srgb8
-  filter: nearest
-  height: 100%
-  width: 100%
-  vertex: threshold.vs
-  fragment: threshold.fs
-  
-program
-  format: srgb8
-  filter: linear
-  height: 25%
-  width: 25%
-  vertex: blur_horiz.vs
-  fragment: blur_horiz.fs
-  
-program
-  format: srgb8
-  filter: linear
-  height: 100%
-  width: 100%
-  vertex: blur_vert.vs
-  fragment: blur_vert.fs
-  
-program
-  filter: linear
-  vertex: resolve.vs
-  fragment: resolve.fs
-  
-output
-  filter: linear
@@ -1,28 +0,0 @@
-#version 150
-
-#define BLOOM_STRENGTH 0.25
-#define OUTPUT_GAMMA 2.2
-
-uniform sampler2D source[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-// For debugging
-#define BLOOM_ONLY 0
-
-#define CRT_PASS source[3]
-
-void main() {
-#if BLOOM_ONLY
-   vec3 source = BLOOM_STRENGTH * texture(source[0], vTexCoord).rgb;
-#else
-   vec3 source_ = 1.15 * texture(CRT_PASS, vTexCoord).rgb;
-   vec3 bloom  = texture(source[0], vTexCoord).rgb;
-   source_     += BLOOM_STRENGTH * bloom;
-#endif
-   FragColor = vec4(pow(clamp(source_, 0.0, 1.0), vec3(1.0 / OUTPUT_GAMMA)), 1.0);
-}
@@ -1,13 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,19 +0,0 @@
-#version 150
-
-#define GLOW_WHITEPOINT 1.0
-#define GLOW_ROLLOFF 3.0
-
-uniform sampler2D source[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-void main() {
-   vec3 color  = 1.15 * texture(source[0], vTexCoord).rgb;
-   vec3 factor = clamp(color / GLOW_WHITEPOINT, 0.0, 1.0);
-
-   FragColor = vec4(pow(factor, vec3(GLOW_ROLLOFF)), 1.0);
-}
@@ -1,13 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,306 +0,0 @@
-#version 150
-
-// PUBLIC DOMAIN CRT STYLED SCAN-LINE SHADER
-//
-//   by Timothy Lottes
-//
-// This is more along the style of a really good CGA arcade monitor.
-// With RGB inputs instead of NTSC.
-// The shadow mask example has the mask rotated 90 degrees for less chromatic aberration.
-//
-// Left it unoptimized to show the theory behind the algorithm.
-//
-// It is an example what I personally would want as a display option for pixel art games.
-// Please take and use, change, or whatever.
-
-#define hardScan -8.0
-#define hardPix -3.0
-#define warpX 0.031
-#define warpY 0.041 
-#define maskDark 0.5
-#define maskLight 1.5
-#define scaleInLinearGamma 1.0
-#define shadowMask 3.0
-#define brightBoost 1.0
-#define hardBloomPix -1.5
-#define hardBloomScan -2.0
-#define bloomAmount 0.4
-#define shape 2.0
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-//Uncomment to reduce instructions with simpler linearization
-//(fixes HD3000 Sandy Bridge IGP)
-//#define SIMPLE_LINEAR_GAMMA
-#define DO_BLOOM 1
-
-// ------------- //
-
-// sRGB to Linear.
-// Assuming using sRGB typed textures this should not be needed.
-#ifdef SIMPLE_LINEAR_GAMMA
-float ToLinear1(float c)
-{
-    return c;
-}
-vec3 ToLinear(vec3 c)
-{
-    return c;
-}
-vec3 ToSrgb(vec3 c)
-{
-    return pow(c, vec3(1.0 / 2.2));
-}
-#else
-float ToLinear1(float c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return(c<=0.04045) ? c/12.92 : pow((c + 0.055)/1.055, 2.4);
-}
-
-vec3 ToLinear(vec3 c)
-{
-    if (scaleInLinearGamma==0) 
-        return c;
-    
-    return vec3(ToLinear1(c.r), ToLinear1(c.g), ToLinear1(c.b));
-}
-
-// Linear to sRGB.
-// Assuming using sRGB typed textures this should not be needed.
-float ToSrgb1(float c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return(c<0.0031308 ? c*12.92 : 1.055*pow(c, 0.41666) - 0.055);
-}
-
-vec3 ToSrgb(vec3 c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return vec3(ToSrgb1(c.r), ToSrgb1(c.g), ToSrgb1(c.b));
-}
-#endif
-
-
-
-// Nearest emulated sample given floating point position and texel offset.
-// Also zero's off screen.
-vec3 Fetch(vec2 pos,vec2 off){
-  pos=(floor(pos*sourceSize[0].xy+off)+vec2(0.5,0.5))/sourceSize[0].xy;
-#ifdef SIMPLE_LINEAR_GAMMA
-  return ToLinear(brightBoost * pow(texture(source[0],pos.xy).rgb, vec3(2.2)));
-#else
-  return ToLinear(brightBoost * texture(source[0],pos.xy).rgb);
-#endif
-}
-  
-// Distance in emulated pixels to nearest texel.
-vec2 Dist(vec2 pos)
-{
-    pos = pos*sourceSize[0].xy;
-    
-    return -((pos - floor(pos)) - vec2(0.5));
-}
-    
-// 1D Gaussian.
-float Gaus(float pos, float scale)
-{
-    return exp2(scale*pow(abs(pos), shape));
-}
-
-// 3-tap Gaussian filter along horz line.
-vec3 Horz3(vec2 pos, float off)
-{
-    vec3 b    = Fetch(pos, vec2(-1.0, off));
-    vec3 c    = Fetch(pos, vec2( 0.0, off));
-    vec3 d    = Fetch(pos, vec2( 1.0, off));
-    float dst = Dist(pos).x;
-
-    // Convert distance to weight.
-    float scale = hardPix;
-    float wb = Gaus(dst-1.0,scale);
-    float wc = Gaus(dst+0.0,scale);
-    float wd = Gaus(dst+1.0,scale);
-
-    // Return filtered sample.
-    return (b*wb+c*wc+d*wd)/(wb+wc+wd);
-}
-
-// 5-tap Gaussian filter along horz line.
-vec3 Horz5(vec2 pos,float off){
-    vec3 a = Fetch(pos,vec2(-2.0, off));
-    vec3 b = Fetch(pos,vec2(-1.0, off));
-    vec3 c = Fetch(pos,vec2( 0.0, off));
-    vec3 d = Fetch(pos,vec2( 1.0, off));
-    vec3 e = Fetch(pos,vec2( 2.0, off));
-    
-    float dst = Dist(pos).x;
-    // Convert distance to weight.
-    float scale = hardPix;
-    float wa = Gaus(dst - 2.0, scale);
-    float wb = Gaus(dst - 1.0, scale);
-    float wc = Gaus(dst + 0.0, scale);
-    float wd = Gaus(dst + 1.0, scale);
-    float we = Gaus(dst + 2.0, scale);
-    
-    // Return filtered sample.
-    return (a*wa+b*wb+c*wc+d*wd+e*we)/(wa+wb+wc+wd+we);
-}
-  
-// 7-tap Gaussian filter along horz line.
-vec3 Horz7(vec2 pos,float off)
-{
-    vec3 a = Fetch(pos, vec2(-3.0, off));
-    vec3 b = Fetch(pos, vec2(-2.0, off));
-    vec3 c = Fetch(pos, vec2(-1.0, off));
-    vec3 d = Fetch(pos, vec2( 0.0, off));
-    vec3 e = Fetch(pos, vec2( 1.0, off));
-    vec3 f = Fetch(pos, vec2( 2.0, off));
-    vec3 g = Fetch(pos, vec2( 3.0, off));
-
-    float dst = Dist(pos).x;
-    // Convert distance to weight.
-    float scale = hardBloomPix;
-    float wa = Gaus(dst - 3.0, scale);
-    float wb = Gaus(dst - 2.0, scale);
-    float wc = Gaus(dst - 1.0, scale);
-    float wd = Gaus(dst + 0.0, scale);
-    float we = Gaus(dst + 1.0, scale);
-    float wf = Gaus(dst + 2.0, scale);
-    float wg = Gaus(dst + 3.0, scale);
-
-    // Return filtered sample.
-    return (a*wa+b*wb+c*wc+d*wd+e*we+f*wf+g*wg)/(wa+wb+wc+wd+we+wf+wg);
-}
-  
-// Return scanline weight.
-float Scan(vec2 pos, float off)
-{
-    float dst = Dist(pos).y;
-
-    return Gaus(dst + off, hardScan);
-}
-  
-// Return scanline weight for bloom.
-float BloomScan(vec2 pos, float off)
-{
-    float dst = Dist(pos).y;
-    
-    return Gaus(dst + off, hardBloomScan);
-}
-
-// Allow nearest three lines to effect pixel.
-vec3 Tri(vec2 pos)
-{
-    vec3 a = Horz3(pos,-1.0);
-    vec3 b = Horz5(pos, 0.0);
-    vec3 c = Horz3(pos, 1.0);
-    
-    float wa = Scan(pos,-1.0); 
-    float wb = Scan(pos, 0.0);
-    float wc = Scan(pos, 1.0);
-    
-    return a*wa + b*wb + c*wc;
-}
-  
-// Small bloom.
-vec3 Bloom(vec2 pos)
-{
-    vec3 a = Horz5(pos,-2.0);
-    vec3 b = Horz7(pos,-1.0);
-    vec3 c = Horz7(pos, 0.0);
-    vec3 d = Horz7(pos, 1.0);
-    vec3 e = Horz5(pos, 2.0);
-
-    float wa = BloomScan(pos,-2.0);
-    float wb = BloomScan(pos,-1.0); 
-    float wc = BloomScan(pos, 0.0);
-    float wd = BloomScan(pos, 1.0);
-    float we = BloomScan(pos, 2.0);
-
-    return a*wa+b*wb+c*wc+d*wd+e*we;
-}
-  
-// Distortion of scanlines, and end of screen alpha.
-vec2 Warp(vec2 pos)
-{
-    pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*warpX, 1.0 + (pos.x*pos.x)*warpY);
-    
-    return pos*0.5 + 0.5;
-}
-  
-// Shadow mask.
-vec3 Mask(vec2 pos)
-{
-    vec3 mask = vec3(maskDark, maskDark, maskDark);
-  
-    // Very compressed TV style shadow mask.
-    if (shadowMask == 1.0) 
-    {
-        float line = maskLight;
-        float odd = 0.0;
-        
-        if (fract(pos.x*0.166666666) < 0.5) odd = 1.0;
-        if (fract((pos.y + odd) * 0.5) < 0.5) line = maskDark;  
-        
-        pos.x = fract(pos.x*0.333333333);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-        mask*=line;  
-    } 
-
-    // Aperture-grille.
-    else if (shadowMask == 2.0) 
-    {
-        pos.x = fract(pos.x*0.333333333);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    } 
-
-    // Stretched VGA style shadow mask (same as prior shaders).
-    else if (shadowMask == 3.0) 
-    {
-        pos.x += pos.y*3.0;
-        pos.x  = fract(pos.x*0.166666666);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    }
-
-    // VGA style shadow mask.
-    else if (shadowMask == 4.0) 
-    {
-        pos.xy  = floor(pos.xy*vec2(1.0, 0.5));
-        pos.x  += pos.y*3.0;
-        pos.x   = fract(pos.x*0.166666666);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    }
-
-    return mask;
-}
-
-void main() {
-   FragColor = vec4(Bloom(vTexCoord)*bloomAmount, 1.0);
-}
@@ -1,15 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,18 +1,10 @@
-input
-  filter: nearest
-
-program
-  filter: nearest
-  format: srgb8
-  height: 100%
-  width: 100%
-  vertex: bloompass.vs
-  fragment: bloompass.fs
-  
-program
-  filter: nearest
-  vertex: scanpass.vs
-  fragment: scanpass.fs
-  
-output
-  filter: linear
+input
+  filter: nearest
+
+program
+  filter: nearest
+  wrap: border
+  fragment: shadertoy.fs
+
+output
+  filter: nearest
@@ -1,317 +0,0 @@
-#version 150
-
-// PUBLIC DOMAIN CRT STYLED SCAN-LINE SHADER
-//
-//   by Timothy Lottes
-//
-// This is more along the style of a really good CGA arcade monitor.
-// With RGB inputs instead of NTSC.
-// The shadow mask example has the mask rotated 90 degrees for less chromatic aberration.
-//
-// Left it unoptimized to show the theory behind the algorithm.
-//
-// It is an example what I personally would want as a display option for pixel art games.
-// Please take and use, change, or whatever.
-
-#define hardScan -8.0
-#define hardPix -3.0
-#define warpX 0.031
-#define warpY 0.041 
-#define maskDark 0.5
-#define maskLight 1.5
-#define scaleInLinearGamma 1.0
-#define shadowMask 3.0
-#define brightBoost 1.0
-#define hardBloomPix -1.5
-#define hardBloomScan -2.0
-#define bloomAmount 0.4
-#define shape 2.0
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 outputSize;
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-//Uncomment to reduce instructions with simpler linearization
-//(fixes HD3000 Sandy Bridge IGP)
-//#define SIMPLE_LINEAR_GAMMA
-#define DO_BLOOM 1
-
-// ------------- //
-
-// sRGB to Linear.
-// Assuming using sRGB typed textures this should not be needed.
-#ifdef SIMPLE_LINEAR_GAMMA
-float ToLinear1(float c)
-{
-    return c;
-}
-vec3 ToLinear(vec3 c)
-{
-    return c;
-}
-vec3 ToSrgb(vec3 c)
-{
-    return pow(c, vec3(1.0 / 2.2));
-}
-#else
-float ToLinear1(float c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return(c<=0.04045) ? c/12.92 : pow((c + 0.055)/1.055, 2.4);
-}
-
-vec3 ToLinear(vec3 c)
-{
-    if (scaleInLinearGamma==0) 
-        return c;
-    
-    return vec3(ToLinear1(c.r), ToLinear1(c.g), ToLinear1(c.b));
-}
-
-// Linear to sRGB.
-// Assuming using sRGB typed textures this should not be needed.
-float ToSrgb1(float c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return(c<0.0031308 ? c*12.92 : 1.055*pow(c, 0.41666) - 0.055);
-}
-
-vec3 ToSrgb(vec3 c)
-{
-    if (scaleInLinearGamma == 0) 
-        return c;
-    
-    return vec3(ToSrgb1(c.r), ToSrgb1(c.g), ToSrgb1(c.b));
-}
-#endif
-
-
-
-// Nearest emulated sample given floating point position and texel offset.
-// Also zero's off screen.
-vec3 Fetch(vec2 pos,vec2 off){
-  pos=(floor(pos*sourceSize[0].xy+off)+vec2(0.5,0.5))/sourceSize[0].xy;
-#ifdef SIMPLE_LINEAR_GAMMA
-  return ToLinear(brightBoost * pow(texture(source[1],pos.xy).rgb, vec3(2.2)));
-#else
-  return ToLinear(brightBoost * texture(source[1],pos.xy).rgb);
-#endif
-}
-  
-// Distance in emulated pixels to nearest texel.
-vec2 Dist(vec2 pos)
-{
-    pos = pos*sourceSize[0].xy;
-    
-    return -((pos - floor(pos)) - vec2(0.5));
-}
-    
-// 1D Gaussian.
-float Gaus(float pos, float scale)
-{
-    return exp2(scale*pow(abs(pos), shape));
-}
-
-// 3-tap Gaussian filter along horz line.
-vec3 Horz3(vec2 pos, float off)
-{
-    vec3 b    = Fetch(pos, vec2(-1.0, off));
-    vec3 c    = Fetch(pos, vec2( 0.0, off));
-    vec3 d    = Fetch(pos, vec2( 1.0, off));
-    float dst = Dist(pos).x;
-
-    // Convert distance to weight.
-    float scale = hardPix;
-    float wb = Gaus(dst-1.0,scale);
-    float wc = Gaus(dst+0.0,scale);
-    float wd = Gaus(dst+1.0,scale);
-
-    // Return filtered sample.
-    return (b*wb+c*wc+d*wd)/(wb+wc+wd);
-}
-
-// 5-tap Gaussian filter along horz line.
-vec3 Horz5(vec2 pos,float off){
-    vec3 a = Fetch(pos,vec2(-2.0, off));
-    vec3 b = Fetch(pos,vec2(-1.0, off));
-    vec3 c = Fetch(pos,vec2( 0.0, off));
-    vec3 d = Fetch(pos,vec2( 1.0, off));
-    vec3 e = Fetch(pos,vec2( 2.0, off));
-    
-    float dst = Dist(pos).x;
-    // Convert distance to weight.
-    float scale = hardPix;
-    float wa = Gaus(dst - 2.0, scale);
-    float wb = Gaus(dst - 1.0, scale);
-    float wc = Gaus(dst + 0.0, scale);
-    float wd = Gaus(dst + 1.0, scale);
-    float we = Gaus(dst + 2.0, scale);
-    
-    // Return filtered sample.
-    return (a*wa+b*wb+c*wc+d*wd+e*we)/(wa+wb+wc+wd+we);
-}
-  
-// 7-tap Gaussian filter along horz line.
-vec3 Horz7(vec2 pos,float off)
-{
-    vec3 a = Fetch(pos, vec2(-3.0, off));
-    vec3 b = Fetch(pos, vec2(-2.0, off));
-    vec3 c = Fetch(pos, vec2(-1.0, off));
-    vec3 d = Fetch(pos, vec2( 0.0, off));
-    vec3 e = Fetch(pos, vec2( 1.0, off));
-    vec3 f = Fetch(pos, vec2( 2.0, off));
-    vec3 g = Fetch(pos, vec2( 3.0, off));
-
-    float dst = Dist(pos).x;
-    // Convert distance to weight.
-    float scale = hardBloomPix;
-    float wa = Gaus(dst - 3.0, scale);
-    float wb = Gaus(dst - 2.0, scale);
-    float wc = Gaus(dst - 1.0, scale);
-    float wd = Gaus(dst + 0.0, scale);
-    float we = Gaus(dst + 1.0, scale);
-    float wf = Gaus(dst + 2.0, scale);
-    float wg = Gaus(dst + 3.0, scale);
-
-    // Return filtered sample.
-    return (a*wa+b*wb+c*wc+d*wd+e*we+f*wf+g*wg)/(wa+wb+wc+wd+we+wf+wg);
-}
-  
-// Return scanline weight.
-float Scan(vec2 pos, float off)
-{
-    float dst = Dist(pos).y;
-
-    return Gaus(dst + off, hardScan);
-}
-  
-// Return scanline weight for bloom.
-float BloomScan(vec2 pos, float off)
-{
-    float dst = Dist(pos).y;
-    
-    return Gaus(dst + off, hardBloomScan);
-}
-
-// Allow nearest three lines to effect pixel.
-vec3 Tri(vec2 pos)
-{
-    vec3 a = Horz3(pos,-1.0);
-    vec3 b = Horz5(pos, 0.0);
-    vec3 c = Horz3(pos, 1.0);
-    
-    float wa = Scan(pos,-1.0); 
-    float wb = Scan(pos, 0.0);
-    float wc = Scan(pos, 1.0);
-    
-    return a*wa + b*wb + c*wc;
-}
-  
-// Small bloom.
-vec3 Bloom(vec2 pos)
-{
-    vec3 a = Horz5(pos,-2.0);
-    vec3 b = Horz7(pos,-1.0);
-    vec3 c = Horz7(pos, 0.0);
-    vec3 d = Horz7(pos, 1.0);
-    vec3 e = Horz5(pos, 2.0);
-
-    float wa = BloomScan(pos,-2.0);
-    float wb = BloomScan(pos,-1.0); 
-    float wc = BloomScan(pos, 0.0);
-    float wd = BloomScan(pos, 1.0);
-    float we = BloomScan(pos, 2.0);
-
-    return a*wa+b*wb+c*wc+d*wd+e*we;
-}
-  
-// Distortion of scanlines, and end of screen alpha.
-vec2 Warp(vec2 pos)
-{
-    pos  = pos*2.0-1.0;    
-    pos *= vec2(1.0 + (pos.y*pos.y)*warpX, 1.0 + (pos.x*pos.x)*warpY);
-    
-    return pos*0.5 + 0.5;
-}
-  
-// Shadow mask.
-vec3 Mask(vec2 pos)
-{
-    vec3 mask = vec3(maskDark, maskDark, maskDark);
-  
-    // Very compressed TV style shadow mask.
-    if (shadowMask == 1.0) 
-    {
-        float line = maskLight;
-        float odd = 0.0;
-        
-        if (fract(pos.x*0.166666666) < 0.5) odd = 1.0;
-        if (fract((pos.y + odd) * 0.5) < 0.5) line = maskDark;  
-        
-        pos.x = fract(pos.x*0.333333333);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-        mask*=line;  
-    } 
-
-    // Aperture-grille.
-    else if (shadowMask == 2.0) 
-    {
-        pos.x = fract(pos.x*0.333333333);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    } 
-
-    // Stretched VGA style shadow mask (same as prior shaders).
-    else if (shadowMask == 3.0) 
-    {
-        pos.x += pos.y*3.0;
-        pos.x  = fract(pos.x*0.166666666);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    }
-
-    // VGA style shadow mask.
-    else if (shadowMask == 4.0) 
-    {
-        pos.xy  = floor(pos.xy*vec2(1.0, 0.5));
-        pos.x  += pos.y*3.0;
-        pos.x   = fract(pos.x*0.166666666);
-
-        if      (pos.x < 0.333) mask.r = maskLight;
-        else if (pos.x < 0.666) mask.g = maskLight;
-        else                    mask.b = maskLight;
-    }
-
-    return mask;
-}
-
-void main() {
-    vec2 pos = Warp(vTexCoord);
-    vec3 outColor = Tri(pos).rgb;
-
-    if (shadowMask > 0.0)
-        outColor.rgb *= Mask(vTexCoord.xy * outputSize.xy * 1.000001);
-#ifdef DO_BLOOM
-    //Add Bloom
-    outColor.rgb += mix( vec3(0.0), texture(source[0], pos).rgb, bloomAmount);
-#endif
-
-   FragColor = vec4(ToSrgb(outColor.rgb), 1.0);
-}
@@ -1,15 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -0,0 +1,145 @@
+//
+// PUBLIC DOMAIN CRT STYLED SCAN-LINE SHADER
+//
+//   by Timothy Lottes
+//
+// This is more along the style of a really good CGA arcade monitor.
+// With RGB inputs instead of NTSC.
+// The shadow mask example has the mask rotated 90 degrees for less chromatic aberration.
+//
+// Left it unoptimized to show the theory behind the algorithm.
+//
+// It is an example what I personally would want as a display option for pixel art games.
+// Please take and use, change, or whatever.
+//
+
+#version 150
+
+uniform sampler2D source[];
+uniform vec4 sourceSize[];
+uniform int phase;
+
+in Vertex {
+  vec2 texCoord;
+};
+
+out vec4 fragColor;
+
+// Emulated input resolution.
+  vec2 res=sourceSize[0].xy;
+
+// Hardness of scanline.
+//  -8.0 = soft
+// -16.0 = medium
+float hardScan=-8.0;
+
+// Hardness of pixels in scanline.
+// -2.0 = soft
+// -4.0 = hard
+float hardPix=-3.0;
+
+// Display warp.
+// 0.0 = none
+// 1.0/8.0 = extreme
+vec2 warp=vec2(1.0/32.0,1.0/24.0); 
+
+// Amount of shadow mask.
+float maskDark=0.5;
+float maskLight=1.5;
+
+//------------------------------------------------------------------------
+
+// sRGB to Linear.
+// Assuing using sRGB typed textures this should not be needed.
+float ToLinear1(float c){return(c<=0.04045)?c/12.92:pow((c+0.055)/1.055,2.4);}
+vec3 ToLinear(vec3 c){return vec3(ToLinear1(c.r),ToLinear1(c.g),ToLinear1(c.b));}
+
+// Linear to sRGB.
+// Assuing using sRGB typed textures this should not be needed.
+float ToSrgb1(float c){return(c<0.0031308?c*12.92:1.055*pow(c,0.41666)-0.055);}
+vec3 ToSrgb(vec3 c){return vec3(ToSrgb1(c.r),ToSrgb1(c.g),ToSrgb1(c.b));}
+
+// Nearest emulated sample given floating point position and texel offset.
+// Also zero's off screen.
+vec3 Fetch(vec2 pos,vec2 off){
+  pos=(floor(pos*res+off)+vec2(0.5,0.5))/res;
+  return ToLinear(1.2 * texture(source[0],pos.xy,-16.0).rgb);}
+
+// Distance in emulated pixels to nearest texel.
+vec2 Dist(vec2 pos){pos=pos*res;return -((pos-floor(pos))-vec2(0.5));}
+    
+// 1D Gaussian.
+float Gaus(float pos,float scale){return exp2(scale*pos*pos);}
+
+// 3-tap Gaussian filter along horz line.
+vec3 Horz3(vec2 pos,float off){
+  vec3 b=Fetch(pos,vec2(-1.0,off));
+  vec3 c=Fetch(pos,vec2( 0.0,off));
+  vec3 d=Fetch(pos,vec2( 1.0,off));
+  float dst=Dist(pos).x;
+  // Convert distance to weight.
+  float scale=hardPix;
+  float wb=Gaus(dst-1.0,scale);
+  float wc=Gaus(dst+0.0,scale);
+  float wd=Gaus(dst+1.0,scale);
+  // Return filtered sample.
+  return (b*wb+c*wc+d*wd)/(wb+wc+wd);}
+
+// 5-tap Gaussian filter along horz line.
+vec3 Horz5(vec2 pos,float off){
+  vec3 a=Fetch(pos,vec2(-2.0,off));
+  vec3 b=Fetch(pos,vec2(-1.0,off));
+  vec3 c=Fetch(pos,vec2( 0.0,off));
+  vec3 d=Fetch(pos,vec2( 1.0,off));
+  vec3 e=Fetch(pos,vec2( 2.0,off));
+  float dst=Dist(pos).x;
+  // Convert distance to weight.
+  float scale=hardPix;
+  float wa=Gaus(dst-2.0,scale);
+  float wb=Gaus(dst-1.0,scale);
+  float wc=Gaus(dst+0.0,scale);
+  float wd=Gaus(dst+1.0,scale);
+  float we=Gaus(dst+2.0,scale);
+  // Return filtered sample.
+  return (a*wa+b*wb+c*wc+d*wd+e*we)/(wa+wb+wc+wd+we);}
+
+// Return scanline weight.
+float Scan(vec2 pos,float off){
+  float dst=Dist(pos).y;
+  return Gaus(dst+off,hardScan);}
+
+// Allow nearest three lines to effect pixel.
+vec3 Tri(vec2 pos){
+  vec3 a=Horz3(pos,-1.0);
+  vec3 b=Horz5(pos, 0.0);
+  vec3 c=Horz3(pos, 1.0);
+  float wa=Scan(pos,-1.0);
+  float wb=Scan(pos, 0.0);
+  float wc=Scan(pos, 1.0);
+  return a*wa+b*wb+c*wc;}
+
+// Distortion of scanlines, and end of screen alpha.
+vec2 Warp(vec2 pos){
+  pos=pos*2.0-1.0;    
+  pos*=vec2(1.0+(pos.y*pos.y)*warp.x,1.0+(pos.x*pos.x)*warp.y);
+  return pos*0.5+0.5;}
+
+// Shadow mask.
+vec3 Mask(vec2 pos){
+  pos.x+=pos.y*3.0;
+  vec3 mask=vec3(maskDark,maskDark,maskDark);
+  pos.x=fract(pos.x/6.0);
+  if(pos.x<0.333)mask.r=maskLight;
+  else if(pos.x<0.666)mask.g=maskLight;
+  else mask.b=maskLight;
+  return mask;}    
+
+void main() {
+    vec2 pos = texCoord.xy * 1.0001;
+      hardScan=-12.0;
+//      maskDark=maskLight;
+      pos=Warp(pos.xy);
+    fragColor.rgb=Tri(pos)*Mask(gl_FragCoord.xy);    
+  fragColor.a=1.0;
+  fragColor = vec4(ToSrgb(fragColor.rgb), fragColor.a);
+}
@@ -0,0 +1,609 @@
+#version 150
+
+//_____________________________/\_______________________________
+//==============================================================
+//
+//
+//      [CRTS] PUBLIC DOMAIN CRT-STYLED SCALAR - 20180120b
+//
+//                      by Timothy Lottes
+//             https://www.shadertoy.com/view/MtSfRK
+//              adapted for quark syntax by hunterk
+//
+//
+//==============================================================
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+//_____________________________/\_______________________________
+//==============================================================
+//
+//                         WHAT'S NEW
+//
+//--------------------------------------------------------------
+// Evolution of prior shadertoy example
+//--------------------------------------------------------------
+// This one is semi-optimized
+//  - Less texture fetches
+//  - Didn't get to instruction level optimization
+//  - Could likely use texture fetch to generate phosphor mask
+//--------------------------------------------------------------
+// Added options to disable unused features
+//--------------------------------------------------------------
+// Added in exposure matching
+//  - Given scan-line effect and mask always darkens image
+//  - Uses generalized tonemapper to boost mid-level
+//  - Note this can compress highlights
+//  - And won't get back peak brightness
+//  - But best option if one doesn't want as much darkening
+//--------------------------------------------------------------
+// Includes option saturation and contrast controls
+//--------------------------------------------------------------
+// Added in subtractive aperture grille
+//  - This is a bit brighter than prior
+//--------------------------------------------------------------
+// Make sure input to this filter is already low-resolution
+//  - This is not designed to work on titles doing the following
+//     - Rendering to hi-res with nearest sampling
+//--------------------------------------------------------------
+// Added a fast and more pixely option for 2 tap/pixel
+//--------------------------------------------------------------
+// Improved the vignette when WARP is enabled
+//--------------------------------------------------------------
+// Didn't test HLSL or CPU options
+//  - Will incorportate patches if they are broken
+//  - But out of time to try them myself
+//==============================================================
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+//_____________________________/\_______________________________
+//==============================================================
+//
+//          LICENSE = UNLICENSE (aka PUBLIC DOMAIN)
+//
+//--------------------------------------------------------------
+// This is free and unencumbered software released into the 
+// public domain.
+//--------------------------------------------------------------
+// Anyone is free to copy, modify, publish, use, compile, sell, 
+// or distribute this software, either in source code form or as
+// a compiled binary, for any purpose, commercial or 
+// non-commercial, and by any means.
+//--------------------------------------------------------------
+// In jurisdictions that recognize copyright laws, the author or
+// authors of this software dedicate any and all copyright 
+// interest in the software to the public domain. We make this
+// dedication for the benefit of the public at large and to the
+// detriment of our heirs and successors. We intend this 
+// dedication to be an overt act of relinquishment in perpetuity
+// of all present and future rights to this software under 
+// copyright law.
+//--------------------------------------------------------------
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+// KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE 
+// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
+// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+// DEALINGS IN THE SOFTWARE.
+//--------------------------------------------------------------
+// For more information, please refer to 
+// <http://unlicense.org/>
+//==============================================================
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+
+#define MASK 1.0
+#define MASK_INTENSITY 0.5
+#define SCANLINE_THINNESS 0.5
+#define SCAN_BLUR 2.5
+#define CURVATURE 0.02
+#define TRINITRON_CURVE 0.0
+#define CORNER 3.0
+#define CRT_GAMMA 2.4
+
+uniform sampler2D source[];
+uniform vec4 sourceSize[];
+uniform vec4 outputSize;
+
+in Vertex {
+   vec2 vTexCoord;
+};
+
+out vec4 FragColor;
+
+//_____________________________/\_______________________________
+//==============================================================
+//
+//                       GAMMA FUNCTIONS
+//
+//--------------------------------------------------------------
+//--------------------------------------------------------------
+// Since shadertoy doesn't have sRGB textures
+// And we need linear input into shader
+// Don't do this in your code
+	float FromSrgb1(float c){
+		return (c<=0.04045)?c*(1.0/12.92):
+			pow(c*(1.0/1.055)+(0.055/1.055),CRT_GAMMA);}
+//--------------------------------------------------------------
+vec3 FromSrgb(vec3 c){return vec3(
+ FromSrgb1(c.r),FromSrgb1(c.g),FromSrgb1(c.b));}
+ 
+// Convert from linear to sRGB
+// Since shader toy output is not linear
+float ToSrgb1(float c){
+ return(c<0.0031308?c*12.92:1.055*pow(c,0.41666)-0.055);}
+//--------------------------------------------------------------
+vec3 ToSrgb(vec3 c){return vec3(
+ ToSrgb1(c.r),ToSrgb1(c.g),ToSrgb1(c.b));}
+//--------------------------------------------------------------
+
+//_____________________________/\_______________________________
+//==============================================================
+//
+//                           DEFINES
+//
+//--------------------------------------------------------------
+// CRTS_CPU - CPU code
+// CRTS_GPU - GPU code
+//--------------------------------------------------------------
+// CRTS_GLSL - GLSL
+// CRTS_HLSL - HLSL (not tested yet)
+//--------------------------------------------------------------
+// CRTS_DEBUG - Define to see on/off split screen
+//--------------------------------------------------------------
+// CRTS_WARP - Apply screen warp
+//--------------------------------------------------------------
+// CRTS_2_TAP - Faster very pixely 2-tap filter (off is 8)
+//--------------------------------------------------------------
+// CRTS_MASK_GRILLE      - Aperture grille (aka Trinitron)
+// CRTS_MASK_GRILLE_LITE - Brighter (subtractive channels)
+// CRTS_MASK_NONE        - No mask
+// CRTS_MASK_SHADOW      - Horizontally stretched shadow mask
+//--------------------------------------------------------------
+// CRTS_TONE       - Normalize mid-level and process color
+// CRTS_CONTRAST   - Process color - enable contrast control
+// CRTS_SATURATION - Process color - enable saturation control
+//--------------------------------------------------------------
+#define CRTS_STATIC
+#define CrtsPow
+#define CRTS_RESTRICT
+//==============================================================
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+
+//==============================================================
+//                      SETUP FOR CRTS
+//--------------------------------------------------------------
+//==============================================================
+//#define CRTS_DEBUG 1
+#define CRTS_GPU 1
+#define CRTS_GLSL 1
+//--------------------------------------------------------------
+//#define CRTS_2_TAP 1
+//--------------------------------------------------------------
+#define CRTS_TONE 1
+#define CRTS_CONTRAST 0
+#define CRTS_SATURATION 0
+//--------------------------------------------------------------
+#define CRTS_WARP 1
+//--------------------------------------------------------------
+// Try different masks -> moved to runtime parameters
+//#define CRTS_MASK_GRILLE 1
+//#define CRTS_MASK_GRILLE_LITE 1
+//#define CRTS_MASK_NONE 1
+//#define CRTS_MASK_SHADOW 1
+//--------------------------------------------------------------
+// Scanline thinness
+//  0.50 = fused scanlines
+//  0.70 = recommended default
+//  1.00 = thinner scanlines (too thin)
+#define INPUT_THIN (0.5 + (0.5 * SCANLINE_THINNESS))
+//--------------------------------------------------------------
+// Horizonal scan blur
+//  -3.0 = pixely
+//  -2.5 = default
+//  -2.0 = smooth
+//  -1.0 = too blurry
+#define INPUT_BLUR (-1.0 * SCAN_BLUR)
+//--------------------------------------------------------------
+// Shadow mask effect, ranges from,
+//  0.25 = large amount of mask (not recommended, too dark)
+//  0.50 = recommended default
+//  1.00 = no shadow mask
+#define INPUT_MASK (1.0 - MASK_INTENSITY)
+//--------------------------------------------------------------
+#define INPUT_X sourceSize[0].x
+#define INPUT_Y sourceSize[0].y
+//--------------------------------------------------------------
+// Setup the function which returns input image color
+vec3 CrtsFetch(vec2 uv){
+ // For shadertoy, scale to get native texels in the image
+ uv*=vec2(INPUT_X,INPUT_Y)/sourceSize[0].xy;
+ // Move towards intersting parts
+// uv+=vec2(0.5,0.5);
+ // Non-shadertoy case would not have the color conversion
+ return FromSrgb(texture(source[0],uv.xy,-16.0).rgb);}
+ 
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+//_____________________________/\_______________________________
+//==============================================================
+//
+//                          GPU CODE
+//
+//==============================================================
+#ifdef CRTS_GPU
+//_____________________________/\_______________________________
+//==============================================================
+//                         PORTABILITY
+//==============================================================
+ #ifdef CRTS_GLSL
+  #define CrtsF1 float
+  #define CrtsF2 vec2
+  #define CrtsF3 vec3
+  #define CrtsF4 vec4
+  #define CrtsFractF1 fract
+  #define CrtsRcpF1(x) (1.0/(x))
+  #define CrtsSatF1(x) clamp((x),0.0,1.0)
+//--------------------------------------------------------------
+  CrtsF1 CrtsMax3F1(CrtsF1 a,CrtsF1 b,CrtsF1 c){
+   return max(a,max(b,c));}
+ #endif
+//==============================================================
+ #ifdef CRTS_HLSL
+  #define CrtsF1 float
+  #define CrtsF2 float2
+  #define CrtsF3 float3
+  #define CrtsF4 float4
+  #define CrtsFractF1 frac
+  #define CrtsRcpF1(x) (1.0/(x))
+  #define CrtsSatF1(x) saturate(x)
+//--------------------------------------------------------------
+  CrtsF1 CrtsMax3F1(CrtsF1 a,CrtsF1 b,CrtsF1 c){
+   return max(a,max(b,c));}
+ #endif
+//_____________________________/\_______________________________
+//==============================================================
+//              TONAL CONTROL CONSTANT GENERATION
+//--------------------------------------------------------------
+// This is in here for rapid prototyping
+// Please use the CPU code and pass in as constants
+//==============================================================
+ CrtsF4 CrtsTone(
+ CrtsF1 contrast,
+ CrtsF1 saturation,
+ CrtsF1 thin,
+ CrtsF1 mask){
+//--------------------------------------------------------------
+  if(MASK == 0.0) mask=1.0;
+//--------------------------------------------------------------
+  if(MASK == 1.0){
+   // Normal R mask is {1.0,mask,mask}
+   // LITE   R mask is {mask,1.0,1.0}
+   mask=0.5+mask*0.5;
+   }
+//--------------------------------------------------------------
+  CrtsF4 ret;
+  CrtsF1 midOut=0.18/((1.5-thin)*(0.5*mask+0.5));
+  CrtsF1 pMidIn=pow(0.18,contrast);
+  ret.x=contrast;
+  ret.y=((-pMidIn)+midOut)/((1.0-pMidIn)*midOut);
+  ret.z=((-pMidIn)*midOut+pMidIn)/(midOut*(-pMidIn)+midOut);
+  ret.w=contrast+saturation;
+  return ret;}
+//_____________________________/\_______________________________
+//==============================================================
+//                            MASK
+//--------------------------------------------------------------
+// Letting LCD/OLED pixel elements function like CRT phosphors
+// So "phosphor" resolution scales with display resolution
+//--------------------------------------------------------------
+// Not applying any warp to the mask (want high frequency)
+// Real aperture grille has a mask which gets wider on ends
+// Not attempting to be "real" but instead look the best
+//--------------------------------------------------------------
+// Shadow mask is stretched horizontally
+//  RRGGBB
+//  GBBRRG
+//  RRGGBB
+// This tends to look better on LCDs than vertical
+// Also 2 pixel width is required to get triad centered
+//--------------------------------------------------------------
+// The LITE version of the Aperture Grille is brighter
+// Uses {dark,1.0,1.0} for R channel
+// Non LITE version uses {1.0,dark,dark}
+//--------------------------------------------------------------
+// 'pos' - This is 'fragCoord.xy'
+//         Pixel {0,0} should be {0.5,0.5}
+//         Pixel {1,1} should be {1.5,1.5} 
+//--------------------------------------------------------------
+// 'dark' - Exposure of of masked channel
+//          0.0=fully off, 1.0=no effect
+//==============================================================
+ CrtsF3 CrtsMask(CrtsF2 pos,CrtsF1 dark){
+  if(MASK == 2.0){
+   CrtsF3 m=CrtsF3(dark,dark,dark);
+   CrtsF1 x=CrtsFractF1(pos.x*(1.0/3.0));
+   if(x<(1.0/3.0))m.r=1.0;
+   else if(x<(2.0/3.0))m.g=1.0;
+   else m.b=1.0;
+   return m;
+  }
+//--------------------------------------------------------------
+  if(MASK == 1.0){
+   CrtsF3 m=CrtsF3(1.0,1.0,1.0);
+   CrtsF1 x=CrtsFractF1(pos.x*(1.0/3.0));
+   if(x<(1.0/3.0))m.r=dark;
+   else if(x<(2.0/3.0))m.g=dark;
+   else m.b=dark;
+   return m;
+  }
+//--------------------------------------------------------------
+  if(MASK == 0.0){
+   return CrtsF3(1.0,1.0,1.0);
+  }
+//--------------------------------------------------------------
+  if(MASK == 3.0){
+   pos.x+=pos.y*2.9999;
+   CrtsF3 m=CrtsF3(dark,dark,dark);
+   CrtsF1 x=CrtsFractF1(pos.x*(1.0/6.0));
+   if(x<(1.0/3.0))m.r=1.0;
+   else if(x<(2.0/3.0))m.g=1.0;
+   else m.b=1.0;
+   return m;
+  }
+ }
+//_____________________________/\_______________________________
+//==============================================================
+//                        FILTER ENTRY
+//--------------------------------------------------------------
+// Input must be linear
+// Output color is linear
+//--------------------------------------------------------------
+// Must have fetch function setup: CrtsF3 CrtsFetch(CrtsF2 uv)
+//  - The 'uv' range is {0.0 to 1.0} for input texture
+//  - Output of this must be linear color
+//--------------------------------------------------------------
+// SCANLINE MATH & AUTO-EXPOSURE NOTES
+// ===================================
+// Each output line has contribution from at most 2 scanlines
+// Scanlines are shaped by a windowed cosine function
+// This shape blends together well with only 2 lines of overlap
+//--------------------------------------------------------------
+// Base scanline intensity is as follows
+// which leaves output intensity range from {0 to 1.0}
+// --------
+// thin := range {thick 0.5 to thin 1.0}
+// off  := range {0.0 to <1.0}, 
+//         sub-pixel offset between two scanlines
+//  --------
+//  a0=cos(min(0.5,     off *thin)*2pi)*0.5+0.5;
+//  a1=cos(min(0.5,(1.0-off)*thin)*2pi)*0.5+0.5;
+//--------------------------------------------------------------
+// This leads to a image darkening factor of roughly: 
+//  {(1.5-thin)/1.0}
+// This is further reduced by the mask: 
+//  {1.0/2.0+mask*1.0/2.0}
+// Reciprocal of combined effect is used for auto-exposure
+//  to scale up the mid-level in the tonemapper
+//==============================================================
+ CrtsF3 CrtsFilter(
+//--------------------------------------------------------------
+  // SV_POSITION, fragCoord.xy
+  CrtsF2 ipos,
+//--------------------------------------------------------------
+  // inputSize / outputSize (in pixels)
+  CrtsF2 inputSizeDivOutputSize,     
+//--------------------------------------------------------------
+  // 0.5 * inputSize (in pixels)
+  CrtsF2 halfInputSize,
+//--------------------------------------------------------------
+  // 1.0 / inputSize (in pixels)
+  CrtsF2 rcpInputSize,
+//--------------------------------------------------------------
+  // 1.0 / outputSize (in pixels)
+  CrtsF2 rcpOutputSize,
+//--------------------------------------------------------------
+  // 2.0 / outputSize (in pixels)
+  CrtsF2 twoDivOutputSize,   
+//--------------------------------------------------------------
+  // inputSize.y
+  CrtsF1 inputHeight,
+//--------------------------------------------------------------
+  // Warp scanlines but not phosphor mask
+  //  0.0 = no warp
+  //  1.0/64.0 = light warping
+  //  1.0/32.0 = more warping
+  // Want x and y warping to be different (based on aspect)
+  CrtsF2 warp,
+//--------------------------------------------------------------
+  // Scanline thinness
+  //  0.50 = fused scanlines
+  //  0.70 = recommended default
+  //  1.00 = thinner scanlines (too thin)
+  // Shared with CrtsTone() function
+  CrtsF1 thin,
+//--------------------------------------------------------------
+  // Horizonal scan blur
+  //  -3.0 = pixely
+  //  -2.5 = default
+  //  -2.0 = smooth
+  //  -1.0 = too blurry
+  CrtsF1 blur,
+//--------------------------------------------------------------
+  // Shadow mask effect, ranges from,
+  //  0.25 = large amount of mask (not recommended, too dark)
+  //  0.50 = recommended default
+  //  1.00 = no shadow mask
+  // Shared with CrtsTone() function
+  CrtsF1 mask,
+//--------------------------------------------------------------
+  // Tonal curve parameters generated by CrtsTone()
+  CrtsF4 tone
+//--------------------------------------------------------------
+ ){
+//--------------------------------------------------------------
+  #ifdef CRTS_DEBUG
+   CrtsF2 uv=ipos*rcpOutputSize;
+   // Show second half processed, and first half un-processed
+   if(uv.x<0.5){
+    // Force nearest to get squares
+    uv*=1.0/rcpInputSize;
+    uv=floor(uv)+CrtsF2(0.5,0.5);
+    uv*=rcpInputSize;
+    CrtsF3 color=CrtsFetch(uv);
+    return color;}
+  #endif
+//--------------------------------------------------------------
+  // Optional apply warp
+  CrtsF2 pos;
+  #ifdef CRTS_WARP
+   // Convert to {-1 to 1} range
+   pos=ipos*twoDivOutputSize-CrtsF2(1.0,1.0);
+   // Distort pushes image outside {-1 to 1} range
+   pos*=CrtsF2(
+    1.0+(pos.y*pos.y)*warp.x,
+    1.0+(pos.x*pos.x)*warp.y);
+   // TODO: Vignette needs optimization
+   CrtsF1 vin=(1.0-(
+    (1.0-CrtsSatF1(pos.x*pos.x))*(1.0-CrtsSatF1(pos.y*pos.y)))) * (0.998 + (0.001 * CORNER));
+   vin=CrtsSatF1((-vin)*inputHeight+inputHeight);
+   // Leave in {0 to inputSize}
+   pos=pos*halfInputSize+halfInputSize;     
+  #else
+   pos=ipos*inputSizeDivOutputSize;
+  #endif
+//--------------------------------------------------------------
+  // Snap to center of first scanline
+  CrtsF1 y0=floor(pos.y-0.5)+0.5;
+  #ifdef CRTS_2_TAP
+   // Using Inigo's "Improved Texture Interpolation"
+   // http://iquilezles.org/www/articles/texture/texture.htm
+   pos.x+=0.5;
+   CrtsF1 xi=floor(pos.x);
+   CrtsF1 xf=pos.x-xi;
+   xf=xf*xf*xf*(xf*(xf*6.0-15.0)+10.0);  
+   CrtsF1 x0=xi+xf-0.5;
+   CrtsF2 p=CrtsF2(x0*rcpInputSize.x,y0*rcpInputSize.y);     
+   // Coordinate adjusted bilinear fetch from 2 nearest scanlines
+   CrtsF3 colA=CrtsFetch(p);
+   p.y+=rcpInputSize.y;
+   CrtsF3 colB=CrtsFetch(p);
+  #else
+   // Snap to center of one of four pixels
+   CrtsF1 x0=floor(pos.x-1.5)+0.5;
+   // Inital UV position
+   CrtsF2 p=CrtsF2(x0*rcpInputSize.x,y0*rcpInputSize.y);     
+   // Fetch 4 nearest texels from 2 nearest scanlines
+   CrtsF3 colA0=CrtsFetch(p);
+   p.x+=rcpInputSize.x;
+   CrtsF3 colA1=CrtsFetch(p);
+   p.x+=rcpInputSize.x;
+   CrtsF3 colA2=CrtsFetch(p);
+   p.x+=rcpInputSize.x;
+   CrtsF3 colA3=CrtsFetch(p);
+   p.y+=rcpInputSize.y;
+   CrtsF3 colB3=CrtsFetch(p);
+   p.x-=rcpInputSize.x;
+   CrtsF3 colB2=CrtsFetch(p);
+   p.x-=rcpInputSize.x;
+   CrtsF3 colB1=CrtsFetch(p);
+   p.x-=rcpInputSize.x;
+   CrtsF3 colB0=CrtsFetch(p);
+  #endif
+//--------------------------------------------------------------
+  // Vertical filter
+  // Scanline intensity is using sine wave
+  // Easy filter window and integral used later in exposure
+  CrtsF1 off=pos.y-y0;
+  CrtsF1 pi2=6.28318530717958;
+  CrtsF1 hlf=0.5;
+  CrtsF1 scanA=cos(min(0.5,  off *thin     )*pi2)*hlf+hlf;
+  CrtsF1 scanB=cos(min(0.5,(-off)*thin+thin)*pi2)*hlf+hlf;
+//--------------------------------------------------------------
+  #ifdef CRTS_2_TAP
+   #ifdef CRTS_WARP
+    // Get rid of wrong pixels on edge
+    scanA*=vin;
+    scanB*=vin;
+   #endif
+   // Apply vertical filter
+   CrtsF3 color=(colA*scanA)+(colB*scanB);
+  #else
+   // Horizontal kernel is simple gaussian filter
+   CrtsF1 off0=pos.x-x0;
+   CrtsF1 off1=off0-1.0;
+   CrtsF1 off2=off0-2.0;
+   CrtsF1 off3=off0-3.0;
+   CrtsF1 pix0=exp2(blur*off0*off0);
+   CrtsF1 pix1=exp2(blur*off1*off1);
+   CrtsF1 pix2=exp2(blur*off2*off2);
+   CrtsF1 pix3=exp2(blur*off3*off3);
+   CrtsF1 pixT=CrtsRcpF1(pix0+pix1+pix2+pix3);
+   #ifdef CRTS_WARP
+    // Get rid of wrong pixels on edge
+    pixT*=vin;
+   #endif
+   scanA*=pixT;
+   scanB*=pixT;
+   // Apply horizontal and vertical filters
+   CrtsF3 color=
+    (colA0*pix0+colA1*pix1+colA2*pix2+colA3*pix3)*scanA +
+    (colB0*pix0+colB1*pix1+colB2*pix2+colB3*pix3)*scanB;
+  #endif
+//--------------------------------------------------------------
+  // Apply phosphor mask          
+  color*=CrtsMask(ipos,mask);
+//--------------------------------------------------------------
+  // Optional color processing
+  #ifdef CRTS_TONE
+   // Tonal control, start by protecting from /0
+   CrtsF1 peak=max(1.0/(256.0*65536.0),
+    CrtsMax3F1(color.r,color.g,color.b));
+   // Compute the ratios of {R,G,B}
+   CrtsF3 ratio=color*CrtsRcpF1(peak);
+   // Apply tonal curve to peak value
+   #ifdef CRTS_CONTRAST
+    peak=pow(peak,tone.x);
+   #endif
+   peak=peak*CrtsRcpF1(peak*tone.y+tone.z);
+   // Apply saturation
+   #ifdef CRTS_SATURATION
+    ratio=pow(ratio,CrtsF3(tone.w,tone.w,tone.w));
+   #endif
+   // Reconstruct color
+   return ratio*peak;
+ #else
+  return color;
+ #endif
+//--------------------------------------------------------------
+ }
+#endif
+
+void main() {
+   vec2 warp_factor;
+   warp_factor.x = CURVATURE;
+   warp_factor.y = (3.0 / 4.0) * warp_factor.x; // assume 4:3 aspect
+   warp_factor.x *= (1.0 - TRINITRON_CURVE);
+   FragColor.rgb = CrtsFilter(vTexCoord.xy * outputSize.xy,
+   sourceSize[0].xy * outputSize.zw,
+   sourceSize[0].xy * vec2(0.5,0.5),
+   sourceSize[0].zw,
+   outputSize.zw,
+   2.0 * outputSize.zw,
+   sourceSize[0].y,
+   warp_factor,
+   INPUT_THIN,
+   INPUT_BLUR,
+   INPUT_MASK,
+   CrtsTone(1.0,0.0,INPUT_THIN,INPUT_MASK));
+	
+   // Shadertoy outputs non-linear color
+   FragColor.rgb = ToSrgb(FragColor.rgb);
+}
@@ -0,0 +1,12 @@
+input
+  filter: nearest
+
+program
+  filter: nearest
+  vertex: lottes.vs
+  fragment: lottes.fs
+  
+output
+  height: 0
+  width: 0
+  filter: linear
@@ -1,214 +0,0 @@
-input
-  filter: nearest
-  
-// IMPORTANT:
-// Shader passes need to know details about the image in the mask_texture LUT
-// files, so set the following constants in user-preset-constants.h accordingly:
-// 1.) mask_triads_per_tile = (number of horizontal triads in mask texture LUT's)
-// 2.) mask_texture_small_size = (texture size of mask*texture_small LUT's)
-// 3.) mask_texture_large_size = (texture size of mask*texture_large LUT's)
-// 4.) mask_grille_avg_color = (avg. brightness of mask_grille_texture* LUT's, in [0, 1])
-// 5.) mask_slot_avg_color = (avg. brightness of mask_slot_texture* LUT's, in [0, 1])
-// 6.) mask_shadow_avg_color = (avg. brightness of mask_shadow_texture* LUT's, in [0, 1])
-// Shader passes also need to know certain scales set in this preset, but their
-// compilation model doesn't currently allow the preset file to tell them.  Make
-// sure to set the following constants in user-preset-constants.h accordingly too:
-// 1.) bloom_approx_scale_x = scale_x2
-// 2.) mask_resize_viewport_scale = vec2(scale_x6, scale_y5)
-// Finally, shader passes need to know the value of geom_max_aspect_ratio used to
-// calculate scale_y5 (among other values):
-// 1.) geom_max_aspect_ratio = (geom_max_aspect_ratio used to calculate scale_y5)
-
-// Pass0: Linearize the input based on CRT gamma and bob interlaced fields.
-// (Bobbing ensures we can immediately blur without getting artifacts.)
-program
-  filter: nearest
-  vertex: first-pass-linearize-crt-gamma-bob-fields.vs
-  fragment: first-pass-linearize-crt-gamma-bob-fields.fs
-  format: rgba16f
-  height: 100%
-  width: 100%
-
-// Pass1: Resample interlaced (and misconverged) scanlines vertically.
-// Separating vertical/horizontal scanline sampling is faster: It lets us
-// consider more scanlines while calculating weights for fewer pixels, and
-// it reduces our samples from vertical*horizontal to vertical+horizontal.
-// This has to come right after ORIG_LINEARIZED, because there's no
-// "original_source" scale_type we can use later.  
-program
-  filter: linear
-  vertex: scanlines-vertical-interlacing.vs
-  fragment: scanlines-vertical-interlacing.fs
-  height: 400%
-  width: 100%
-  format: rgba16f
-  
-// Pass2: Do a small resize blur of ORIG_LINEARIZED at an absolute size, and
-// account for convergence offsets.  We want to blur a predictable portion of the
-// screen to match the phosphor bloom, and absolute scale works best for
-// reliable results with a fixed-size bloom.  Picking a scale is tricky:
-// a.) 400x300 is a good compromise for the "fake-bloom" version: It's low enough
-//     to blur high-res/interlaced sources but high enough that resampling
-//     doesn't smear low-res sources too much.
-// b.) 320x240 works well for the "real bloom" version: It's 1-1.5% faster, and
-//     the only noticeable visual difference is a larger halation spread (which
-//     may be a good thing for people who like to crank it up).
-// Note the 4:3 aspect ratio assumes the input has cropped geom_overscan (so it's
-// *intended* for an ~4:3 aspect ratio).  
-program
-  filter: linear
-  vertex: bloom-approx.vs
-  fragment: bloom-approx.fs
-  format: rgba16f
-  width: 320 px
-  height: 240 px
-
-// Pass3: Vertically blur the input for halation and refractive diffusion.
-// Base this on BLOOM_APPROX: This blur should be small and fast, and blurring
-// a constant portion of the screen is probably physically correct if the
-// viewport resolution is proportional to the simulated CRT size.  
-program
-  filter: linear
-  vertex: blur9fast-vertical.vs
-  fragment: blur9fast-vertical.fs
-  format: rgba16f
-  height: 100%
-  width: 100%
-
-// Pass4: Horizontally blur the input for halation and refractive diffusion.
-// Note: Using a one-pass 9x9 blur is about 1% slower.  
-program
-  filter: linear
-  vertex: blur9fast-horizontal.vs
-  fragment: blur9fast-horizontal.fs
-  format: rgba16f
-  height: 100%
-  width: 100%
-
-// Pass5: Lanczos-resize the phosphor mask vertically.  Set the absolute
-// scale_x5 == mask_texture_small_size.x (see IMPORTANT above).  Larger scales
-// will blur, and smaller scales could get nasty.  The vertical size must be
-// based on the viewport size and calculated carefully to avoid artifacts later.
-// First calculate the minimum number of mask tiles we need to draw.
-// Since curvature is computed after the scanline masking pass:
-//   num_resized_mask_tiles = 2.0;
-// If curvature were computed in the scanline masking pass (it's not):
-//   max_mask_texel_border = ~3.0 * (1/3.0 + 4.0*sqrt(2.0) + 0.5 + 1.0);
-//   max_mask_tile_border = max_mask_texel_border/
-//       (min_resized_phosphor_triad_size * mask_triads_per_tile);
-//   num_resized_mask_tiles = max(2.0, 1.0 + max_mask_tile_border * 2.0);
-//   At typical values (triad_size >= 2.0, mask_triads_per_tile == 8):
-//       num_resized_mask_tiles = ~3.8
-// Triad sizes are given in horizontal terms, so we need geom_max_aspect_ratio
-// to relate them to vertical resolution.  The widest we expect is:
-//   geom_max_aspect_ratio = 4.0/3.0  // Note: Shader passes need to know this!
-// The fewer triads we tile across the screen, the larger each triad will be as a
-// fraction of the viewport size, and the larger scale_y5 must be to draw a full
-// num_resized_mask_tiles.  Therefore, we must decide the smallest number of
-// triads we'll guarantee can be displayed on screen.  We'll set this according
-// to 3-pixel triads at 768p resolution (the lowest anyone's likely to use):
-//   min_allowed_viewport_triads = 768.0*geom_max_aspect_ratio / 3.0 = 341.333333
-// Now calculate the viewport scale that ensures we can draw resized_mask_tiles:
-//   min_scale_x = resized_mask_tiles * mask_triads_per_tile /
-//       min_allowed_viewport_triads
-//   scale_y5 = geom_max_aspect_ratio * min_scale_x
-//   # Some code might depend on equal scales:
-//   scale_x6 = scale_y5
-// Given our default geom_max_aspect_ratio and min_allowed_viewport_triads:
-//   scale_y5 = 4.0/3.0 * 2.0/(341.33333 / 8.0) = 0.0625
-// IMPORTANT: The scales MUST be calculated in this way.  If you wish to change
-// geom_max_aspect_ratio, update that constant in user-preset-constants.h!
-program
-  filter: linear
-  format: rgba16f
-  width: 64 px
-  height: 6.25%
-  vertex: mask-resize-vertical.vs
-  fragment: mask-resize-vertical.fs
-  pixmap: textures/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearApertureGrille15Wide8And5d5Spacing.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearShadowMaskEDPResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearShadowMaskEDP.png
-    filter: linear
-    wrap: repeat
-
-// Pass6: Lanczos-resize the phosphor mask horizontally.  scale_x6 = scale_y5.
-// TODO: Check again if the shaders actually require equal scales.
-program
-  filter: nearest
-  vertex: mask-resize-horizontal.vs
-  fragment: mask-resize-horizontal.fs
-  format: rgba16f
-
-// Pass7: Resample (misconverged) scanlines horizontally, apply halation, and
-// apply the phosphor mask.
-program
-  filter: linear
-  format: rgba16f
-  height: 100%
-  width: 100%
-  vertex: scanlines-horizontal-apply-mask.vs
-  fragment: scanlines-horizontal-apply-mask.fs  
-  pixmap: textures/TileableLinearApertureGrille15Wide8And5d5SpacingResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearApertureGrille15Wide8And5d5Spacing.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacingResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearSlotMaskTall15Wide9And4d5Horizontal9d14VerticalSpacing.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearShadowMaskEDPResizeTo64.png
-    filter: linear
-    wrap: repeat
-  pixmap: textures/TileableLinearShadowMaskEDP.png
-    filter: linear
-    wrap: repeat
-
-// Pass 8: Compute a brightpass.  This will require reading the final mask.    
-program
-  filter: linear
-  format: rgba16f
-  vertex: brightpass.vs
-  fragment: brightpass.fs
-
-// Pass 9: Blur the brightpass vertically
-program
-  filter: linear
-  format: rgba16f
-  vertex: bloom-vertical.vs
-  fragment: bloom-vertical.fs
-  
-// Pass 10: Blur the brightpass horizontally and combine it with the dimpass:
-program
-  filter: linear
-  format: rgba16f
-  height: 100%
-  width: 100%
-  vertex: bloom-horizontal-reconstitute.vs
-  fragment: bloom-horizontal-reconstitute.fs
-  
-// Pass 11: Compute curvature/AA:
-program
-  filter: linear
-  format: rgba16f
-  vertex: geometry-aa-last-pass.vs
-  fragment: geometry-aa-last-pass.fs
-  
-output
-  filter: nearest
@@ -1,5 +1,5 @@
 #version 150
-#define distortion 0.08
+#define distortion 0.2

 uniform sampler2D source[];
 uniform vec4 sourceSize[];
@@ -16,6 +16,6 @@ vec2 radialDistortion(vec2 coord) {
  return coord + cc * (1.0 - dist) * dist;
 }

-void main(void) {
+void main() {
  fragColor = texture(source[0], radialDistortion(texCoord));
 }
@@ -0,0 +1,4 @@
+program
+  filter: linear
+  wrap: border
+  fragment: curvature.fs
@@ -0,0 +1,25 @@
+#version 150
+
+uniform sampler2D source[];
+uniform vec4 sourceSize[];
+
+in Vertex {
+  vec2 texCoord;
+};
+
+out vec4 fragColor;
+
+vec3 grayscale(vec3 color) {
+  return vec3(dot(color, vec3(0.3, 0.59, 0.11)));
+}
+
+void main() {
+  vec2 offset = fract(texCoord * sourceSize[0].xy) - 0.5;
+  offset /= sourceSize[0].xy;
+
+  vec3 cx = texture(source[0], texCoord - offset).xyz;
+  vec3 cy = texture(source[0], texCoord).xyz;
+  vec3 cz = vec3(5.0 * grayscale(abs(cx - cy)));
+
+  fragColor = vec4(clamp(cz, 0.0, 1.0), 1.0);
+}
@@ -0,0 +1,4 @@
+program
+  filter: linear
+  wrap: edge
+  fragment: edge-detection.fs
@@ -1,52 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-
-#define RGB_to_YIQ 	mat3x3( 0.299 , 0.595716 , 0.211456 ,	0.587    , -0.274453 , -0.522591 ,		0.114    , -0.321263 , 0.311135 )
-#define YIQ_to_RGB 	mat3x3( 1.0   , 1.0      , 1.0      ,	0.9563   , -0.2721   , -1.1070   ,		0.6210   , -0.6474   , 1.7046   )
-#define LEVELS(C) 		clamp((C -16/ 255.0)*255.0/(235.0-16.0),0.0,1.0)
-
-uniform sampler2D	source[];
-uniform vec4		sourceSize[];
-
-in Vertex {
-	vec2 texCoord;
-};
-out vec4 fragColor;
-
-
-void main() {
-	vec3 c=texture2D(source[0], texCoord.xy).xyz;
-#ifdef TV_COLOR_LEVELS
-	c=LEVELS(c);
-#endif 	
-#ifdef COMPOSITE_CONNECTION
-	c=RGB_to_YIQ*c;
-#endif
-	fragColor = vec4(c, 1.0);
-}
@@ -1,77 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-
-
-#define YIQ_to_RGB 	mat3x3( 1.0   , 1.0      , 1.0      ,	0.9563   , -0.2721   , -1.1070   ,		0.6210   , -0.6474   , 1.7046   )
-
-
-
-
-#define pi			3.14159265358
-#define a(x) abs(x)
-#define d(x,b) (pi*b*min(a(x)+0.5,1.0/b))
-#define e(x,b) (pi*b*min(max(a(x)-0.5,-1.0/b),1.0/b))
-#define STU(x,b) ((d(x,b)+sin(d(x,b))-e(x,b)-sin(e(x,b)))/(2.0*pi))
-#define X(i) (offset-(i))
-
-#define GETC (texture(source[0], vec2(texCoord.x - X*sourceSize[0].z,texCoord.y)).xyz)
-
-#ifdef COMPOSITE_CONNECTION
-#define VAL vec3((c.x*STU(X,(SIGNAL_RESOLUTION*sourceSize[0].z))),(c.y*STU(X,(SIGNAL_RESOLUTION_I*sourceSize[0].z))),(c.z*STU(X,(SIGNAL_RESOLUTION_Q*sourceSize[0].z))))
-#else
-#define VAL (c*STU(X,(SIGNAL_RESOLUTION*sourceSize[0].z)))
-#endif //COMPOSITE_CONNECTION
-
-#define PROCESS(i) X=X(i);c=GETC;tempColor+=VAL;
-
-uniform sampler2D	source[];
-uniform vec4		sourceSize[];
-
-in Vertex {
-	vec2 texCoord;
-};
-out vec4 fragColor;
-
-
-void main() {
-	
-	float	offset	= fract((texCoord.x * sourceSize[0].x) - 0.5);
-	vec3	tempColor = vec3(0.0);	
-	float 	X;
-	vec3 	c;	
-	PROCESS(-6)PROCESS(-5)PROCESS(-4)PROCESS(-3)PROCESS(-2)PROCESS(-1)PROCESS( 0)
-	PROCESS( 7)PROCESS( 6)PROCESS( 5)PROCESS( 4)PROCESS( 3)PROCESS( 2)PROCESS( 1)
-	
-
-#ifdef COMPOSITE_CONNECTION
-	tempColor=clamp(YIQ_to_RGB*tempColor,0.0,1.0);
-#endif
-	tempColor=clamp(pow(tempColor,vec3(TV_DISPLAY_GAMMA)),0.0,1.0);
-	fragColor = vec4(tempColor,1.0);
-}
@@ -1,46 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex{
-	vec2 texCoord;
-}vertexOut;
-
-void main(void){
-	
-#ifdef CROP_OVERSCAN
-	gl_Position=position;
-	gl_Position.x/=(224.0/240.0);
-#else
-	gl_Position=position;
-#endif
-	
-	vertexOut.texCoord=texCoord;	
-}
@@ -1,63 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-
-
-#define pi			3.14159265358
-#define a(x) abs(x)
-#define d(x,b) (pi*b*min(a(x)+0.5,1.0/b))
-#define e(x,b) (pi*b*min(max(a(x)-0.5,-1.0/b),1.0/b))
-#define STU(x,b) ((d(x,b)+sin(d(x,b))-e(x,b)-sin(e(x,b)))/(2.0*pi))
-#define X(i) (offset-(i))
-
-#define GETC (texture(source[0], vec2(texCoord.x - X*sourceSize[0].z,texCoord.y)).xyz)
-#define VAL (c*STU(X,(TV_HORIZONTAL_RESOLUTION*sourceSize[0].z)))
-
-#define PROCESS(i) X=X(i);c=GETC;tempColor+=VAL;
-
-uniform sampler2D	source[];
-uniform vec4		sourceSize[];
-
-in Vertex {
-	vec2 texCoord;
-};
-out vec4 fragColor;
-
-
-void main() {
-	
-	float	offset	= fract((texCoord.x * sourceSize[0].x) - 0.5);
-	vec3	tempColor = vec3(0.0);	
-	float 	X;
-	vec3 	c;	
-	PROCESS(-6)PROCESS(-5)PROCESS(-4)PROCESS(-3)PROCESS(-2)PROCESS(-1)PROCESS( 0)
-	PROCESS( 7)PROCESS( 6)PROCESS( 5)PROCESS( 4)PROCESS( 3)PROCESS( 2)PROCESS( 1)
-	
-	// tempColor=pow(tempColor,vec3(1.0/2.2));
-	fragColor = vec4(tempColor,1.0);
-}
@@ -1,78 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-
-
-#define SCANLINE_WIDTH (1.5*sourceSize[0].y/TV_VERTICAL_RESOLUTION)
-
-uniform sampler2D	source[];
-uniform sampler2D 	texture[];
-uniform vec4		sourceSize[];
-
-in Vertex {
-	vec2 texCoord;
-};
-out vec4 fragColor;
-
-
-#define GAMMAOUT(c0)	(pow(c0, vec3(1.0/OUTPUTG2)))
-#define pi			3.14159265358
-#define GAUSS(x,w) ((sqrt(2.0) / (w)) * (exp((-2.0 * pi * (x) * (x)) / ((w) * (w)))))
-#define Y(j) (offset.y-(j))
-#define a(x) abs(x)
-#define d(x,b) (pi*b*min(a(x)+0.5,1.0/b))
-#define e(x,b) (pi*b*min(max(a(x)-0.5,-1.0/b),1.0/b))
-#define STU(x,b) ((d(x,b)+sin(d(x,b))-e(x,b)-sin(e(x,b)))/(2.0*pi))
-
-#define SOURCE(j) vec2(texCoord.x,texCoord.y - Y(j)*sourceSize[0].w)
-#define C(j) (texture2D(source[0], SOURCE(j)).xyz)
-
-#ifdef NO_SCANLINES
-#define VAL(j) (C(j)*STU(Y(j),(TV_VERTICAL_RESOLUTION*sourceSize[0].w)))
-#else
-#define VAL(j) (C(j)*GAUSS(Y(j),SCANLINE_WIDTH))
-#endif
-
-
-
-void main() {
-	
-	vec2	offset	= fract((texCoord.xy * sourceSize[0].xy) - 0.5);
-	vec3	tempColor = vec3(0.0);	
-
-	tempColor+=VAL(-3.0);
-	tempColor+=VAL(-2.0);
-	tempColor+=VAL(-1.0);
-	tempColor+=VAL(0.0);
-	tempColor+=VAL(1.0);
-	tempColor+=VAL(2.0);
-	tempColor+=VAL(3.0);
-	tempColor+=VAL(4.0);
-	
-	fragColor = vec4(pow(tempColor,vec3(1.0/OUTPUT_DISPLAY_GAMMA)), 1.0);
-}
@@ -1,46 +0,0 @@
-#version 150
-
-////////////////////////////////////////////////////////
-//	GTU version 0.40	
-//	Author: aliaspider - [email protected]
-//	License: GPLv3      
-////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////
-// SETTINGS 
-////////////////////////////////////////////////////////
-
-//#define	CROP_OVERSCAN
-#define	TV_COLOR_LEVELS
-//#define	COMPOSITE_CONNECTION
-//#define	NO_SCANLINES
-#define	TV_HORIZONTAL_RESOLUTION	400.0
-#define	TV_VERTICAL_RESOLUTION	300.0
-#define	SIGNAL_RESOLUTION	280.0
-#define	SIGNAL_RESOLUTION_I	83.0
-#define	SIGNAL_RESOLUTION_Q	25.0
-#define	TV_DISPLAY_GAMMA	2.4
-#define	OUTPUT_DISPLAY_GAMMA	2.2
-
-////////////////////////////////////////////////////////
-// 
-////////////////////////////////////////////////////////
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex{
-	vec2 texCoord;
-}vertexOut;
-
-void main(void){
-	
-#ifdef CROP_OVERSCAN
-	gl_Position=position;
-	gl_Position.y/=(224.0/240.0);
-#else
-	gl_Position=position;
-#endif
-	
-	vertexOut.texCoord=texCoord;	
-}
@@ -1,28 +0,0 @@
-program
-	width: 100%
-	height: 100%
-	format: rgba32f
-	filter: nearest
-	wrap: edge
-	fragment: GTU-pass1.fs
-program
-	height:	100%
-	format: rgba32f
-	filter: nearest
-	wrap: edge
-	vertex: GTU-pass2.vs
-	fragment: GTU-pass2.fs
-program
-	height:	100%
-	format: rgba32f
-	filter: nearest
-	wrap: edge
-	fragment: GTU-pass3.fs
-program
-	format: rgba8
-	filter: nearest
-	wrap: edge
-	vertex: GTU-pass4.vs
-	fragment: GTU-pass4.fs
-output
-	filter: nearest
@@ -0,0 +1,99 @@
+#version 150
+
+// GritsScanlines by torridgristle
+// license: public domain (https://forums.libretro.com/t/lightweight-lut-based-scanline-glow-concept-prototype-glsl/18336/7)
+
+/* Runtime parameters
+#in LuminanceDawnbringer
+#in LuminanceLUT
+#in ScanlinesOpacity
+#in GammaCorrection
+#in TrinitronColors
+*/
+
+// static parameters
+//#define LuminanceDawnbringer
+#define LuminanceLUT
+//#define TrinitronColors
+#define ScanlinesOpacity 0.9
+//#define GammaCorrection 1.2
+
+uniform sampler2D source[];
+uniform vec4 sourceSize[];
+uniform vec4 targetSize;
+uniform sampler2D pixmap[];
+
+in Vertex {
+  vec2 texCoord;
+};
+
+out vec4 fragColor;
+
+#ifdef LuminanceLUT
+#define LUT_SizeLum 16.0
+
+	// Code taken from RetroArch's LUT shader
+float luminancelut(vec4 org)
+{
+	vec4 imgColorLum = org;
+	float redLum = ( imgColorLum.r * (LUT_SizeLum - 1.0) + 0.4999 ) / (LUT_SizeLum * LUT_SizeLum);
+	float greenLum = ( imgColorLum.g * (LUT_SizeLum - 1.0) + 0.4999 ) / LUT_SizeLum;
+	float blue1Lum = (floor( imgColorLum.b  * (LUT_SizeLum - 1.0) ) / LUT_SizeLum) + redLum;
+	float blue2Lum = (ceil( imgColorLum.b  * (LUT_SizeLum - 1.0) ) / LUT_SizeLum) + redLum;
+	float mixerLum = clamp(max((imgColorLum.b - blue1Lum) / (blue2Lum - blue1Lum), 0.0), 0.0, 32.0);
+	float color1Lum = texture(pixmap[1], vec2( blue1Lum, greenLum )).x;
+	float color2Lum = texture(pixmap[1], vec2( blue2Lum, greenLum )).x;
+	return mix(color1Lum, color2Lum, mixerLum);
+}
+#endif
+
+#ifdef TrinitronColors
+#define LUT_SizeTrinitron 32.0
+
+vec4 TrinitronD50(vec4 org)
+{
+	vec4 imgColorTrinitron = org;
+	float redTrinitron = ( imgColorTrinitron.r * (LUT_SizeTrinitron - 1.0) + 0.4999 ) / (LUT_SizeTrinitron * LUT_SizeTrinitron);
+	float greenTrinitron = ( imgColorTrinitron.g * (LUT_SizeTrinitron - 1.0) + 0.4999 ) / LUT_SizeTrinitron;
+	float blue1Trinitron = (floor( imgColorTrinitron.b  * (LUT_SizeTrinitron - 1.0) ) / LUT_SizeTrinitron) + redTrinitron;
+	float blue2Trinitron = (ceil( imgColorTrinitron.b  * (LUT_SizeTrinitron - 1.0) ) / LUT_SizeTrinitron) + redTrinitron;
+	float mixerTrinitron = clamp(max((imgColorTrinitron.b - blue1Trinitron) / (blue2Trinitron - blue1Trinitron), 0.0), 0.0, 32.0);
+	vec4 color1Trinitron = texture(pixmap[2], vec2( blue1Trinitron, greenTrinitron ));
+	vec4 color2Trinitron = texture(pixmap[2], vec2( blue2Trinitron, greenTrinitron ));
+	vec4 fragColorTrinitron = mix(color1Trinitron, color2Trinitron, mixerTrinitron);
+	return vec4(pow(fragColorTrinitron.rgb,vec3(GammaCorrection,GammaCorrection,GammaCorrection)),1.0);
+} 
+#endif
+
+void main() {
+
+//Source Image
+	vec4 org = texture(source[0], texCoord);
+   
+#ifdef LuminanceLUT
+// Use a 3DLUT instead of an equation so that it can use any arbitrary mess you can come up with.
+	float luminance = luminancelut(org);
+#elif defined LuminanceDawnbringer
+// Dawnbringer's brightness equation from Dawnbringer's Toolbox scripts for Grafx2
+	float luminance = sqrt(org.r*org.r*0.0676 + org.g*org.g*0.3025 + org.b*org.b*0.0361) * 1.5690256395005606;
+#else
+// Plain, standard, fine; slightly faster
+	float luminance = ((0.299*org.r) + (0.587*org.g) + (0.114*org.b));
+#endif
+
+// Don't let it exceed 1.0
+	luminance = clamp(luminance, 0.0, 1.0);
+
+// Scanline Mapping, based on the Phosphor LUT shader's method of tiling a texture over the screen
+	vec2 LUTeffectiveCoord = vec2(luminance,fract((texCoord.y*targetSize.y)/4.0));
+
+// Scanline Layer
+	vec4 screen = texture(pixmap[0], LUTeffectiveCoord);
+
+// Output multiplying the scanlines into the original image, with control over opacity
+#ifdef TrinitronColors
+	org = TrinitronD50(org);
+#endif
+	fragColor = ((screen*ScanlinesOpacity)+(1.0 - ScanlinesOpacity)) * (org);
+}
+
@@ -0,0 +1,35 @@
+settings
+  LuminanceDawnbringer
+    active: false
+  LuminanceLUT
+    active: false
+  TrinitronColors
+    active: true
+  ScanlinesOpacity: 0.9
+    min: 0.0
+    max: 1.0
+    step: 0.05
+  GammaCorrection: 1.2
+    min: 0.5
+    max: 2.0
+    step: 0.1
+
+
+program
+  filter: nearest
+  wrap: edge
+  width: 100%
+  height: 400%
+  fragment: GritsScanlines.fs
+  pixmap: Scanline-LUT-4px.png
+    filter: linear
+    wrap: edge
+  pixmap: Fake-Self-Illumination.png
+    filter: linear
+    wrap: edge
+  pixmap: Trinitron D50 Absolute Colorimetric - LUT.png
+    filter: linear
+    wrap: edge
+
+output1
+  filter: linear
@@ -0,0 +1,39 @@
+#version 150
+
+/*
+   Interlacing
+   Author: hunterk
+   License: Public domain
+   
+   Note: This shader is designed to work with the typical interlaced output from an emulator, which displays both even and odd fields twice.
+   This shader will un-weave the image, resulting in a standard, alternating-field interlacing.
+*/
+
+uniform sampler2D source[];
+uniform vec2 targetSize;
+uniform vec4 sourceSize[];
+uniform int phase;
+
+in Vertex {
+  vec2 texCoord;
+};
+
+out vec4 fragColor;
+
+// This controls how bright the intermediate lines are; 0.0 = totally black
+#define percent 0.0
+
+void main()
+{
+vec4 res = texture(source[0], texCoord);
+   float y = 0.0;
+
+   // assume anything with a vertical resolution greater than 400 lines is interlaced
+   if (sourceSize[0].y > 400.0) y = sourceSize[0].y * texCoord.y + phase;
+   else
+      y = 2.00001 * sourceSize[0].y * texCoord.y;
+
+   if (mod(y, 2.0) > 0.99999) fragColor = res;
+   else
+      fragColor = vec4(percent) * res;
+}
@@ -0,0 +1,6 @@
+input
+  filter: nearest
+
+program
+  fragment: interlace.fs
+  modulo: 2
@@ -1,88 +0,0 @@
-#version 150
-
-#in red
-#in green
-#in blue
-#in gain
-#in gamma
-#in blacklevel
-#in ambient
-#in BGR
-
-#define outgamma 2.2
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-
-in Vertex {
-  vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-#define fetch_offset(coord,offset) (pow(vec3(gain) * texelFetchOffset(source[0], (coord), 0, (offset)).rgb + vec3(blacklevel), vec3(gamma)) + vec3(ambient))
-
-// integral of (1 - x^2 - x^4 + x^6)^2
-const float coeffs_x[] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
-// integral of (1 - 2x^4 + x^6)^2
-const float coeffs_y[] = float[](1.0,      0.0, -4.0/5.0, 2.0/7.0,  4.0/9.0, -4.0/11.0, 1.0/13.0); 
-float intsmear_func(float z, float coeffs[7])
-{
-  float z2 = z*z;
-  float zn = z;
-  float ret = 0.0;
-  for (int i = 0; i < 7; i++) {
-    ret += zn*coeffs[i];
-    zn *= z2;
-  }
-  return ret;
-}
-float intsmear(float x, float dx, float d, float coeffs[7])
-{
-  float zl = clamp((x-dx*0.5)/d,-1.0,1.0);
-  float zh = clamp((x+dx*0.5)/d,-1.0,1.0);
-  return d * ( intsmear_func(zh,coeffs) - intsmear_func(zl,coeffs) )/dx;
-}
-
-void main()
-{
-  vec2 texelSize = 1.0 / sourceSize[0].xy;
-  vec2 range = sourceSize[0].xy / (targetSize.xy * sourceSize[0].xy);
-
-  vec3 cred   = pow(red,   vec3(outgamma));
-  vec3 cgreen = pow(green, vec3(outgamma));
-  vec3 cblue  = pow(blue,  vec3(outgamma));
-
-  ivec2 tli = ivec2(floor(texCoord/texelSize-vec2(0.4999)));
-
-  vec3 lcol, rcol;
-  float subpix = (texCoord.x/texelSize.x - 0.4999 - float(tli.x))*3.0;
-  float rsubpix = range.x/texelSize.x * 3.0;
-  lcol = vec3(intsmear(subpix+1.0,rsubpix, 1.5, coeffs_x),
-              intsmear(subpix    ,rsubpix, 1.5, coeffs_x),
-              intsmear(subpix-1.0,rsubpix, 1.5, coeffs_x));
-  rcol = vec3(intsmear(subpix-2.0,rsubpix, 1.5, coeffs_x),
-              intsmear(subpix-3.0,rsubpix, 1.5, coeffs_x),
-              intsmear(subpix-4.0,rsubpix, 1.5, coeffs_x));
-#ifdef BGR
-  lcol.rgb = lcol.bgr;
-  rcol.rgb = rcol.bgr;
-#endif
-  float tcol, bcol;
-  subpix = texCoord.y/texelSize.y - 0.4999 - float(tli.y);
-  rsubpix = range.y/texelSize.y;
-  tcol = intsmear(subpix    ,rsubpix, 0.63, coeffs_y);
-  bcol = intsmear(subpix-1.0,rsubpix, 0.63, coeffs_y);
-
-  vec3 topLeftColor     = fetch_offset(tli, ivec2(0,0)) * lcol * vec3(tcol);
-  vec3 bottomRightColor = fetch_offset(tli, ivec2(1,1)) * rcol * vec3(bcol);
-  vec3 bottomLeftColor  = fetch_offset(tli, ivec2(0,1)) * lcol * vec3(bcol);
-  vec3 topRightColor    = fetch_offset(tli, ivec2(1,0)) * rcol * vec3(tcol);
-
-  vec3 averageColor = topLeftColor + bottomRightColor + bottomLeftColor + topRightColor;
-
-  averageColor = mat3x3(cred, cgreen, cblue) * averageColor;
-
-  fragColor = vec4(pow(averageColor,vec3(1.0/outgamma)),0.0);
-}
@@ -1,23 +0,0 @@
-settings
-  persistence: 0.5
-  red:   vec3(1,0,0)
-  green: vec3(0,1,0)
-  blue:  vec3(0,0,1)
-  gain: 1.0
-  gamma: 3.0
-  blacklevel: 0.05
-  ambient: 0.0
-  BGR
-  
-input
-  history: 8
-  filter: nearest
-
-program
-  fragment: motion-blur.fs
-  filter: nearest
-  width: 100%
-  height: 100%
-  
-program
-  fragment: lcd-grid.fs
@@ -1,23 +0,0 @@
-#version 150
-
-uniform sampler2D source[];
-uniform sampler2D history[];
-
-in Vertex {
-  vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-void main() {
-  vec4 color = pow(texture(history[7], texCoord).rgba, vec4(2.2));
-  color = (color + pow(texture(history[6], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[5], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[4], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[3], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[2], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[1], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(history[0], texCoord).rgba, vec4(2.2))) / 2.0;
-  color = (color + pow(texture(source[0], texCoord).rgba, vec4(2.2))) / 2.0;
-  fragColor = pow(color, vec4(1.0 / 2.2));
-}
@@ -1,24 +0,0 @@
-program
-	width: 100%
-	height: 100%
-	filter: nearest
-	fragment: mdapt-pass1.fs
-	wrap: edge
-program
-	width: 100%
-	height: 100%
-	filter: nearest
-	fragment: mdapt-pass2.fs
-	wrap: edge
-program
-	width: 100%
-	height: 100%
-	filter: nearest
-	fragment: mdapt-pass3.fs
-	wrap: edge
-program
-	width: 100%
-	height: 100%
-	filter: nearest
-	fragment: mdapt-pass4.fs	
-	wrap: edge
@@ -1,200 +0,0 @@
-// This is a port of the original CG shader to the quark format
-// the original shader can be found here :
-// https://github.com/libretro/common-shaders/tree/master/dithering/mdapt-4p
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v1.5 - Pass 1
-   by Sp00kyFox, 2013
-
-   Finds specific patterns and tags their central pixel.
-
-*/
-#version 150
-//#define HORI
-//#define VERT
-#define dtt				vec3(65536,255,1)
-#define eq_threshold	5.0
-
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-in Vertex{
-	vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-float reduce(vec3 color)
-{
-	return dot(color, dtt);
-}
-
-float df(float A, float B)
-{
-  return abs(A-B);
-}
-
-bool eq(float A, float B)
-{
-  return (A == B);
-}
-
-float remapTo01(float v, float low, float high)
-{
-	return clamp((v - low)/(high-low),0.0,1.0);
-}
-
-
-void main(void) {
-	vec2 pos = texCoord*sourceSize[0].xy;	// pos = pixel position
-	vec2 dir = sign(pos);	// dir = pixel direction
-
-	vec2 g1 = dir*vec2(sourceSize[0].z,0.0);
-	vec2 g2 = dir*vec2(0.0,sourceSize[0].w);;
-	
-	/*
-				U3
-		            UUL U2 UUR
-		        ULL UL  U1 UR  URR
-		    L3  L2  L1  C  R1  R2  R3
-		        DLL DL  D1 DR  DRR	
-			    DDL D2 DDR
-				D3
-	*/
-
-	vec3 c = texture(source[0], texCoord).xyz;
-	vec3 l1 = texture(source[0], texCoord - g1).xyz;
-	vec3 l2 = texture(source[0], texCoord - 2*g1).xyz;
-	vec3 r1 = texture(source[0], texCoord + g1).xyz;
-	vec3 r2 = texture(source[0], texCoord + 2*g1).xyz;
-	vec3 u1 = texture(source[0], texCoord - g2).xyz;
-	vec3 u2 = texture(source[0], texCoord - 2*g2).xyz;
-	vec3 d1 = texture(source[0], texCoord + g2).xyz;
-	vec3 d2 = texture(source[0], texCoord + 2*g2).xyz;
-	vec3 ul = texture(source[0], texCoord - g1 - g2).xyz;
-	vec3 ur = texture(source[0], texCoord + g1 - g2).xyz;
-	vec3 dl = texture(source[0], texCoord - g1 + g2).xyz;
-	vec3 dr = texture(source[0], texCoord + g1 + g2).xyz;
-
-	vec3 ull = texture(source[0], texCoord - 2*g1 - g2).xyz;
-	vec3 uul = texture(source[0], texCoord - g1 - 2*g2).xyz;
-	vec3 uur = texture(source[0], texCoord + g1 - 2*g2).xyz;
-	vec3 urr = texture(source[0], texCoord + 2*g1 - g2).xyz;
-	vec3 drr = texture(source[0], texCoord + 2*g1 + g2).xyz;
-	vec3 ddr = texture(source[0], texCoord + g1 + 2*g2).xyz;
-	vec3 ddl = texture(source[0], texCoord - g1 + 2*g2).xyz;
-	vec3 dll = texture(source[0], texCoord - 2*g1 + g2).xyz;
-
-	vec3 l3 = texture(source[0], texCoord - 3*g1).xyz;
-	vec3 r3 = texture(source[0], texCoord + 3*g1).xyz;
-	vec3 u3 = texture(source[0], texCoord - 3*g2).xyz;
-	vec3 d3 = texture(source[0], texCoord + 3*g2).xyz;
-
-	float C   = reduce(   c );
-
-	float L1  = reduce(  l1 ); float U1  = reduce(  u1 );
-	float L2  = reduce(  l2 ); float U2  = reduce(  u2 );
-	float R1  = reduce(  r1 ); float D1  = reduce(  d1 );
-	float R2  = reduce(  r2 ); float D2  = reduce(  d2 );
-
-	float UL  = reduce(  ul ); float L3  = reduce(  l3 );
-	float UR  = reduce(  ur ); float R3  = reduce(  r3 );
-	float DL  = reduce(  dl ); float U3  = reduce(  u3 );
-	float DR  = reduce(  dr ); float D3  = reduce(  d3 );
-
-	float ULL = reduce( ull ); float DRR = reduce( drr );
-	float UUL = reduce( uul ); float DDR = reduce( ddr );
-	float UUR = reduce( uur ); float DDL = reduce( ddl );
-	float URR = reduce( urr ); float DLL = reduce( dll );
-	
-	/*
-	tag values:
-		0	nothing	
-		
-			checkerboard pattern
-		9	DL
-		8	DR
-		7	UR
-		6	UL
-		5	full
-		
-			horizontal two-line checkerboard
-		4	bottom line
-		3	upper line
-
-			vertical two-line checkerboard
-		2	left line
-		1	right line
-
-			one line dither
-		-1	horizontal
-		-2	vertical
-	*/
-
-	float type=0;
-
-	// checkerboard pattern
-	if(!eq(C,D1) && !eq(C,U1) && !eq(C,L1) && !eq(C,R1))
-	{
-		if(eq(C,UL))
-		{
-			if(eq(C,UR))
-			{
-				if(eq(C,DR))
-				{
-					if(eq(C,DL))
-						type = 5;
-					else if(!eq(D1,L1) || eq(D1,DL))
-						type = 9;							
-				}
-				else
-				{
-					if(eq(C,DL) && (!eq(D1,R1) || eq(D1,DR)))
-						type = 8;
-				}	
-			}
-			else
-			{
-				if(eq(C,DR) && eq(C,DL) && (!eq(U1,R1) || eq(U1,UR)))
-					type = 7;							
-			}
-		}
-		else if(eq(C,UR) && eq(C,DR) && eq(C,DL) && (!eq(U1,L1) || eq(U1,UL)))
-			type = 6;	
-	}
-	// horizontal two-line checkerboard
-	else if(eq(C,L2) && eq(C,R2) && eq(C,UL) && eq(C,UR) && !eq(C,L1) && !eq(C,R1) && !eq(C,ULL) && !eq(C,U1) && !eq(C,URR))
-	{
-		type = 4;
-	}
-	else if(eq(C,L2) && eq(C,R2) && eq(C,DL) && eq(C,DR) && !eq(C,L1) && !eq(C,R1) && !eq(C,DLL) && !eq(C,D1) && !eq(C,DRR))
-	{
-		type = 3;
-	}
-	// vertical two-line checkerboard
-	else if(eq(C,U2) && eq(C,D2) && eq(C,UR) && eq(C,DR) && !eq(C,U1) && !eq(C,D1) && !eq(C,R1) && !eq(C,UUR) && !eq(C,DDR))				
-	{
-		type = 2;
-	}
-	else if(eq(C,U2) && eq(C,D2) && eq(C,UL) && eq(C,DL) && !eq(C,U1) && !eq(C,D1) && !eq(C,L1) && !eq(C,UUL) && !eq(C,DDL))				
-	{
-		type = 1;
-	}	
-#ifdef HORI
-	// horizontal one line dither
-	else if(eq(C,L2) && eq(C,R2) && eq(L1,R1) && !eq(C,L1) && !eq(C,L3) && !eq(C,R3))
-		type = -1;
-#endif
-#ifdef VERT
-	// vertical one line dither
-	else if(eq(C,U2) && eq(C,D2) && eq(U1,D1) && !eq(C,U1) && !eq(C,U3) && !eq(C,D3))
-		type = -2;
-#endif	
-
-	fragColor=vec4(c, remapTo01(type+2, 0, 15));
-    
-}
-
-
-
@@ -1,161 +0,0 @@
-// This is a port of the original CG shader to the quark format
-// the original shader can be found here :
-// https://github.com/libretro/common-shaders/tree/master/dithering/mdapt-4p
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v1.5 - Pass 1
-   by Sp00kyFox, 2013
-
-   Finds specific patterns and tags their central pixel.
-
-*/
-
-#version 150
-// Radius of the area where the algorithm looks for other detected pixels.
-#define rad 2
-
-// Minimal count of detection pixels in search area to be rated as valid.
-#define minimum 3
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-in Vertex{
-	vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-float remapTo01(float v, float low, float high)
-{
-	return clamp((v - low)/(high-low),0.0,1.0);
-}
-
-float remapFrom01(float v, float low, float high)
-{
-    return round(mix(low, high, v));
-}
-
-void main(void) {
-	vec2 pos = texCoord*sourceSize[0].xy;	// pos = pixel position
-	vec2 dir = sign(pos); // dir = pixel direction
-
-	vec2 g1 = dir*vec2(sourceSize[0].z,0.0);
-	vec2 g2 = dir*vec2(0.0,sourceSize[0].w);
-	
-	vec4 CC   = texture(source[0], texCoord).xyzw;
-	
-	float C = remapFrom01(CC.w, 0, 15) - 2;
-
-	if(C == 0){
-		fragColor=CC;
-		return;
-	}
-	
-	/*
-	tag values:
-		0	nothing	
-		
-			checkerboard pattern
-		9	DL
-		8	DR
-		7	UR
-		6	UL
-		5	full
-		
-			horizontal two-line checkerboard
-		4	bottom line
-		3	upper line
-
-			vertical two-line checkerboard
-		2	left line
-		1	right line
-
-			one line dither
-		-1	horizontal
-		-2	vertical
-	*/
-
-	int hits = 0;
-
-	if(C > 0)
-	{
-//		for(int x=-rad; x<=rad; x++)
-//		{
-//			for(int y=-rad; y<=rad; y++)
-//			{
-//				hits += ((remapFrom01(texture(source[0], texCoord + (x*g1) + (y*g2)).x, 0, 15) - 2) > 0) ? 1 : 0;
-//			}	
-//		}
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + (-2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + (-1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 0*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + (-2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + (-1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 0*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + (-2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + (-1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 0*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + (-2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + (-1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 0*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + (-2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + (-1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 0*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 1*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 2*g2)).w, 0, 15) - 2) > 0) ? 1 : 0;
-	}
-	else
-	{
-//		for(int x=-rad; x<=rad; x++)
-//		{
-//			for(int y=-rad; y<=rad; y++)
-//			{
-//				hits += ((remapFrom01(texture(source[0], texCoord + (x*g1) + (y*g2)).x, 0, 15) - 2) == C) ? 1 : 0;
-//			}	
-//		}
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + (-2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + (-1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 0*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-2*g1) + ( 2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + (-2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + (-1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 0*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + (-1*g1) + ( 2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + (-2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + (-1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 0*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 0*g1) + ( 2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + (-2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + (-1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 0*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 1*g1) + ( 2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + (-2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + (-1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 0*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 1*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-			hits += ((remapFrom01(texture(source[0], texCoord + ( 2*g1) + ( 2*g2)).w, 0, 15) - 2) == C) ? 1 : 0;
-		fragColor=CC;    
-		return;
-	}
-	
-	if(hits < minimum)
-		fragColor=vec4(CC.xyz, remapTo01(2, 0, 15));
-	else
-		fragColor=CC;    
-}
-
-
-
@@ -1,175 +0,0 @@
-// This is a port of the original CG shader to the quark format
-// the original shader can be found here :
-// https://github.com/libretro/common-shaders/tree/master/dithering/mdapt-4p
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v1.5 - Pass 3
-   by Sp00kyFox, 2013
-
-   Tags the rest of the detected pattern from pass 1.
-
-*/
-
-#version 150
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-in Vertex{
-	vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-float remapTo01(float v, float low, float high)
-{
-	return clamp((v - low)/(high-low),0.0,1.0);
-}
-
-float remapFrom01(float v, float low, float high)
-{
-    return round(mix(low, high, v));
-}
-void main(void) {
-	vec2 pos = texCoord*sourceSize[0].xy;	// pos = pixel position
-	vec2 dir = sign(pos); // dir = pixel direction
-
-	vec2 g1 = dir*vec2(sourceSize[0].z,0.0);
-	vec2 g2 = dir*vec2(0.0,sourceSize[0].w);
-		/*
-			U2
-		   UL	U1 UR
-		L2 L1   xC  R1 R2
-    		   DL   D1 DR	
-			D2
-	*/
-
-	vec4 xC = texture(source[0], texCoord).xyzw;
-	vec4 xL1 = texture(source[0], texCoord - g1).xyzw;
-	vec4 xL2 = texture(source[0], texCoord - 2*g1).xyzw;
-	vec4 xR1 = texture(source[0], texCoord + g1).xyzw;
-	vec4 xR2 = texture(source[0], texCoord + 2*g1).xyzw;
-	vec4 xU1 = texture(source[0], texCoord - g2).xyzw;
-	vec4 xU2 = texture(source[0], texCoord - 2*g2).xyzw;
-	vec4 xD1 = texture(source[0], texCoord + g2).xyzw;
-	vec4 xD2 = texture(source[0], texCoord + 2*g2).xyzw;
-	vec4 xUL = texture(source[0], texCoord - g1 - g2).xyzw;
-	vec4 xUR = texture(source[0], texCoord + g1 - g2).xyzw;
-	vec4 xDL = texture(source[0], texCoord - g1 + g2).xyzw;
-	vec4 xDR = texture(source[0], texCoord + g1 + g2).xyzw;
-	
-	float  C = remapFrom01(xC.w, 0, 15) - 2;
-	float L1 = remapFrom01(xL1.w, 0, 15) - 2;
-	float L2 = remapFrom01(xL2.w, 0, 15) - 2;
-	float R1 = remapFrom01(xR1.w, 0, 15) - 2;
-	float R2 = remapFrom01(xR2.w, 0, 15) - 2;
-	float U1 = remapFrom01(xU1.w, 0, 15) - 2;
-	float U2 = remapFrom01(xU2.w, 0, 15) - 2;
-	float D1 = remapFrom01(xD1.w, 0, 15) - 2;
-	float D2 = remapFrom01(xD2.w, 0, 15) - 2;
-	float UL = remapFrom01(xUL.w, 0, 15) - 2;
-	float UR = remapFrom01(xUR.w, 0, 15) - 2;
-	float DL = remapFrom01(xDL.w, 0, 15) - 2;
-	float DR = remapFrom01(xDR.w, 0, 15) - 2;
-
-	/*
-	tag values:
-		0	nothing	
-		
-			checkerboard pattern
-		9	DL
-		8	DR
-		7	UR
-		6	UL
-		5	full
-		
-			horizontal two-line checkerboard
-		4	bottom line
-		3	upper line
-
-			vertical two-line checkerboard
-		2	left line
-		1	right line
-
-			one line dither
-		-1	horizontal
-		-2	vertical
-	*/
-	
-	// checkerboard pattern
-	if(U1 == 5 || D1 == 5 || L1 == 5 || R1 == 5 || UL == 5 || UR == 5 || DR == 5 || DL == 5)
-	{
-		fragColor=vec4(xC.xyz, remapTo01(5+2, 0, 15));	
-		return ;
-	}
-	if(U1 == 6 || L1 == 6 || UL == 6 || UR == 6 || DL == 6) // UL
-	{
-		fragColor=vec4(xC.xyz, remapTo01(6+2, 0, 15));	
-		return ;
-	}
-
-	if(U1 == 7 || R1 == 7 || UL == 7 || UR == 7 || DR == 7) // UR
-	{
-		fragColor=vec4(xC.xyz, remapTo01(7+2, 0, 15));	
-		return ;
-	}
-
-	if(D1 == 8 || R1 == 8 || UR == 8 || DR == 8 || DL == 8) // DR
-	{
-		fragColor=vec4(xC.xyz, remapTo01(8+2, 0, 15));	
-		return ;
-	}
-
-	if(D1 == 9 || L1 == 9 || UL == 9 || DR == 9 || DL == 9) // DL
-	{
-		fragColor=vec4(xC.xyz, remapTo01(9+2, 0, 15));	
-		return ;
-	}
-
-	// horizontal two-line checkerboard
-	if (L2 == 4 || L1 == 4 || R1 == 4 || R2 == 4 || DL == 4 || D1 == 4 || DR == 4)		
-	{
-		fragColor=vec4(xC.xyz, remapTo01(4+2, 0, 15));
-		return ;
-	}
-	if (L2 == 3 || L1 == 3 || R1 == 3 || R2 == 3 || UL == 3 || U1 == 3 || UR == 3)		
-	{
-		fragColor=vec4(xC.xyz, remapTo01(3+2, 0, 15));	
-		return ;
-	}
-	
-	// vertical two-line checkerboard
-	if (U2 == 2 || U1 == 2 || D1 == 2 || D2 == 2 || UL == 2 || L1 == 2 || DL == 2)			
-	{
-		fragColor=vec4(xC.xyz, remapTo01(2+2, 0, 15));	
-		return ;
-	}
-	if (U2 == 1 || U1 == 1 || D1 == 1 || D2 == 1 || UR == 1 || R1 == 1 || DR == 1)			
-	{
-		fragColor=vec4(xC.xyz, remapTo01(1+2, 0, 15));	
-		return ;
-	}
-	
-	if(C > 0){
-		fragColor=xC;
-		return ;
-	}
-
-	// horizontal one line dither
-	if (L2 == -1 || L1 == -1 || R1 == -1 || R2 == -1)
-	{
-		fragColor=vec4(xC.xyz, remapTo01(-1+2, 0, 15));	
-		return ;
-	}
-
-	// vertical one line dither
-	if (U2 == -2 || U1 == -2 || D1 == -2 || D2 == -2)
-	{
-		fragColor=vec4(xC.xyz, remapTo01(-2+2, 0, 15));
-		return;
-	}
-
-	fragColor=xC;
-}
-
-
-
@@ -1,192 +0,0 @@
-// This is a port of the original CG shader to the quark format
-// the original shader can be found here :
-// https://github.com/libretro/common-shaders/tree/master/dithering/mdapt-4p
-
-/*
-   Merge Dithering and Pseudo Transparency Shader v1.5 - Pass 4
-   by Sp00kyFox, 2013
-
-   Blends tagged pixels with tagged neighbors.
-
-*/
-
-#version 150
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-in Vertex{
-	vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-bool eq(vec4 A, vec4 B)
-{
-	return (A.x == B.x && A.y == B.y && A.z == B.z);
-}
-
-float remapFrom01(float v, float low, float high)
-{
-    return round(mix(low, high, v));
-}
-
-
-vec3 merge3(vec4 C, vec4 A, vec4 B, float tag)
-{
-	if(A.w == tag)
-	{
-		if(B.w == tag)
-			return 0.5*C.xyz + 0.25*(A.xyz + B.xyz);
-		else
-			return 0.5*(C.xyz + A.xyz);
-	}
-	else if(B.w == tag)
-		return 0.5*(C.xyz + B.xyz);
-	else
-		return C.xyz;	
-}
-
-vec3 merge9(vec4 C, vec4 UL, vec4 UR, vec4 DL, vec4 DR, vec4 U1, vec4 D1, vec4 L1, vec4 R1)
-{
-	//return 0.25*C.xyz + 0.0625*(UL.xyz + UR.xyz + DR.xyz + DL.xyz) + 0.125*(L1.xyz + R1.xyz + D1.xyz + U1.xyz);
-	
-	vec3 B = vec3(0.0);
-	vec3 W = vec3(0.0);
-	float cntB = 0;
-	float cntW = 0;	
-
-	if(UL.w > 0 || eq(UL,C) || (D1.w > 0 && eq(UL,D1)) || (R1.w > 0 && eq(UL,R1)) )
-	{
-		B = B+UL.xyz;
-		cntB++;
-	}
-	if(UR.w > 0 || eq(UR,C) || (D1.w > 0 && eq(UR,D1)) || (L1.w > 0 && eq(UR,L1)) )
-	{
-		B = B+UR.xyz;
-		cntB++;
-	}
-	if(DL.w > 0 || eq(DL,C) || (U1.w > 0 && eq(DL,U1)) || (R1.w > 0 && eq(DL,R1)) )
-	{
-		B = B+DL.xyz;
-		cntB++;
-	}
-	if(DR.w > 0 || eq(DR,C) || (U1.w > 0 && eq(DR,U1)) || (L1.w > 0 && eq(DR,L1)) )
-	{
-		B = B+DR.xyz;
-		cntB++;
-	}
-	if(U1.w > 0 || eq(U1,C) || (D1.w > 0 && eq(U1,D1)) )
-	{
-		W = W+U1.xyz;
-		cntW++;
-	}
-	if(D1.w > 0 || eq(D1,C) || (U1.w > 0 && eq(D1,U1)) )
-	{
-		W = W+D1.xyz;
-		cntW++;
-	}
-	if(L1.w > 0 || eq(L1,C) || (R1.w > 0 && eq(L1,R1)) )
-	{
-		W = W+L1.xyz;
-		cntW++;
-	}
-	if(R1.w > 0 || eq(R1,C) || (L1.w > 0 && eq(R1,L1)) )
-	{
-		W = W+R1.xyz;
-		cntW++;
-	}
-		
-	if(cntB == 0)
-	{
-		if(cntW == 0)
-			return C.xyz;
-		else
-			return 0.5*C.xyz + (1/(cntW*2))*W;
-	}
-	if(cntW == 0)
-		return 0.5*C.xyz + (1/(cntB*2))*B;
-	else
-		return 0.25*C.xyz + (1/(cntB*4))*B + (1/(cntW*2))*W;	
-}
-void main(void) {
-	vec2 pos = texCoord*sourceSize[0].xy;	// pos = pixel position
-	vec2 dir = sign(pos); // dir = pixel direction
-
-	vec2 g1 = dir*vec2(sourceSize[0].z,0.0);
-	vec2 g2 = dir*vec2(0.0,sourceSize[0].w);
-	
-	/*
-		UL U1 UR
-		L1 C  R1
-		DL D1 DR	
-	*/
-
-	vec4 C   = texture(source[0], texCoord).xyzw;
-	vec4 L1  = texture(source[0], texCoord - g1).xyzw;	
-	vec4 R1  = texture(source[0], texCoord + g1).xyzw;
-	vec4 U1  = texture(source[0], texCoord - g2).xyzw;
-	vec4 D1  = texture(source[0], texCoord + g2).xyzw;
-	vec4 UL  = texture(source[0], texCoord - g1 - g2).xyzw;
-	vec4 UR  = texture(source[0], texCoord + g1 - g2).xyzw;
-	vec4 DL  = texture(source[0], texCoord - g1 + g2).xyzw;
-	vec4 DR  = texture(source[0], texCoord + g1 + g2).xyzw;
-
-
-	C.w   = remapFrom01(C.w, 0, 15) - 2;
-	L1.w  = remapFrom01(L1.w, 0, 15) - 2;	
-	R1.w  = remapFrom01(R1.w, 0, 15) - 2;
-	U1.w  = remapFrom01(U1.w, 0, 15) - 2;
-	D1.w  = remapFrom01(D1.w, 0, 15) - 2;
-	UL.w  = remapFrom01(UL.w, 0, 15) - 2;
-	UR.w  = remapFrom01(UR.w, 0, 15) - 2;
-	DL.w  = remapFrom01(DL.w, 0, 15) - 2;
-	DR.w  = remapFrom01(DR.w, 0, 15) - 2;
-	
-	/*
-	tag values:
-		0	nothing	
-		
-			checkerboard pattern
-		9	DL
-		8	DR
-		7	UR
-		6	UL
-		5	full
-		
-			horizontal two-line checkerboard
-		4	bottom line
-		3	upper line
-
-			vertical two-line checkerboard
-		2	left line
-		1	right line
-
-			one line dither
-		-1	horizontal
-		-2	vertical
-	*/
-	
-
-	// checkerboard pattern
-	if(C.w > 0){
-		fragColor=vec4(merge9(C,UL,UR,DL,DR,U1,D1,L1,R1),0);
-		return;
-	}
-	// horizontal one line dither
-	if(C.w == -1){
-		fragColor=vec4(merge3(C,L1,R1,-1),0);
-		return;
-	}
-
-	// vertical one line dither
-	if(C.w == -2){
-		fragColor=vec4(merge3(C,U1,D1,-2),0);
-		return;
-	}
-	
-	fragColor=vec4(C.xyz, 1.0);
-    
-}
-
-
-
@@ -1,229 +0,0 @@
-#version 150
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// Yes, this code could greatly use some cleaning up.
-
-// ported from UltraMoogleMan's "Full MAME/MESS Shader Pipe" shadertoy: https://www.shadertoy.com/view/ldf3Rf
-// license: presumably MAME's license at the time, which was noncommercial
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-// Useful Constants
-const vec4 Zero = vec4(0.0);
-const vec4 Half = vec4(0.5);
-const vec4 One = vec4(1.0);
-const vec4 Two = vec4(2.0);
-const vec3 Gray = vec3(0.3, 0.59, 0.11);
-const float Pi = 3.1415926535;
-const float Pi2 = 6.283185307;
-
-// NTSC Constants
-const vec4 A = vec4(0.5);
-const vec4 A2 = vec4(1.0);
-const vec4 B = vec4(0.5);
-const float P = 1.0;
-const float CCFrequency = 3.59754545;
-const float NotchUpperFrequency = 5.59754545; //3.59754545 + 2.0;
-const float NotchLowerFrequency = 1.59754545; //3.59754545 - 2.0;
-const float YFrequency = 6.0;
-const float IFrequency = 1.2;
-const float QFrequency = 0.6;
-const float NotchHalfWidth = 2.0;
-const float ScanTime = 52.6;
-const float Pi2ScanTime = 330.4955471482;// 6.283185307 * 52.6;
-const float MaxC = 2.1183;
-const vec4 YTransform = vec4(0.299, 0.587, 0.114, 0.0);
-const vec4 ITransform = vec4(0.595716, -0.274453, -0.321263, 0.0);
-const vec4 QTransform = vec4(0.211456, -0.522591, 0.311135, 0.0);
-const vec3 YIQ2R = vec3(1.0, 0.956, 0.621);
-const vec3 YIQ2G = vec3(1.0, -0.272, -0.647);
-const vec3 YIQ2B = vec3(1.0, -1.106, 1.703);
-const vec4 MinC = vec4(-1.1183);
-const vec4 CRange = vec4(3.2366);
-const vec4 InvCRange = vec4(1.0/3.2366);
-const float Pi2Length = Pi2 / 63.0;
-const vec4 NotchOffset = vec4(0.0, 1.0, 2.0, 3.0);
-vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-
-// Color Convolution Constants
-const vec3 RedMatrix = vec3(1.0, 0.0, 0.0);
-const vec3 GrnMatrix = vec3(0.0, 1.0, 0.0);
-const vec3 BluMatrix = vec3(0.0, 0.0, 1.0);
-const vec3 DCOffset = vec3(0.0, 0.0, 0.0);
-const vec3 ColorScale = vec3(0.95, 0.95, 0.95);
-const float Saturation = 1.4;
-
-// Deconverge Constants
-const vec3 ConvergeX = vec3(-0.4,  0.0, 0.2);
-const vec3 ConvergeY = vec3( 0.0, -0.4, 0.2);
-const vec3 RadialConvergeX = vec3(1.0, 1.0, 1.0);
-const vec3 RadialConvergeY = vec3(1.0, 1.0, 1.0);
-
-// Scanline/Pincushion Constants
-const float PincushionAmount = 0.015;
-const float CurvatureAmount = 0.015;
-//const float ScanlineAmount = 0.175; <- move to parameter
-const float ScanlineScale = 1.0;
-const float ScanlineHeight = 1.0;
-const float ScanlineBrightScale = 1.0;
-const float ScanlineBrightOffset = 0.0;
-const float ScanlineOffset = 0.0;
-const vec3 Floor = vec3(0.05, 0.05, 0.05);
-
-// 60Hz Bar Constants
-const float SixtyHertzRate = (60.0 / 59.97 - 1.0); // Difference between NTSC and line frequency
-const float SixtyHertzScale = 0.1;
-
-vec4 CompositeSample(vec2 UV, vec2 InverseRes) {
-	vec2 InverseP = vec2(P, 0.0) * InverseRes;
-	
-	// UVs for four linearly-interpolated samples spaced 0.25 texels apart
-	vec2 C0 = UV;
-	vec2 C1 = UV + InverseP * 0.25;
-	vec2 C2 = UV + InverseP * 0.50;
-	vec2 C3 = UV + InverseP * 0.75;
-	vec4 Cx = vec4(C0.x, C1.x, C2.x, C3.x);
-	vec4 Cy = vec4(C0.y, C1.y, C2.y, C3.y);
-
-	vec4 Texel0 = texture(source[0], C0);
-	vec4 Texel1 = texture(source[0], C1);
-	vec4 Texel2 = texture(source[0], C2);
-	vec4 Texel3 = texture(source[0], C3);
-	
-	float Frequency = CCFrequency;
-	//Frequency = Frequency;// Uncomment for bad color sync + (sin(UV.y * 2.0 - 1.0) / CCFrequency) * 0.001;
-
-	// Calculated the expected time of the sample.
-	vec4 T = A2 * Cy * vec4(sourceSize[0].y) + B + Cx;
-	vec4 W = vec4(Pi2ScanTime * Frequency);
-	vec4 TW = T * W;
-	vec4 Y = vec4(dot(Texel0, YTransform), dot(Texel1, YTransform), dot(Texel2, YTransform), dot(Texel3, YTransform));
-	vec4 I = vec4(dot(Texel0, ITransform), dot(Texel1, ITransform), dot(Texel2, ITransform), dot(Texel3, ITransform));
-	vec4 Q = vec4(dot(Texel0, QTransform), dot(Texel1, QTransform), dot(Texel2, QTransform), dot(Texel3, QTransform));
-
-	vec4 Encoded = Y + I * cos(TW) + Q * sin(TW);
-	return (Encoded - MinC) * InvCRange;
-}
-
-vec4 NTSCCodec(vec2 UV, vec2 InverseRes)
-{
-	vec4 YAccum = Zero;
-	vec4 IAccum = Zero;
-	vec4 QAccum = Zero;
-	float QuadXSize = sourceSize[0].x * 4.0;
-	float TimePerSample = ScanTime / QuadXSize;
-	
-	// Frequency cutoffs for the individual portions of the signal that we extract.
-	// Y1 and Y2 are the positive and negative frequency limits of the notch filter on Y.
-	// Y3 is the center of the frequency response of the Y filter.
-	// I is the center of the frequency response of the I filter.
-	// Q is the center of the frequency response of the Q filter.
-	float Fc_y1 = NotchLowerFrequency * TimePerSample;
-	float Fc_y2 = NotchUpperFrequency * TimePerSample;
-	float Fc_y3 = YFrequency * TimePerSample;
-	float Fc_i = IFrequency * TimePerSample;
-	float Fc_q = QFrequency * TimePerSample;
-	float Pi2Fc_y1 = Fc_y1 * Pi2;
-	float Pi2Fc_y2 = Fc_y2 * Pi2;
-	float Pi2Fc_y3 = Fc_y3 * Pi2;
-	float Pi2Fc_i = Fc_i * Pi2;
-	float Pi2Fc_q = Fc_q * Pi2;
-	float Fc_y1_2 = Fc_y1 * 2.0;
-	float Fc_y2_2 = Fc_y2 * 2.0;
-	float Fc_y3_2 = Fc_y3 * 2.0;
-	float Fc_i_2 = Fc_i * 2.0;
-	float Fc_q_2 = Fc_q * 2.0;
-	vec4 CoordY = vec4(UV.y);
-	
-	// 83 composite samples wide, 4 composite pixels per texel
-	for(float n = -31.0; n < 32.0; n += 4.0)
-	{
-		vec4 n4 = n + NotchOffset;
-		vec4 CoordX = UV.x + InverseRes.x * n4 * 0.25;
-		vec2 TexCoord = vec2(CoordX.x, CoordY.x);
-		vec4 C = CompositeSample(TexCoord, InverseRes) * CRange + MinC;
-		vec4 WT = W * (CoordX  + A2 * CoordY * sourceSize[0].y + B);
-		vec4 Cosine = 0.54 + 0.46 * cos(Pi2Length * n4);
-
-		vec4 SincYIn1 = Pi2Fc_y1 * n4;
-		vec4 SincYIn2 = Pi2Fc_y2 * n4;
-		vec4 SincYIn3 = Pi2Fc_y3 * n4;
-		vec4 SincY1 = sin(SincYIn1) / SincYIn1;
-		vec4 SincY2 = sin(SincYIn2) / SincYIn2;
-		vec4 SincY3 = sin(SincYIn3) / SincYIn3;
-		
-		// These zero-checks could be made more efficient if WebGL supported mix(vec4, vec4, bvec4)
-		// Unfortunately, the universe hates us
-		if(SincYIn1.x == 0.0) SincY1.x = 1.0;
-		if(SincYIn1.y == 0.0) SincY1.y = 1.0;
-		if(SincYIn1.z == 0.0) SincY1.z = 1.0;
-		if(SincYIn1.w == 0.0) SincY1.w = 1.0;
-		if(SincYIn2.x == 0.0) SincY2.x = 1.0;
-		if(SincYIn2.y == 0.0) SincY2.y = 1.0;
-		if(SincYIn2.z == 0.0) SincY2.z = 1.0;
-		if(SincYIn2.w == 0.0) SincY2.w = 1.0;
-		if(SincYIn3.x == 0.0) SincY3.x = 1.0;
-		if(SincYIn3.y == 0.0) SincY3.y = 1.0;
-		if(SincYIn3.z == 0.0) SincY3.z = 1.0;
-		if(SincYIn3.w == 0.0) SincY3.w = 1.0;
-		vec4 IdealY = (Fc_y1_2 * SincY1 - Fc_y2_2 * SincY2) + Fc_y3_2 * SincY3;
-		vec4 FilterY = Cosine * IdealY;		
-		
-		vec4 SincIIn = Pi2Fc_i * n4;
-		vec4 SincI = sin(SincIIn) / SincIIn;
-		if (SincIIn.x == 0.0) SincI.x = 1.0;
-		if (SincIIn.y == 0.0) SincI.y = 1.0;
-		if (SincIIn.z == 0.0) SincI.z = 1.0;
-		if (SincIIn.w == 0.0) SincI.w = 1.0;
-		vec4 IdealI = Fc_i_2 * SincI;
-		vec4 FilterI = Cosine * IdealI;
-		
-		vec4 SincQIn = Pi2Fc_q * n4;
-		vec4 SincQ = sin(SincQIn) / SincQIn;
-		if (SincQIn.x == 0.0) SincQ.x = 1.0;
-		if (SincQIn.y == 0.0) SincQ.y = 1.0;
-		if (SincQIn.z == 0.0) SincQ.z = 1.0;
-		if (SincQIn.w == 0.0) SincQ.w = 1.0;
-		vec4 IdealQ = Fc_q_2 * SincQ;
-		vec4 FilterQ = Cosine * IdealQ;
-		
-		YAccum += C * FilterY;
-		IAccum += C * cos(WT) * FilterI;
-		QAccum += C * sin(WT) * FilterQ;
-	}
-	
-	float Y = dot(YAccum, One);
-	float I = dot(IAccum, One) * 2.0;
-	float Q = dot(QAccum, One) * 2.0;
-	
-	vec3 YIQ = vec3(Y, I, Q);
-	vec3 OutRGB = vec3(dot(YIQ, YIQ2R), dot(YIQ, YIQ2G), dot(YIQ, YIQ2B));
-	
-	return vec4(OutRGB, 1.0);
-}
-
-void main() {
-   FragColor = vec4(NTSCCodec(vTexCoord, sourceSize[0].zw));
-}
@@ -1,13 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,208 +0,0 @@
-#version 150
-
-// This is a port of the NTSC encode/decode shader pair in MAME and MESS, modified to use only
-// one pass rather than an encode pass and a decode pass. It accurately emulates the sort of
-// signal decimation one would see when viewing a composite signal, though it could benefit from a
-// pre-pass to re-size the input content to more accurately reflect the actual size that would
-// be incoming from a composite signal source.
-//
-// To encode the composite signal, I convert the RGB value to YIQ, then subsequently evaluate
-// the standard NTSC composite equation. Four composite samples per RGB pixel are generated from
-// the incoming linearly-interpolated texels.
-//
-// The decode pass implements a Fixed Impulse Response (FIR) filter designed by MAME/MESS contributor
-// "austere" in matlab (if memory serves correctly) to mimic the behavior of a standard television set
-// as closely as possible. The filter window is 83 composite samples wide, and there is an additional
-// notch filter pass on the luminance (Y) values in order to strip the color signal from the luminance
-// signal prior to processing.
-//
-// Yes, this code could greatly use some cleaning up.
-
-// ported from UltraMoogleMan's "Full MAME/MESS Shader Pipe" shadertoy: https://www.shadertoy.com/view/ldf3Rf
-// license: presumably MAME's license at the time, which was noncommercial
-
-#define scanlines 0.0
-#define scandark 0.175
-#define deconverge 0.0
-#define pincushion 0.0
-#define hertzroll 0.0
-
-// Useful Constants
-const vec4 Zero = vec4(0.0);
-const vec4 Half = vec4(0.5);
-const vec4 One = vec4(1.0);
-const vec4 Two = vec4(2.0);
-const vec3 Gray = vec3(0.3, 0.59, 0.11);
-const float Pi = 3.1415926535;
-const float Pi2 = 6.283185307;
-
-// NTSC Constants
-const vec4 A = vec4(0.5);
-const vec4 A2 = vec4(1.0);
-const vec4 B = vec4(0.5);
-const float P = 1.0;
-const float CCFrequency = 3.59754545;
-const float NotchUpperFrequency = 5.59754545; //3.59754545 + 2.0;
-const float NotchLowerFrequency = 1.59754545; //3.59754545 - 2.0;
-const float YFrequency = 6.0;
-const float IFrequency = 1.2;
-const float QFrequency = 0.6;
-const float NotchHalfWidth = 2.0;
-const float ScanTime = 52.6;
-const float Pi2ScanTime = 330.4955471482;// 6.283185307 * 52.6;
-const float MaxC = 2.1183;
-const vec4 YTransform = vec4(0.299, 0.587, 0.114, 0.0);
-const vec4 ITransform = vec4(0.595716, -0.274453, -0.321263, 0.0);
-const vec4 QTransform = vec4(0.211456, -0.522591, 0.311135, 0.0);
-const vec3 YIQ2R = vec3(1.0, 0.956, 0.621);
-const vec3 YIQ2G = vec3(1.0, -0.272, -0.647);
-const vec3 YIQ2B = vec3(1.0, -1.106, 1.703);
-const vec4 MinC = vec4(-1.1183);
-const vec4 CRange = vec4(3.2366);
-const vec4 InvCRange = vec4(1.0/3.2366);
-const float Pi2Length = Pi2 / 63.0;
-const vec4 NotchOffset = vec4(0.0, 1.0, 2.0, 3.0);
-vec4 W = vec4(Pi2 * CCFrequency * ScanTime);
-
-// Color Convolution Constants
-const vec3 RedMatrix = vec3(1.0, 0.0, 0.0);
-const vec3 GrnMatrix = vec3(0.0, 1.0, 0.0);
-const vec3 BluMatrix = vec3(0.0, 0.0, 1.0);
-const vec3 DCOffset = vec3(0.0, 0.0, 0.0);
-const vec3 ColorScale = vec3(0.95, 0.95, 0.95);
-const float Saturation = 1.4;
-
-// Deconverge Constants
-const vec3 ConvergeX = vec3(-0.4,  0.0, 0.2);
-const vec3 ConvergeY = vec3( 0.0, -0.4, 0.2);
-const vec3 RadialConvergeX = vec3(1.0, 1.0, 1.0);
-const vec3 RadialConvergeY = vec3(1.0, 1.0, 1.0);
-
-// Scanline/Pincushion Constants
-const float PincushionAmount = 0.015;
-const float CurvatureAmount = 0.015;
-//const float ScanlineAmount = 0.175; <- move to parameter
-const float ScanlineScale = 1.0;
-const float ScanlineHeight = 1.0;
-const float ScanlineBrightScale = 1.0;
-const float ScanlineBrightOffset = 0.0;
-const float ScanlineOffset = 0.0;
-const vec3 Floor = vec3(0.05, 0.05, 0.05);
-
-// 60Hz Bar Constants
-const float SixtyHertzRate = (60.0 / 59.97 - 1.0); // Difference between NTSC and line frequency
-const float SixtyHertzScale = 0.1;
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-uniform int phase;
-
-in Vertex {
-   vec2 vTexCoord;
-};
-
-out vec4 FragColor;
-
-vec4 ColorConvolution(vec2 UV, vec2 InverseRes)
-{
-	vec3 InPixel = texture(source[0], UV).rgb;
-	
-	// Color Matrix
-	float RedValue = dot(InPixel, RedMatrix);
-	float GrnValue = dot(InPixel, GrnMatrix);
-	float BluValue = dot(InPixel, BluMatrix);
-	vec3 OutColor = vec3(RedValue, GrnValue, BluValue);
-	
-	// DC Offset & Scale
-	OutColor = (OutColor * ColorScale) + DCOffset;
-	
-	// Saturation
-	float Luma = dot(OutColor, Gray);
-	vec3 Chroma = OutColor - Luma;
-	OutColor = (Chroma * Saturation) + Luma;
-	
-	return vec4(OutColor, 1.0);
-}
-
-vec4 Deconverge(vec2 UV)
-{
-	vec2 InverseRes = 1.0 / sourceSize[0].xy;
-	vec2 InverseSrcRes = 1.0 / sourceSize[0].xy;
-
-	vec3 CoordX = UV.x * RadialConvergeX;
-	vec3 CoordY = UV.y * RadialConvergeY;
-
-	CoordX += ConvergeX * InverseRes.x - (RadialConvergeX - 1.0) * 0.5;
-	CoordY += ConvergeY * InverseRes.y - (RadialConvergeY - 1.0) * 0.5;
-
-	float RedValue = ColorConvolution(vec2(CoordX.x, CoordY.x), InverseSrcRes).r;
-	float GrnValue = ColorConvolution(vec2(CoordX.y, CoordY.y), InverseSrcRes).g;
-	float BluValue = ColorConvolution(vec2(CoordX.z, CoordY.z), InverseSrcRes).b;
-
-	if (deconverge > 0.5) return vec4(RedValue, GrnValue, BluValue, 1.0);
-	else return vec4(texture(source[0], UV));
-}
-
-vec4 ScanlinePincushion(vec2 UV)
-{
-	vec4 InTexel = Deconverge(UV);
-	
-	vec2 PinUnitCoord = UV * Two.xy - One.xy;
-	float PincushionR2 = pow(length(PinUnitCoord), 2.0);
-	vec2 PincushionCurve = PinUnitCoord * PincushionAmount * PincushionR2;
-	vec2 BaseCoord = UV;
-	vec2 ScanCoord = UV;
-	
-	BaseCoord *= One.xy - PincushionAmount * 0.2; // Warning: Magic constant
-	BaseCoord += PincushionAmount * 0.1;
-	BaseCoord += PincushionCurve;
-	
-	ScanCoord *= One.xy - PincushionAmount * 0.2; // Warning: Magic constant
-	ScanCoord += PincushionAmount * 0.1;
-	ScanCoord += PincushionCurve;
-	
-	vec2 CurveClipUnitCoord = UV * Two.xy - One.xy;
-	float CurvatureClipR2 = pow(length(CurveClipUnitCoord), 2.0);
-	vec2 CurvatureClipCurve = CurveClipUnitCoord * CurvatureAmount * CurvatureClipR2;
-	vec2 ScreenClipCoord = UV;
-	ScreenClipCoord -= Half.xy;
-	ScreenClipCoord *= One.xy - CurvatureAmount * 0.2; // Warning: Magic constant
-	ScreenClipCoord += Half.xy;
-	ScreenClipCoord += CurvatureClipCurve;
-
-	if (pincushion > 0.5){
-		// -- Alpha Clipping --
-		if (BaseCoord.x < 0.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.y < 0.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.x > 1.0) return vec4(0.0, 0.0, 0.0, 1.0);
-		if (BaseCoord.y > 1.0) return vec4(0.0, 0.0, 0.0, 1.0);
-	}
-	
-	// -- Scanline Simulation --
-	float InnerSine = ScanCoord.y * sourceSize[0].y * ScanlineScale;
-	float ScanBrightMod = sin(InnerSine * Pi + ScanlineOffset * sourceSize[0].y);
-	float ScanBrightness = mix(1.0, (pow(ScanBrightMod * ScanBrightMod, ScanlineHeight) * ScanlineBrightScale + 1.0) * 0.5, scandark);
-	vec3 ScanlineTexel = InTexel.rgb * ScanBrightness;
-	
-	// -- Color Compression (increasing the floor of the signal without affecting the ceiling) --
-	ScanlineTexel = Floor + (One.xyz - Floor) * ScanlineTexel;
-	if (scanlines > 0.5)	return vec4(ScanlineTexel, 1.0);
-	else return vec4(InTexel);
-}
-
-vec4 SixtyHertz(vec2 UV)
-{
-	vec4 InPixel = ScanlinePincushion(UV);
-	float Milliseconds = float(phase) * 15.0;
-	float TimeStep = fract(Milliseconds * SixtyHertzRate);
-	float BarPosition = 1.0 - fract(-UV.y + TimeStep) * SixtyHertzScale;
-	vec4 OutPixel = InPixel * BarPosition;
-	if (hertzroll > 0.5) return OutPixel;
-	else return InPixel;
-}
-
-void main() {
-   vec4 OutPixel = SixtyHertz(vTexCoord.xy);
-   FragColor = OutPixel;
-}
@@ -1,16 +0,0 @@
-#version 150
-
-in vec4 position;
-in vec2 texCoord;
-
-out Vertex {
-   vec2 vTexCoord;
-};
-
-uniform vec4 targetSize;
-uniform vec4 sourceSize[];
-
-void main() {
-   gl_Position = position;
-   vTexCoord = texCoord;
-}
@@ -1,20 +0,0 @@
-input
-  filter: linear
-
-program
-  filter: linear
-  height: 100%
-  width: 100%
-  vertex: mame-ntsc.vs
-  fragment: mame-ntsc.fs
-  
-program
-  filter: linear
-  modulo: 270.0
-  vertex: mame-postproc.vs
-  fragment: mame-postproc.fs
-  
-output
-  height: 0
-  width: 0
-  filter: linear
@@ -1,48 +0,0 @@
-// Gaussian Scanlines
-//
-// adapted from NTSC Shader - written by Hans-Kristian Arntzen
-// License: GPLv3
-// pulled from git://github.com/libretro/common-shaders.git on 08/05/2013
-
-#version 150
-
-uniform sampler2D source[];
-uniform vec4 sourceSize[];
-uniform vec4 targetSize;
-uniform int phase;
-
-#define DISPLAY_GAMMA 2.1
-#define CRT_GAMMA 2.5
-#define one (sourceSize[0]) //this is set to 1.0 / sourceSize[0] in the original version, but I think this looks better
-#define pix_no texCoord.y * sourceSize[0]
-#define TEX(off) pow(texture(source[0], texCoord - vec2(0.0, (off) * one.y)).rgb, vec3(CRT_GAMMA))
-
-in Vertex {
-  vec2 texCoord;
-};
-
-out vec4 fragColor;
-
-void main() {
-
-vec3 frame0 = TEX(-2.0);
-vec3 frame1 = TEX(-1.0);
-vec3 frame2 = TEX(0.0);
-vec3 frame3 = TEX(1.0);
-vec3 frame4 = TEX(2.0);
-
-float offset_dist = fract(pix_no.y) - 0.5;
-float dist0 =  2.0 + offset_dist;
-float dist1 =  1.0 + offset_dist;
-float dist2 =  0.0 + offset_dist;
-float dist3 = -1.0 + offset_dist;
-float dist4 = -2.0 + offset_dist;
-
-vec3 scanline = frame0 * exp(-5.0 * dist0 * dist0);
-	scanline += frame1 * exp(-5.0 * dist1 * dist1);
-	scanline += frame2 * exp(-5.0 * dist2 * dist2);
-	scanline += frame3 * exp(-5.0 * dist3 * dist3);
-	scanline += frame4 * exp(-5.0 * dist4 * dist4);
-
-fragColor = vec4(pow(1.15 * scanline, vec3(1.0 / DISPLAY_GAMMA)), 1.0);
-}
@@ -1,26 +0,0 @@
-input
-  filter: nearest
-  format: rgba16f
-
-program
-  filter: nearest
-  format: rgba16f
-  width: 400%
-  height: 100%
-  modulo: 2
-  fragment: ntsc-pass1.fs
-  
-program
-  filter: nearest
-  format: rgba16f
-  width: 50%
-  height: 100%
-  fragment: ntsc-pass2.fs
-
-program
-  filter: linear
-  width: 100%
-  height: 100%
-  
-output
-  filter: nearest