From e2e5454385b6906c851a3efdc22e72b43c46d84a Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 25 Oct 2013 02:50:08 -0700 Subject: [PATCH] Added some more techniques to the default effect --- build/data/effects/default.effect | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/build/data/effects/default.effect b/build/data/effects/default.effect index 611bf6df8..fd9adafe8 100644 --- a/build/data/effects/default.effect +++ b/build/data/effects/default.effect @@ -13,7 +13,7 @@ struct VertInOut { float2 uv : TEXCOORD0; }; -VertInOut VSConvert(VertInOut vert_in) +VertInOut VSDefault(VertInOut vert_in) { VertInOut vert_out; vert_out.pos = mul(vert_in.pos, ViewProj); @@ -21,17 +21,31 @@ VertInOut VSConvert(VertInOut vert_in) return vert_out; } -float4 PSConvert(VertInOut vert_in) : TARGET +float4 DrawRGB(VertInOut vert_in) : TARGET +{ + return tex.Sample(def_sampler, vert_in.uv); +} + +float4 DrawYUVToRGB(VertInOut vert_in) : TARGET { float4 yuv = tex.Sample(def_sampler, vert_in.uv); return saturate(mul(float4(yuv.xyz, 1.0), yuv_matrix)); } +technique DrawRGB +{ + pass + { + vertex_shader = VSDefault(vert_in); + pixel_shader = DrawRGB(vert_in); + } +} + technique ConvertYUV { pass { - vertex_shader = VSConvert(vert_in); - pixel_shader = PSConvert(vert_in); + vertex_shader = VSDefault(vert_in); + pixel_shader = DrawYUVToRGB(vert_in); } }