am 1f5df2bc: (-s ours) am 5260313b: Remove linkage.uniform.basic.precision_conflict_...

[platform/upstream/VK-GL-CTS.git] / modules / gles3 / functional / es3fFunctionalTests.cpp

diff --git a/modules/gles3/functional/es3fFunctionalTests.cpp b/modules/gles3/functional/es3fFunctionalTests.cpp
index c7ed4d6..6f6f308 100644 (file)
--- a/modules/gles3/functional/es3fFunctionalTests.cpp
+++ b/modules/gles3/functional/es3fFunctionalTests.cpp
@@ -58,6 +58,7 @@
 #include "es3fDefaultVertexAttributeTests.hpp"
 #include "es3fScissorTests.hpp"
 #include "es3fLifetimeTests.hpp"
+#include "es3fDefaultVertexArrayObjectTests.hpp"
 
 // Shader tests
 #include "es3fShaderApiTests.hpp"
@@ -203,6 +204,7 @@ public:
                addChild(new ShaderLibraryTest                  (m_context, "qualification_order",      "Order Of Qualification Tests"));
                addChild(new ShaderLibraryTest                  (m_context, "scoping",                          "Scoping of Declarations"));
                addChild(new ShaderLibraryTest                  (m_context, "negative",                         "Miscellaneous Negative Shader Compilation Tests"));
+               addChild(new ShaderLibraryTest                  (m_context, "uniform_block",            "Uniform block tests"));
 
                addChild(new ShaderDiscardTests                 (m_context));
                addChild(new ShaderIndexingTests                (m_context));
@@ -368,42 +370,43 @@ FunctionalTests::~FunctionalTests (void)
 
 void FunctionalTests::init (void)
 {
-       addChild(new PrerequisiteTests                  (m_context));
-       addChild(new ImplementationLimitTests   (m_context));
-       addChild(new ColorClearTest                             (m_context));
-       addChild(new DepthStencilClearTests             (m_context));
-       addChild(new BufferTests                                (m_context));
-       addChild(new ShaderTests                                (m_context));
-       addChild(new TextureTests                               (m_context));
-       addChild(new FragmentOpTests                    (m_context));
-       addChild(new FboTests                                   (m_context));
-       addChild(new VertexArrayTestGroup               (m_context));
-       addChild(new UniformBlockTests                  (m_context));
-       addChild(new UniformApiTests                    (m_context));
-       addChild(createAttributeLocationTests   (m_context));
-       addChild(new FragmentOutputTests                (m_context));
-       addChild(new SamplerObjectTests                 (m_context));
-       addChild(new PixelBufferObjectTests             (m_context));
-       addChild(new RasterizationTests                 (m_context));
-       addChild(new OcclusionQueryTests                (m_context));
-       addChild(new VertexArrayObjectTestGroup (m_context));
-       addChild(new PrimitiveRestartTests              (m_context));
-       addChild(new InstancedRenderingTests    (m_context));
-       addChild(new RasterizerDiscardTests             (m_context));
-       addChild(new TransformFeedbackTests             (m_context));
-       addChild(new SyncTests                                  (m_context));
-       addChild(new ShaderApiTests                             (m_context));
-       addChild(new NegativeApiTestGroup               (m_context));
-       addChild(new MultisampleTests                   (m_context));
-       addChild(new ReadPixelsTests                    (m_context));
-       addChild(new DitheringTests                             (m_context));
-       addChild(new StateQueryTests                    (m_context));
-       addChild(new ClippingTests                              (m_context));
-       addChild(new PolygonOffsetTests                 (m_context));
-       addChild(new DrawTests                                  (m_context));
-       addChild(new FlushFinishTests                   (m_context));
-       addChild(new DefaultVertexAttributeTests(m_context));
-       addChild(createLifetimeTests                    (m_context));
+       addChild(new PrerequisiteTests                          (m_context));
+       addChild(new ImplementationLimitTests           (m_context));
+       addChild(new ColorClearTest                                     (m_context));
+       addChild(new DepthStencilClearTests                     (m_context));
+       addChild(new BufferTests                                        (m_context));
+       addChild(new ShaderTests                                        (m_context));
+       addChild(new TextureTests                                       (m_context));
+       addChild(new FragmentOpTests                            (m_context));
+       addChild(new FboTests                                           (m_context));
+       addChild(new VertexArrayTestGroup                       (m_context));
+       addChild(new UniformBlockTests                          (m_context));
+       addChild(new UniformApiTests                            (m_context));
+       addChild(createAttributeLocationTests           (m_context));
+       addChild(new FragmentOutputTests                        (m_context));
+       addChild(new SamplerObjectTests                         (m_context));
+       addChild(new PixelBufferObjectTests                     (m_context));
+       addChild(new RasterizationTests                         (m_context));
+       addChild(new OcclusionQueryTests                        (m_context));
+       addChild(new VertexArrayObjectTestGroup         (m_context));
+       addChild(new PrimitiveRestartTests                      (m_context));
+       addChild(new InstancedRenderingTests            (m_context));
+       addChild(new RasterizerDiscardTests                     (m_context));
+       addChild(new TransformFeedbackTests                     (m_context));
+       addChild(new SyncTests                                          (m_context));
+       addChild(new ShaderApiTests                                     (m_context));
+       addChild(new NegativeApiTestGroup                       (m_context));
+       addChild(new MultisampleTests                           (m_context));
+       addChild(new ReadPixelsTests                            (m_context));
+       addChild(new DitheringTests                                     (m_context));
+       addChild(new StateQueryTests                            (m_context));
+       addChild(new ClippingTests                                      (m_context));
+       addChild(new PolygonOffsetTests                         (m_context));
+       addChild(new DrawTests                                          (m_context));
+       addChild(new FlushFinishTests                           (m_context));
+       addChild(new DefaultVertexAttributeTests        (m_context));
+       addChild(createLifetimeTests                            (m_context));
+       addChild(new DefaultVertexArrayObjectTests      (m_context));
 }
 
 } // Functional