summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMika Isojarvi <misojarvi@google.com>2016-02-22 19:09:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-22 19:09:14 +0000
commit20c3cb3c4833b40213f4795293d5513d01170a76 (patch)
tree57140218831dadf0b9e08857add333931f23faf9 /android
parentdcdedc98dec015020a17b21ae5afda1049f77d43 (diff)
parent3df50ec6753c7ad89aba86832981b4e57498c19a (diff)
downloadVK-GL-CTS-20c3cb3c4833b40213f4795293d5513d01170a76.tar.gz
VK-GL-CTS-20c3cb3c4833b40213f4795293d5513d01170a76.tar.bz2
VK-GL-CTS-20c3cb3c4833b40213f4795293d5513d01170a76.zip
Merge "Add multicontext creation tests for EGL." into nyc-dev
Diffstat (limited to 'android')
-rw-r--r--android/cts/master/com.drawelements.deqp.egl.xml20
-rw-r--r--android/cts/master/egl-master.txt6
2 files changed, 26 insertions, 0 deletions
diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index 99a425621..d156b0734 100644
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -11161,6 +11161,26 @@
</Test>
</TestCase>
</TestSuite>
+ <TestCase name="multicontext">
+ <Test name="non_shared">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ <Test name="shared">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ <Test name="non_shared_make_current">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ <Test name="shared_make_current">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ <Test name="non_shared_clear">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ <Test name="shared_clear">
+ <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+ </Test>
+ </TestCase>
</TestSuite>
</TestSuite>
</TestPackage>
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index a245f6738..9211822e0 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -3545,3 +3545,9 @@ dEQP-EGL.functional.swap_buffers_with_damage.resize_after_swap.buffer_age_clear_
dEQP-EGL.functional.swap_buffers_with_damage.resize_after_swap.buffer_age_render_render
dEQP-EGL.functional.swap_buffers_with_damage.resize_after_swap.buffer_age_clear_render
dEQP-EGL.functional.swap_buffers_with_damage.resize_after_swap.buffer_age_render_clear
+dEQP-EGL.functional.multicontext.non_shared
+dEQP-EGL.functional.multicontext.shared
+dEQP-EGL.functional.multicontext.non_shared_make_current
+dEQP-EGL.functional.multicontext.shared_make_current
+dEQP-EGL.functional.multicontext.non_shared_clear
+dEQP-EGL.functional.multicontext.shared_clear