summaryrefslogtreecommitdiffstatshomepage
path: root/bgfx/shaders/glsl/chains/hlsl
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /bgfx/shaders/glsl/chains/hlsl
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'bgfx/shaders/glsl/chains/hlsl')
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_chroma.binbin1612 -> 1616 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_color.binbin882 -> 886 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_deconverge.binbin450 -> 454 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_defocus.binbin1096 -> 1100 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_distortion.binbin5647 -> 5651 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_ntsc_decode.binbin6096 -> 6100 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_ntsc_encode.binbin2676 -> 2680 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_phosphor.binbin613 -> 617 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_post.binbin3792 -> 3796 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_prescale.binbin181 -> 185 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_scanline.binbin2936 -> 2940 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_chroma.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_color.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_deconverge.binbin1356 -> 1360 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_defocus.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_distortion.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_ntsc_decode.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_ntsc_encode.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_phosphor.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_post.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_prescale.binbin377 -> 381 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/vs_scanline.binbin377 -> 381 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 6f9655c3c84..72bfcdb481a 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 0b0fc9574f6..82d073ee4a8 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 6f3aea8b7e7..d61a6324f96 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 811be64743d..98b5074feb3 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 a04d209a6ca..28413200313 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 47a4a94850e..a32f0797402 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 3d69369ba52..a5985955b8d 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 30481fbbc2d..e92c4fd4a90 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 cf1638a8d4c..837341e3557 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 fc51a68ad85..ed53d46066a 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 e9ca861a2a8..8783d3ac45c 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 e58cf0f8814..2515ee7efb1 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 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 391ef1fda40..f09fdcd6fd8 100644
--- a/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/vs_scanline.bin
Binary files differ