GLES2: uniform struct{sampler} as a function arg am: ad69c848f7 am: cbc2c06d6b
authorKai Ninomiya <kainino@chromium.org>
Mon, 29 Jan 2018 20:48:38 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Jan 2018 20:48:38 +0000 (20:48 +0000)
am: de6872c279

Change-Id: I74ece893d1b668dfdf6e89cfa885754ef6ee3e49

1  2 
android/cts/master/gles2-master.txt

Simple merge