projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 7c5ca45)
am ab888c4e: am c65c11dd: Merge "Fix expected results in implicit conversion tests...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 18 Jun 2015 20:10:37 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 20:10:37 +0000 (20:10 +0000)
* commit 'ab888c4e417a91032a3a6a5453aa5c099fd67372':
  Fix expected results in implicit conversion tests

data/gles31/shaders/implicit_conversions.test patch | blob | history
modules/gles3/scripts/genutil.py patch | blob | history
modules/gles31/scripts/genutil.py patch | blob | history

diff --git a/data/gles31/shaders/implicit_conversions.test b/data/gles31/shaders/implicit_conversions.test
index 7499565..d2b5965 100644 (file)
--- a/data/gles31/shaders/implicit_conversions.test
+++ b/data/gles31/shaders/implicit_conversions.test
@@ -3511,7 +3511,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3533,7 +3533,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3577,7 +3577,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3599,7 +3599,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3643,7 +3643,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3665,7 +3665,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -3779,7 +3779,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -3801,7 +3801,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -3845,7 +3845,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -3867,7 +3867,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -3911,7 +3911,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -3933,7 +3933,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4331,7 +4331,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4353,7 +4353,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4397,7 +4397,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4419,7 +4419,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4463,7 +4463,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4485,7 +4485,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ false | false | false ];
+                                       output bool out0 = [ true | false | false ];
                                }
 
                                both ""
@@ -4599,7 +4599,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4621,7 +4621,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec2 in0 = [ ivec2(1, 2) | ivec2(2, 1) | ivec2(3, 7) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4665,7 +4665,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4687,7 +4687,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec3 in0 = [ ivec3(1, 2, 3) | ivec3(2, 1, 2) | ivec3(3, 7, 2) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4731,7 +4731,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
@@ -4753,7 +4753,7 @@ group comparisons "Comparisons"
                                values
                                {
                                        input ivec4 in0 = [ ivec4(1, 2, 3, 4) | ivec4(2, 1, 2, 6) | ivec4(3, 7, 2, 5) ];
-                                       output bool out0 = [ true | true | true ];
+                                       output bool out0 = [ false | true | true ];
                                }
 
                                both ""
diff --git a/modules/gles3/scripts/genutil.py b/modules/gles3/scripts/genutil.py
index d17f811..d69225e 100644 (file)
--- a/modules/gles3/scripts/genutil.py
+++ b/modules/gles3/scripts/genutil.py
@@ -364,6 +364,12 @@ class Vec(object):
        def __init__(self):
                pass
 
+       def __eq__(self, other):
+               return self.isEqual(other)
+
+       def __ne__(self, other):
+               return not self.isEqual(other)
+
 class Vec2(Vec):
        def __init__(self, x, y):
                assert(x.__class__ == y.__class__)
diff --git a/modules/gles31/scripts/genutil.py b/modules/gles31/scripts/genutil.py
index f7ccc1a..d1cffa7 100644 (file)
--- a/modules/gles31/scripts/genutil.py
+++ b/modules/gles31/scripts/genutil.py
@@ -366,6 +366,12 @@ class Vec(object):
        def __init__(self):
                pass
 
+       def __eq__(self, other):
+               return self.isEqual(other)
+
+       def __ne__(self, other):
+               return not self.isEqual(other)
+
 class Vec2(Vec):
        def __init__(self, x, y):
                assert(x.__class__ == y.__class__)
Domain: Graphics System / GL;