From: Jeff Leger <jleger@codeaurora.org>
Date: Sat, 13 Jan 2018 02:34:13 +0000 (+0000)
Subject: Merge "Reduce GPU workload of pipeline_barrier tests" into oreo-cts-dev am: 4c26442e3d
X-Git-Tag: upstream/1.3.5~1974^2~8^2~5^2~42^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=358042ef440888517494a9c77d13917ab97783f9;hp=d9b0dd51d2da342d6079f71cb07e475b91e0ca8d;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge "Reduce GPU workload of pipeline_barrier tests" into oreo-cts-dev am: 4c26442e3d
am: d9b0dd51d2

Change-Id: Iec15d6a9ae27d4a85b2558c76f1fa22f8a66197d
---

diff --git a/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp b/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp
index 2613282..abc1f5e 100644
--- a/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp
+++ b/modules/gles31/functional/es31fNegativeAdvancedBlendEquationTests.cpp
@@ -224,7 +224,7 @@ void attachment_advanced_equation (NegativeTestContext& ctx)
 	ctx.expectError(GL_NO_ERROR);
 	ctx.glCheckFramebufferStatus(GL_FRAMEBUFFER);
 
-	ctx.beginSection("GL_INVALID_OPERATION is generated if blending is enabled, advanced equations are used, and the draw buffer for other color outputs is not NONE.");
+	ctx.beginSection("GL_INVALID_OPERATION is generated if blending is enabled, advanced equations are used, and the draw buffer for other color outputs is not NONE unless NVX_blend_equation_advanced_multi_draw_buffers is supported.");
 	for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_equations); ++ndx)
 	{
 		glu::ShaderProgram	program(ctx.getRenderContext(), generateProgramSources(ctx, s_equations[ndx]));
@@ -237,7 +237,10 @@ void attachment_advanced_equation (NegativeTestContext& ctx)
 		ctx.expectError(GL_NO_ERROR);
 		ctx.glBlendEquation(getEquation(s_equations[ndx]));
 		ctx.glDrawElements(GL_TRIANGLES, 0, GL_UNSIGNED_INT, 0);
-		ctx.expectError(GL_INVALID_OPERATION);
+		if (ctx.isExtensionSupported("GL_NVX_blend_equation_advanced_multi_draw_buffers"))
+			ctx.expectError(GL_NO_ERROR);
+		else
+			ctx.expectError(GL_INVALID_OPERATION);
 	}
 	ctx.endSection();