Merge pull request #6171 from aliaspider/master

(D3D11) sample the font atlas correctly.
This commit is contained in:
Twinaphex 2018-01-25 01:59:31 +01:00 committed by GitHub
commit f07571f8eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,14 +77,10 @@ SRC(
float4 PSMain(PSInput input) : SV_TARGET
{
return input.color * t0.Sample(s0, input.texcoord);
// return float4(1.0f, 1.0f, 1.0f, 1.0f);
// return input.color;
};
float4 PSMainA8(PSInput input) : SV_TARGET
{
// return t0.Sample(s0, input.texcoord).a;
return input.color * t0.Sample(s0, input.texcoord).a;
// return input.color;
return float4(input.color.rgb , input.color.a * t0.Sample(s0, input.texcoord).a);
};