summaryrefslogtreecommitdiffstatshomepage
path: root/bgfx/shaders/glsl
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /bgfx/shaders/glsl
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'bgfx/shaders/glsl')
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_chroma.binbin1616 -> 1612 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_color.binbin886 -> 882 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_deconverge.binbin454 -> 450 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_defocus.binbin1100 -> 1096 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_distortion.binbin5651 -> 5647 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.binbin6100 -> 6096 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.binbin2680 -> 2676 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_phosphor.binbin617 -> 613 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_post.binbin3796 -> 3792 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_prescale.binbin185 -> 181 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_scanline.binbin2940 -> 2936 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_chroma.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_color.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_deconverge.binbin1360 -> 1356 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_defocus.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_distortion.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_phosphor.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_post.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_prescale.binbin381 -> 377 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_scanline.binbin381 -> 377 bytes
22 files changed, 0 insertions, 0 deletions
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_chroma.bin b/bgfx/shaders/glsl/chains/hlsl/fs_chroma.bin
index 72bfcdb481a..6f9655c3c84 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_chroma.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_chroma.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_color.bin b/bgfx/shaders/glsl/chains/hlsl/fs_color.bin
index 82d073ee4a8..0b0fc9574f6 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_color.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_color.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_deconverge.bin b/bgfx/shaders/glsl/chains/hlsl/fs_deconverge.bin
index d61a6324f96..6f3aea8b7e7 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_deconverge.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_deconverge.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin b/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
index 98b5074feb3..811be64743d 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin b/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin
index 28413200313..a04d209a6ca 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_distortion.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.bin b/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.bin
index a32f0797402..47a4a94850e 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.bin b/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.bin
index a5985955b8d..3d69369ba52 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_phosphor.bin b/bgfx/shaders/glsl/chains/hlsl/fs_phosphor.bin
index e92c4fd4a90..30481fbbc2d 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_phosphor.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_phosphor.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_post.bin b/bgfx/shaders/glsl/chains/hlsl/fs_post.bin
index 837341e3557..cf1638a8d4c 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_post.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_post.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_prescale.bin b/bgfx/shaders/glsl/chains/hlsl/fs_prescale.bin
index ed53d46066a..fc51a68ad85 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_prescale.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_prescale.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_scanline.bin b/bgfx/shaders/glsl/chains/hlsl/fs_scanline.bin
index 8783d3ac45c..e9ca861a2a8 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_scanline.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_scanline.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_chroma.bin b/bgfx/shaders/glsl/chains/hlsl/vs_chroma.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_chroma.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_chroma.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_color.bin b/bgfx/shaders/glsl/chains/hlsl/vs_color.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_color.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_color.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_deconverge.bin b/bgfx/shaders/glsl/chains/hlsl/vs_deconverge.bin
index 2515ee7efb1..e58cf0f8814 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_deconverge.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_deconverge.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_defocus.bin b/bgfx/shaders/glsl/chains/hlsl/vs_defocus.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_defocus.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_distortion.bin b/bgfx/shaders/glsl/chains/hlsl/vs_distortion.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_distortion.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_distortion.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.bin b/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.bin b/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_phosphor.bin b/bgfx/shaders/glsl/chains/hlsl/vs_phosphor.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_phosphor.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_phosphor.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_post.bin b/bgfx/shaders/glsl/chains/hlsl/vs_post.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_post.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_post.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_prescale.bin b/bgfx/shaders/glsl/chains/hlsl/vs_prescale.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_prescale.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_prescale.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin b/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin
index f09fdcd6fd8..391ef1fda40 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin
Binary files differ