X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=external%2Fopenglcts%2Fmodules%2Fgl%2Fgl4cTestPackages.cpp;h=3b4e08e506fa8480e88297a2105a94e12abe6df1;hb=6c3fca93367fd97c4eb9e7b2a4e642c1284e3ff9;hp=3415dd32cd21594c5223693eefdd4ea9ab05c364;hpb=5678e12f213b4f5da0b4eea3c71fc2455ee7cba2;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/external/openglcts/modules/gl/gl4cTestPackages.cpp b/external/openglcts/modules/gl/gl4cTestPackages.cpp
index 3415dd3..3b4e08e 100644
--- a/external/openglcts/modules/gl/gl4cTestPackages.cpp
+++ b/external/openglcts/modules/gl/gl4cTestPackages.cpp
@@ -35,20 +35,19 @@
 #include "gl4cEnhancedLayoutsTests.hpp"
 #include "gl4cGPUShaderFP64Tests.hpp"
 #include "gl4cGetTextureSubImageTests.hpp"
+#include "gl4cGlSpirvTests.hpp"
 #include "gl4cIncompleteTextureAccessTests.hpp"
 #include "gl4cIndirectParametersTests.hpp"
 #include "gl4cKHRDebugTests.hpp"
 #include "gl4cLimitsTests.hpp"
 #include "gl4cMapBufferAlignmentTests.hpp"
 #include "gl4cMultiBindTests.hpp"
-#include "gl4cParallelShaderCompileTests.hpp"
 #include "gl4cPostDepthCoverageTests.hpp"
 #include "gl4cProgramInterfaceQueryTests.hpp"
 #include "gl4cShaderAtomicCounterOpsTests.hpp"
 #include "gl4cShaderAtomicCountersTests.hpp"
 #include "gl4cShaderBallotTests.hpp"
 #include "gl4cShaderDrawParametersTests.hpp"
-#include "gl4cShaderGroupVoteTests.hpp"
 #include "gl4cShaderImageLoadStoreTests.hpp"
 #include "gl4cShaderImageSizeTests.hpp"
 #include "gl4cShaderStorageBufferObjectTests.hpp"
@@ -60,6 +59,7 @@
 #include "gl4cSparseTexture2Tests.hpp"
 #include "gl4cSparseTextureClampTests.hpp"
 #include "gl4cSparseTextureTests.hpp"
+#include "gl4cSpirvExtensionsTests.hpp"
 #include "gl4cStencilTexturingTests.hpp"
 #include "gl4cSyncTests.hpp"
 #include "gl4cTextureBarrierTests.hpp"
@@ -68,12 +68,17 @@
 #include "gl4cTextureViewTests.hpp"
 #include "gl4cVertexAttrib64BitTest.hpp"
 #include "gl4cVertexAttribBindingTests.hpp"
+#include "glcAggressiveShaderOptimizationsTests.hpp"
 #include "glcBlendEquationAdvancedTests.hpp"
 #include "glcExposedExtensionsTests.hpp"
 #include "glcInfoTests.hpp"
+#include "glcInternalformatTests.hpp"
+#include "glcParallelShaderCompileTests.hpp"
 #include "glcPolygonOffsetClampTests.hpp"
-#include "glcRobustBufferAccessBehaviorTests.hpp"
 #include "glcSampleVariablesTests.hpp"
+#include "glcSeparableProgramsTransformFeedbackTests.hpp"
+#include "glcShaderConstExprTests.hpp"
+#include "glcShaderGroupVoteTests.hpp"
 #include "glcShaderIntegerMixTests.hpp"
 #include "glcShaderLibrary.hpp"
 #include "glcShaderMultisampleInterpolationTests.hpp"
@@ -120,6 +125,7 @@ void GL40TestPackage::init(void)
 	{
 		glcts::ExtParameters extParams(glu::GLSL_VERSION_400, glcts::EXTENSIONTYPE_NONE);
 		addChild(new glcts::DrawElementsBaseVertexTests(getContext(), extParams));
+		addChild(new glcts::InternalformatTests(getContext()));
 		addChild(new gl4cts::GPUShaderFP64Tests(getContext()));
 		addChild(new gl4cts::TextureGatherTests(getContext()));
 		addChild(new glcts::DrawIndirectTestsGL40(getContext()));
@@ -229,7 +235,6 @@ void GL43TestPackage::init(void)
 		addChild(new gl4cts::KHRDebugTests(getContext()));
 		addChild(new gl4cts::ProgramInterfaceQueryTests(getContext()));
 		addChild(new gl4cts::ComputeShaderTests(getContext()));
-		addChild(new deqp::RobustBufferAccessBehaviorTests(getContext()));
 		addChild(new gl4cts::ShaderStorageBufferObjectTests(getContext()));
 		addChild(new gl4cts::VertexAttribBindingTests(getContext()));
 		addChild(new gl4cts::ShaderImageSizeTests(getContext()));
@@ -241,6 +246,8 @@ void GL43TestPackage::init(void)
 		addChild(new gl4cts::SparseTextureTests(getContext()));
 		addChild(new gl4cts::IndirectParametersTests(getContext()));
 		addChild(new gl4cts::ShaderBallotTests(getContext()));
+		addChild(new glcts::ShaderConstExprTests(getContext()));
+		addChild(new glcts::AggressiveShaderOptimizationsTests(getContext()));
 	}
 	catch (...)
 	{
@@ -355,17 +362,20 @@ void GL45TestPackage::init(void)
 		addChild(new gl4cts::ConditionalRenderInverted::Tests(getContext()));
 		addChild(new gl4cts::Sync::Tests(getContext()));
 		addChild(new gl4cts::IncompleteTextureAccess::Tests(getContext()));
-		addChild(new gl4cts::ParallelShaderCompileTests(getContext()));
+		addChild(new glcts::ParallelShaderCompileTests(getContext()));
 		addChild(new gl4cts::PostDepthCoverage(getContext()));
 		addChild(new gl4cts::SparseTexture2Tests(getContext()));
 		addChild(new gl4cts::SparseTextureClampTests(getContext()));
 		addChild(new gl4cts::TextureFilterMinmax(getContext()));
 		addChild(new gl4cts::ShaderAtomicCounterOps(getContext()));
-		addChild(new gl4cts::ShaderGroupVote(getContext()));
 		addChild(new gl4cts::ShaderDrawParametersTests(getContext()));
 		addChild(new gl4cts::ShaderViewportLayerArray(getContext()));
 		addChild(new gl4cts::LimitsTests(getContext()));
+		addChild(new glcts::ShaderGroupVote(getContext()));
 		addChild(new glcts::PolygonOffsetClamp(getContext()));
+		addChild(new glcts::SeparableProgramsTransformFeedbackTests(getContext()));
+		addChild(new gl4cts::SpirvExtensionsTests(getContext()));
+		addChild(new gl4cts::GlSpirvTests(getContext()));
 	}
 	catch (...)
 	{
@@ -375,4 +385,21 @@ void GL45TestPackage::init(void)
 	}
 }
 
+GL46TestPackage::GL46TestPackage(tcu::TestContext& testCtx, const char* packageName, const char* description,
+								 glu::ContextType renderContextType)
+	: GL45TestPackage(testCtx, packageName, packageName, renderContextType)
+{
+	(void)description;
+}
+
+GL46TestPackage::~GL46TestPackage(void)
+{
+}
+
+void GL46TestPackage::init(void)
+{
+	// Call init() in parent - this creates context.
+	GL45TestPackage::init();
+}
+
 } // gl4cts