OSDN Git Service

Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev
authorChris Craik <ccraik@google.com>
Wed, 29 Aug 2012 22:53:30 +0000 (15:53 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Aug 2012 22:53:31 +0000 (15:53 -0700)

Trivial merge