summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChris Forbes <chrisforbes@google.com>2018-02-14 09:22:18 -0800
committerChris Forbes <chrisforbes@google.com>2018-02-14 09:22:18 -0800
commit42ab744cbe66759903cdbe8cb8ffce120e1cf14b (patch)
treeff92f476be36eab0a365157c85a7a04963fd1f16 /data
parent50b243dfb053d0dcdfb2a370f543a704a353fde8 (diff)
parente1d87d965cc8d9648ce6e188d40517e1167388b9 (diff)
downloadVK-GL-CTS-42ab744cbe66759903cdbe8cb8ffce120e1cf14b.tar.gz
VK-GL-CTS-42ab744cbe66759903cdbe8cb8ffce120e1cf14b.tar.bz2
VK-GL-CTS-42ab744cbe66759903cdbe8cb8ffce120e1cf14b.zip
Merge remote-tracking branch 'khronos/master' into deqp-dev
Change-Id: Ib2085147e9679d6dd16109c660f9777d680d54fe
Diffstat (limited to 'data')
-rw-r--r--data/gles2/shaders/fragdata.test2
-rw-r--r--data/gles3/shaders/fragdata.test2
-rw-r--r--data/gles31/shaders/es32/tessellation_negative_user_defined_io.test2
3 files changed, 5 insertions, 1 deletions
diff --git a/data/gles2/shaders/fragdata.test b/data/gles2/shaders/fragdata.test
index f7ba4f295..63af9eb36 100644
--- a/data/gles2/shaders/fragdata.test
+++ b/data/gles2/shaders/fragdata.test
@@ -2,6 +2,8 @@
case invalid_assign_to_1
version 100 es
expect compile_fail
+ require only_glsl_es_100_support
+ require exactly_one_draw_buffer
vertex ""
void main (void)
{
diff --git a/data/gles3/shaders/fragdata.test b/data/gles3/shaders/fragdata.test
index f7ba4f295..63af9eb36 100644
--- a/data/gles3/shaders/fragdata.test
+++ b/data/gles3/shaders/fragdata.test
@@ -2,6 +2,8 @@
case invalid_assign_to_1
version 100 es
expect compile_fail
+ require only_glsl_es_100_support
+ require exactly_one_draw_buffer
vertex ""
void main (void)
{
diff --git a/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test b/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test
index 489b25b9e..ed4d19a60 100644
--- a/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test
+++ b/data/gles31/shaders/es32/tessellation_negative_user_defined_io.test
@@ -147,7 +147,7 @@ case per_vertex_incorrect_control_explicit_output_array_size_1
tessellation_control ""
#version 320 es
${TESSELLATION_CONTROL_DECLARATIONS}
- out highp float varyingArray[3]; // size is not equal to gl_MaxPatchVertices
+ out highp float varyingArray[2]; // size does not match layout declaration
void main()
{
varyingArray[gl_InvocationID] = gl_in[0].gl_Position[gl_InvocationID];