New upstream version 18.0.1+dfsg1

This commit is contained in:
Sebastian Ramacher 2017-04-19 21:54:15 +02:00
parent 6efda2859e
commit f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions

View file

@ -14,6 +14,8 @@ struct VertData {
float2 uv : TEXCOORD0;
};
#include "premultiplied.inc"
VertData VSDefault(VertData v_in)
{
VertData vert_out;
@ -24,8 +26,8 @@ VertData VSDefault(VertData v_in)
float4 PSFade(VertData v_in) : TARGET
{
float4 a_val = tex_a.Sample(textureSampler, v_in.uv);
float4 b_val = tex_b.Sample(textureSampler, v_in.uv);
float4 a_val = convert_pmalpha(tex_a.Sample(textureSampler, v_in.uv));
float4 b_val = convert_pmalpha(tex_b.Sample(textureSampler, v_in.uv));
return lerp(a_val, b_val, fade_val);
}