From: Pyry Haulos <phaulos@google.com>
Date: Mon, 17 Aug 2015 20:05:48 +0000 (-0700)
Subject: resolved conflicts for merge of 2fc614cb to master
X-Git-Tag: upstream/0.1.0~1455
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f5e0573dc2b60405a783d0a64a1efa27e835a3b;p=platform%2Fupstream%2FVK-GL-CTS.git

resolved conflicts for merge of 2fc614cb to master

Change-Id: Icfc6cc05231c37b8b0b8ed37c2d4e14ae369ed3d
---

8f5e0573dc2b60405a783d0a64a1efa27e835a3b
diff --cc android/cts/master/src/gles3-test-issues.txt
index 60f490e,ad27cf6..62ffb2c
--- a/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