summaryrefslogtreecommitdiffstats
path: root/ui/gfx/resources
diff options
context:
space:
mode:
authorvollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 20:53:14 +0000
committervollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 20:53:14 +0000
commitb4bb9ca0f57a0375e80cd662f0233298ed987a72 (patch)
tree179c4eec26b5ba6a160865eea51f1155d9572116 /ui/gfx/resources
parent0531171e5800f313832a5200266a115bbc5041ff (diff)
downloadchromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.zip
chromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.tar.gz
chromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.tar.bz2
Allow animating alpha
BUG=None TEST=None Review URL: http://codereview.chromium.org/7979020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/resources')
-rw-r--r--ui/gfx/resources/compositor.fx4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gfx/resources/compositor.fx b/ui/gfx/resources/compositor.fx
index 27b3444..5dee8e2 100644
--- a/ui/gfx/resources/compositor.fx
+++ b/ui/gfx/resources/compositor.fx
@@ -51,8 +51,10 @@ VS_OUT VS(VS_IN vIn) {
return vOut;
}
+float alpha = 1.0f;
+
float4 PS(VS_OUT pIn) : SV_Target {
- return textureMap.Sample(Sampler, float2(pIn.texC));
+ return textureMap.Sample(Sampler, float2(pIn.texC)) * alpha;
}
technique10 ViewTech {