Merge "Fix -Wconversion warnings in shader tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:31:12 +0000 (20:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 May 2015 20:31:13 +0000 (20:31 +0000)
commit6bc2e7995999296f8bf69fcb99db43fed4adc2d8
treedbbb49188270771a1e2da5883b5351b4516cdf46
parent22f4a60bccc72b68bfb41f4039d03c80be5f2646
parent9790daae5762b391f1a26bee4fb88a008fe4b583
Merge "Fix -Wconversion warnings in shader tests."
modules/gles3/functional/es3fShaderBuiltinVarTests.cpp
modules/gles3/functional/es3fShaderTextureFunctionTests.cpp