resolve merge conflicts of a9ffcc1 to master

[platform/upstream/VK-GL-CTS.git] / android / cts / master / com.drawelements.deqp.vk.xml

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index b803f40..c17d3cd 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -260705,6 +260705,20 @@
                                        </Test>
                                </TestCase>
                        </TestSuite>
+                       <TestCase name="link_by_binding">
+                               <Test name="single_buf_single_instance">
+                                       <TestInstance/>
+                               </Test>
+                               <Test name="single_buf_instance_array">
+                                       <TestInstance/>
+                               </Test>
+                               <Test name="per_block_buf_single_instance">
+                                       <TestInstance/>
+                               </Test>
+                               <Test name="per_block_buf_instance_array">
+                                       <TestInstance/>
+                               </Test>
+                       </TestCase>
                        <TestSuite name="random">
                                <TestCase name="scalar_types">
                                        <Test name="0">