From cecdba5cd996cea3ebd2534aea7a3e3a41205b9c Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 21 Feb 2015 19:21:17 -0500
Subject: Changed to using stb_image for image loading, also alpha blending
 works!

---
 shaders/blit.fragment | 4 ++--
 shaders/ntsc.fragment | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'shaders')

diff --git a/shaders/blit.fragment b/shaders/blit.fragment
index 07a0279..a96f217 100644
--- a/shaders/blit.fragment
+++ b/shaders/blit.fragment
@@ -2,11 +2,11 @@
 
 in vec2 UV;
 
-out vec3 color;
+out vec4 color;
 
 uniform sampler2D srctex;
 
 void main()
 {
-  color = texture(srctex, UV).xyz;
+  color = texture(srctex, UV);
 }
diff --git a/shaders/ntsc.fragment b/shaders/ntsc.fragment
index ceab64d..56fb1c4 100644
--- a/shaders/ntsc.fragment
+++ b/shaders/ntsc.fragment
@@ -11,7 +11,7 @@ uniform sampler2D prevFrameSampler;
 const float Tuning_Sharp = 0.25;
 const vec4 Tuning_Persistence = vec4(1.0) * 0.5;
 const float Tuning_Bleed = 0.5;
-const float Tuning_NTSC = 0.35;
+uniform float Tuning_NTSC; // 0.0
 uniform float NTSCLerp;
 
 const vec2 RcpScrWidth = vec2(1.0f / 320.f, 0.0f);
-- 
cgit 1.4.1