Merge "Remove duplicated texture derivative functions."
authorJarkko Pöyry <jpoyry@google.com>
Mon, 6 Jul 2015 17:44:00 +0000 (17:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Jul 2015 17:44:01 +0000 (17:44 +0000)
commit27da3fbb1f0d426a2e2e7d8ea569180e368de2ba
tree15ba8a856a5bbd0aa5abfe6fcd763018c6fc7020
parent4119ed021bdd013213109e9a45f5d3ef1ab21357
parentd6e176c7c08492db84cc8befcbb68e7d025500b4
Merge "Remove duplicated texture derivative functions."
modules/glshared/glsTextureTestUtil.cpp
modules/glshared/glsTextureTestUtil.hpp