projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2fbf5d 2fc614c)
resolved conflicts for merge of 2fc614cb to master
authorPyry Haulos <phaulos@google.com>
Mon, 17 Aug 2015 20:05:48 +0000 (13:05 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 17 Aug 2015 20:05:48 +0000 (13:05 -0700)
Change-Id: Icfc6cc05231c37b8b0b8ed37c2d4e14ae369ed3d

1  2 
android/cts/master/com.drawelements.deqp.gles3.xml patch | diff1 | diff2 | blob | history
android/cts/master/com.drawelements.deqp.gles31.xml patch | diff1 | diff2 | blob | history
android/cts/master/gles3-master.txt patch | diff1 | diff2 | blob | history
android/cts/master/src/gles3-test-issues.txt patch | diff1 | diff2 | blob | history

diff --cc android/cts/master/gles3-master.txt
Simple merge
diff --cc android/cts/master/src/gles3-test-issues.txt
index 60f490e,ad27cf6..62ffb2c
--- 1/android/cts/master/src/gles3-test-issues.txt
--- 2/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@@ -150,6 -147,4 +150,7 @@@ dEQP-GLES3.functional.shaders.texture_f
  
  # Bug 22859221
  dEQP-GLES3.functional.shaders.builtin_functions.precision.reflect.*mediump*.scalar
+ dEQP-GLES3.functional.shaders.builtin_functions.precision.reflect.*highp*.scalar
 +
 +# Bug 21326228
 +dEQP-GLES3.functional.shaders.linkage.uniform.block.differing_precision
Domain: Graphics System / GL;